Merge branch 'release/v09_15_04'

Author: miquelnebot

CMakeLists.txt

@@ -14,7 +14,7 @@
 cmake_minimum_required(VERSION 3.19 FATAL_ERROR)
 
 find_package(cetmodules 3.20.00 REQUIRED)
-project(sbnobj VERSION 09.15.03 LANGUAGES CXX)
+project(sbnobj VERSION 09.15.04 LANGUAGES CXX)
 
 message(STATUS
   "\n-- ============================================================================="

sbnobj/Common/CRT/CRTHit.hh

@@ -28,10 +28,10 @@ namespace sbn::crt {
 
       uint64_t       ts0_s; ///< Second-only part of timestamp T0.
       double    ts0_s_corr; ///< [Honestly, not sure at this point, it was there since long time (BB)]
-
       double        ts0_ns; ///< Timestamp T0 (from White Rabbit), in UTC absolute time scale in nanoseconds from the Epoch.
       double   ts0_ns_corr; ///< [Honestly, not sure at this point, it was there since long time (BB)]
-      double        ts1_ns; ///< Timestamp T1 ([signal time w.r.t. Trigger time]), in UTC absolute time scale in nanoseconds from the Epoch.
+
+      double        ts1_ns; ///< Timestamp T1 ([signal time w.r.t. Trigger time]), 
 
       int            plane; ///< Name of the CRT wall (in the form of numbers).
 
@@ -47,7 +47,9 @@ namespace sbn::crt {
       CRTHit() {}
 
       int64_t ts0() const { return static_cast<int64_t>(ts0_s) * 1'000'000'000LL + static_cast<int64_t>(ts0_ns); }
-      int64_t ts1() const { return static_cast<int64_t>(ts0_s) * 1'000'000'000LL + static_cast<int64_t>(ts1_ns); }
+      // T1 is a relative time not a timestamp, so we don't need second-part.
+      // nano-second part is enough and we saved entire time there.
+      int64_t ts1() const { return static_cast<int64_t>(ts1_ns); }
 
     };
 

sbnobj/SBND/Trigger/classes_def.xml

@@ -25,4 +25,6 @@
 
   <class name="sbndaq::CRTmetric"/>
   <class name="art::Wrapper<sbndaq::CRTmetric>"/>
+  <class name="std::vector<sbndaq::CRTmetric>"/>
+  <class name="art::Wrapper< std::vector<sbndaq::CRTmetric> >"/>
 </lcgdict>