Frame Shift Module to Correct Timing in Data - PR For Spring Production

CMakeLists.txt

@@ -15,7 +15,7 @@ cmake_minimum_required(VERSION 3.20 FATAL_ERROR)
 
 
 find_package(cetmodules 3.20.00 REQUIRED)
-project(sbnanaobj VERSION 10.00.05 LANGUAGES CXX)
+project(sbnanaobj VERSION 10.00.06 LANGUAGES CXX)
 
 message(STATUS "\n\n  ==========================   ${PROJECT_NAME}   ==========================")
 

sbnanaobj/StandardRecord/SREnums.h

@@ -238,7 +238,7 @@ namespace caf
 
   //==== This should be synchronized to rwtype in sbnobj/Common/SBNEventWeight/EventWeightParameterSet.h
   enum ReweightType_t{
-    kDefault = -1,
+    kDefaultRWType = -1,
     kMultiSim = 0,
     kPMNSigma = 1,
     kFixed = 2,

sbnanaobj/StandardRecord/SROpFlash.cxx

@@ -25,6 +25,7 @@ namespace caf
     timemean         = -9999.f;
     timesd           =    -5.f;
     firsttime        = -9999.f;
+    rwmtime          = -9999.f;
     totalpe          =    -5.f;
     fasttototal      =    -5.f;
     peperwall[0] = -5.f;

sbnanaobj/StandardRecord/SROpFlash.h

@@ -27,6 +27,7 @@ namespace caf
     float timemean         { kSignalingNaN                }; //!< Mean time of hits [us].
     float timesd           { kSignalingNaN                }; //!< Standard deviation of hit times [us].
     float firsttime        { kSignalingNaN                }; //!< Time of first hit [us].
+    float rwmtime          { kSignalingNaN                }; //!< Time of flash wrt RWM Time [us]. 
     float totalpe          { kSignalingNaN                }; //!< Total number of PE across all PMTs.
     float fasttototal      { kSignalingNaN                }; //!< Fast to total light ratio.
     float peperwall[2] { kSignalingNaN, kSignalingNaN };

sbnanaobj/StandardRecord/SRSBNDFrameShiftInfo.cxx

@@ -0,0 +1,21 @@
+////////////////////////////////////////////////////////////////////////
+// \file    SRSBNDFrame.cxx
+////////////////////////////////////////////////////////////////////////
+
+#include "sbnanaobj/StandardRecord/SRSBNDFrameShiftInfo.h"
+
+#include <limits>
+
+namespace caf
+{
+  SRSBNDFrameShiftInfo::SRSBNDFrameShiftInfo():
+    timingType(std::numeric_limits<uint16_t>::max()),
+    frameTdcCrtt1(std::numeric_limits<double>::signaling_NaN()),
+    frameTdcBes(std::numeric_limits<double>::signaling_NaN()),
+    frameTdcRwm(std::numeric_limits<double>::signaling_NaN()),
+    frameHltCrtt1(std::numeric_limits<double>::signaling_NaN()),
+    frameHltBeamGate(std::numeric_limits<double>::signaling_NaN()),
+    frameApplyAtCaf(std::numeric_limits<double>::signaling_NaN())
+  {}
+} // end namespace caf
+////////////////////////////////////////////////////////////////////////

sbnanaobj/StandardRecord/SRSBNDFrameShiftInfo.h

@@ -0,0 +1,27 @@
+////////////////////////////////////////////////////////////////////////
+// \file    SRSBNDFrameShiftInfo.h
+////////////////////////////////////////////////////////////////////////
+#ifndef SRSBNDFRAMESHIFTINFO_H
+#define SRSBNDFRAMESHIFTINFO_H
+
+#include <cstdint>
+namespace caf
+{
+  class SRSBNDFrameShiftInfo
+    {
+    public:
+      SRSBNDFrameShiftInfo();
+      virtual ~SRSBNDFrameShiftInfo() {}
+
+      uint16_t timingType;
+      double frameTdcCrtt1;
+      double frameTdcBes;
+      double frameTdcRwm;
+      double frameHltCrtt1;
+      double frameHltBeamGate;
+      double frameApplyAtCaf;
+    };
+} // end namespace
+
+#endif // SRSBNDFRAMESHIFTINFO_H
+//////////////////////////////////////////////////////////////////////////////

sbnanaobj/StandardRecord/SRSBNDTimingInfo.cxx

@@ -0,0 +1,22 @@
+////////////////////////////////////////////////////////////////////////
+// \file    SRSBNDTimingInfo.cxx
+////////////////////////////////////////////////////////////////////////
+
+#include "sbnanaobj/StandardRecord/SRSBNDTimingInfo.h"
+
+#include <limits>
+
+namespace caf
+{
+  SRSBNDTimingInfo::SRSBNDTimingInfo():
+    rawDAQHeaderTimestamp(std::numeric_limits<uint64_t>::min()),
+    tdcCrtt1(std::numeric_limits<uint64_t>::min()),
+    tdcBes(std::numeric_limits<uint64_t>::min()),
+    tdcRwm(std::numeric_limits<uint64_t>::min()),
+    tdcEtrig(std::numeric_limits<uint64_t>::min()),
+    hltCrtt1(std::numeric_limits<uint64_t>::min()),
+    hltEtrig(std::numeric_limits<uint64_t>::min()),
+    hltBeamGate(std::numeric_limits<uint64_t>::min())
+  {}
+} // end namespace caf
+////////////////////////////////////////////////////////////////////////

sbnanaobj/StandardRecord/SRSBNDTimingInfo.h

@@ -0,0 +1,29 @@
+////////////////////////////////////////////////////////////////////////
+// \file    SRSBNDTimingInfo.h
+////////////////////////////////////////////////////////////////////////
+#ifndef SRSBNDFRAME_H
+#define SRSBNDFRAME_H
+
+#include <stdint.h>
+
+namespace caf
+{
+  class SRSBNDTimingInfo
+    {
+    public:
+      SRSBNDTimingInfo();
+      virtual ~SRSBNDTimingInfo() {}
+
+      uint64_t rawDAQHeaderTimestamp;
+      uint64_t tdcCrtt1;
+      uint64_t tdcBes;
+      uint64_t tdcRwm;
+      uint64_t tdcEtrig;
+      uint64_t hltCrtt1;
+      uint64_t hltEtrig;
+      uint64_t hltBeamGate;
+    };
+} // end namespace
+
+#endif // SRSBNDFRAME_H
+//////////////////////////////////////////////////////////////////////////////

sbnanaobj/StandardRecord/StandardRecord.h

@@ -11,6 +11,8 @@
 #include "sbnanaobj/StandardRecord/SRCRTTrack.h"
 #include "sbnanaobj/StandardRecord/SRCRTSpacePoint.h"
 #include "sbnanaobj/StandardRecord/SRSBNDCRTTrack.h"
+#include "sbnanaobj/StandardRecord/SRSBNDFrameShiftInfo.h"
+#include "sbnanaobj/StandardRecord/SRSBNDTimingInfo.h"
 #include "sbnanaobj/StandardRecord/SRHeader.h"
 #include "sbnanaobj/StandardRecord/SRCRTPMTMatch.h"
 #include "sbnanaobj/StandardRecord/SRSlice.h"
@@ -54,10 +56,12 @@ namespace caf
     std::vector<SRSBNDCRTTrack>  sbnd_crt_tracks; ///< CRT tracks in event (SBND)
     int                         nopflashes; ///< Number of OpFlashes in spill
     std::vector<SROpFlash>       opflashes; ///< List of OpFlashes in spill
-
     int                        ncrtpmt_matches; ///<Number of CRT-PMT Matches in event 
     std::vector<SRCRTPMTMatch> crtpmt_matches;  ///< CRT-PMT matches in event 
     bool pass_flashtrig;     ///< Whether this Record passed the Flash Trigger requirement
+    SRSBNDFrameShiftInfo sbnd_frames; ///< List of Frame Shift in event (SBND)
+    SRSBNDTimingInfo sbnd_timings; ///< List of Timing Info in event in Unix format(SBND)
+
 
   };
 

