Merge branch 'feature/hlay_crt_offline' of https://github.com/SBNSoftware/sbnobj into feature/hlay_crt_offline

Author: henrylay97

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.19.01 LANGUAGES CXX)
+project(sbnobj VERSION 09.19.04 LANGUAGES CXX)
 
 message(STATUS
   "\n-- ============================================================================="

sbnobj/Common/Calibration/TrackCaloSkimmerObj.h

@@ -260,7 +260,8 @@ namespace sbn {
     std::vector<WireInfo> wires1; //!< List of wire information on plane 1
     std::vector<WireInfo> wires2; //!< List of wire information on plane 2
 
-    float t0; //!< T0 of track [us]
+    float t0; //!< T0 of track [ns]
+    float t0CRT;  //!< T0 of track from CRT-TPC matching [ns]
     int whicht0; //!< Which T0 producer was used to tag
     int id; //!< ID of track
     int cryostat; //!< Cryostat number of track
@@ -311,6 +312,7 @@ namespace sbn {
 
     TrackInfo():
       t0(-1),
+      t0CRT(-1),
       id(-1),
       cryostat(-1),
       clear_cosmic_muon(false),

sbnobj/Common/Calibration/classes_def.xml

@@ -14,7 +14,8 @@
    <version ClassVersion="11" checksum="903476586"/>
    <version ClassVersion="10" checksum="118230262"/>
   </class>
-  <class name="sbn::TrackInfo" ClassVersion="13">
+  <class name="sbn::TrackInfo" ClassVersion="14">
+   <version ClassVersion="14" checksum="3729960902"/>
    <version ClassVersion="13" checksum="1962204283"/>
    <version ClassVersion="12" checksum="2151440214"/>
    <version ClassVersion="11" checksum="627908269"/>

sbnobj/SBND/CRT/FEBData.hh

@@ -26,7 +26,9 @@ namespace sbnd::crt {
     uint32_t fTs1; ///< T1 counter [ns]
     uint32_t fUnixS; ///< Event time since unix epoch [s]
     adc_array_t fADC; ///< 32 ADC values, one per SiPM
-    uint32_t fCoinc; ///< ID of SiPM that fired the trigger
+    uint32_t fCoinc; ///< This was intended to be the ID of SiPM that fired the trigger,
+                     ///< the hardware doesn't fill this field so in data we are filling it
+                     ///< with the cable delay for this module instead.
 
    public:
 
@@ -44,7 +46,7 @@ namespace sbnd::crt {
      * @param ts1 The value of the t1 counter.
      * @param unixs The event time since unix epoch.
      * @param ADC The 32-size array with ADC values.
-     * @param coinc The ID of the strip that fired the trigger.
+     * @param coinc Historical Name - Contains the cable delay for the module.
      */
     FEBData(uint16_t mac5, uint16_t flags, uint32_t ts0, uint32_t ts1, uint32_t unixs, adc_array_t ADC, uint32_t coinc);
 
@@ -104,9 +106,9 @@ namespace sbnd::crt {
     uint16_t ADC(size_t sipmID) const;
 
     /**
-     * Returns the ID of the sipm that fired the trigger.
+     * Historical Name - Contains the cable delay for the module.
      *
-     * @return The Coinc variable of this FEB data.
+     * @return The cable delay of this module
      */
     uint32_t Coinc() const;
 
@@ -154,9 +156,9 @@ namespace sbnd::crt {
     void SetADC(size_t sipmID, uint16_t adc);
 
     /**
-     * Setter method for coinc
+     * Setter method for cable delay
      *
-     * @param coinc The coinc values to set
+     * @param coinc The cable delay value to set
      */
     void SetCoinc(uint32_t coinc);
   };

ups/product_deps

@@ -246,7 +246,7 @@ defaultqual	e26
 #
 ####################################
 product		version		qual	flags		<table_format=2>
-lardataobj	v09_18_03	-
+lardataobj	v09_18_05	-
 cetmodules	v3_24_01	-	only_for_build
 end_product_list
 ####################################