Merge branch 'develop' into feature/geom

Author: bear-is-asleep

CMakeLists.txt

@@ -15,12 +15,12 @@
 
 cmake_minimum_required(VERSION 3.20 FATAL_ERROR)
 
-set(${PROJECT_NAME}_CMAKE_PROJECT_VERSION_STRING 09.93.01.01)
+set(${PROJECT_NAME}_CMAKE_PROJECT_VERSION_STRING 09.93.01.02.01)
 find_package(cetmodules REQUIRED)
 project(sbndcode LANGUAGES CXX)
 
 # for CI:
-# project(sbndcode VERSION 09.93.01.01)
+# project(sbndcode VERSION 09.93.01.02.01)
 
 message(STATUS "\n")
 message(STATUS "=================================   ${PROJECT_NAME}   =================================")

sbndcode/CMakeLists.txt

@@ -21,6 +21,8 @@ add_subdirectory(OpT0Finder)
 add_subdirectory(ShowerAna)
 add_subdirectory(Commissioning)
 add_subdirectory(Trigger)
+add_subdirectory(Timing)
+add_subdirectory(PTBAna)
 
 # subdirectory for gallery stuff
 add_subdirectory(gallery)

sbndcode/CRT/CRTReco/CRTClusterCharacterisationAlg.h

@@ -75,7 +75,6 @@ namespace sbnd::crt {
 
     CRTGeoAlg fCRTGeoAlg;
 
-    bool   fUseT1;
     double fTimeOffset;
     double fOverlapBuffer;
     double fPEAttenuation;

sbndcode/CRT/CRTReco/CRTStripHitProducer_module.cc

@@ -124,7 +124,7 @@ void sbnd::crt::CRTStripHitProducer::produce(art::Event& e)
                       const uint64_t etrig_unix = ts->Timestamp() / static_cast<uint64_t>(1e9);
                       const int64_t unix_diff = ref_unix - etrig_unix;
                       if(unix_diff != 0 && unix_diff != 1)
-                        throw std::runtime_error("Unix timestamps differ by more than 1" + unix_diff);
+                        throw std::runtime_error(Form("Unix timestamps differ by more than 1 (%li)", unix_diff));
 
                       const bool previous_second = unix_diff == 1;
 
@@ -177,7 +177,7 @@ std::vector<sbnd::crt::CRTStripHit> sbnd::crt::CRTStripHitProducer::CreateStripH
 
       const int64_t unix_diff = ref_unix - unixs;
       if(unix_diff != 0 && unix_diff != 1)
-        throw std::runtime_error("Unix timestamps differ by more than 1" + unix_diff);
+        throw std::runtime_error(Form("Unix timestamps differ by more than 1 (%li)", unix_diff));
 
       const bool previous_second = unix_diff == 1;