sbnanaobj/StandardRecord/classes_def.xml

@@ -5,7 +5,11 @@
 <!-- art::Wrappers for these products are defined in CAFMaker -->
 
 <lcgdict>
-  <class name="caf::StandardRecord" ClassVersion="13">
+  <class name="caf::StandardRecord" ClassVersion="17">
+   <version ClassVersion="17" checksum="1860171062"/>
+   <version ClassVersion="16" checksum="3807540114"/>
+   <version ClassVersion="15" checksum="3946743153"/>
+   <version ClassVersion="14" checksum="3798313791"/>
    <version ClassVersion="13" checksum="1979816256"/>
    <version ClassVersion="12" checksum="3984422068"/>
    <version ClassVersion="11" checksum="483883398"/>
@@ -366,7 +370,8 @@
    <version ClassVersion="10" checksum="2672302824"/>
   </class>
 
-  <class name="caf::SROpFlash" ClassVersion="13">
+  <class name="caf::SROpFlash" ClassVersion="14">
+   <version ClassVersion="14" checksum="1680515282"/>
    <version ClassVersion="13" checksum="2333809763"/>
    <version ClassVersion="12" checksum="3122666215"/>
    <version ClassVersion="11" checksum="2756572285"/>
@@ -407,6 +412,16 @@
   <class name="std::vector<caf::SRCRTSpacePoint>" />
   <class name="std::vector<caf::SRSBNDCRTTrack>" />
 
+  <class name="caf::SRSBNDFrameShiftInfo" ClassVersion="11">
+   <version ClassVersion="11" checksum="2564414428"/>
+   <version ClassVersion="10" checksum="1967800431"/>
+  </class>
+
+  <class name="caf::SRSBNDTimingInfo" ClassVersion="11">
+   <version ClassVersion="11" checksum="4144120809"/>
+   <version ClassVersion="10" checksum="1967800431"/>
+  </class>
+
   <enum name="caf::Det_t" ClassVersion="10"/>
   <enum name="caf::Plane_t" ClassVersion="10"/>
   <enum name="caf::Wall_t" ClassVersion="10"/>