Merge branch 'release/v09_89_01_01'

Patch of v09_89_01 to include ML reco PRs

Author: Ibrahim Safa

CMakeLists.txt

@@ -16,7 +16,7 @@
 cmake_minimum_required(VERSION 3.20 FATAL_ERROR)
 
 find_package(cetmodules 3.20.00 REQUIRED)
-project(sbncode VERSION 09.89.01 LANGUAGES CXX)
+project(sbncode VERSION 09.89.01.01 LANGUAGES CXX)
 
 message(STATUS "\n\n  ==========================   ${PROJECT_NAME}   ==========================")
 

sbncode/CAFMaker/CAFMakerParams.h

@@ -52,11 +52,11 @@ namespace caf
     rndm::SeedAtom FakeRecoRandomSeed { Name("FakeRecoRandomSeed"),
       Comment("fix the random seed for the truth-based reconstruction")
       };
-    
+
     rndm::SeedAtom BlindingRandomSeed { Name("BlindingRandomSeed"),
       Comment("fix the random seed for the blinding")
       };
-    
+
     Atom<std::string> DetectorOverride { Name("DetectorOverride"),
       Comment("Override the automatically detectected detector using 'sbnd' or 'icarus'. This parameter should usually be unset - ''"),
       ""
@@ -180,7 +180,7 @@ namespace caf
       "crumbs"
     };
 
-    Atom<string> OpT0Label { 
+    Atom<string> OpT0Label {
       Name("OpT0Label"),
       Comment("Base label of OpT0Finder producer"),
       "opt0finder"
@@ -354,6 +354,12 @@ namespace caf
       "daqTrigger"
     };
 
+    Atom<art::InputTag> UnshiftedTriggerLabel {
+      Name("UnshiftedTriggerLabel"),
+      Comment("Label of trigger emulation before applying trigger time shifts."),
+      "emuTriggerUnshifted"
+    };
+
     Atom<string> FlashTrigLabel {
       Name("FlashTrigLabel"),
       Comment("Label of bool of passing flash trigger."),

sbncode/CAFMaker/CAFMaker_module.cc

@@ -1392,9 +1392,19 @@ void CAFMaker::produce(art::Event& evt) noexcept {
   art::Handle<std::vector<raw::Trigger>> trig_handle;
   GetByLabelStrict(evt, fParams.TriggerLabel().encode(), trig_handle);
 
+  art::Handle<std::vector<raw::Trigger>> unshifted_trig_handle;
+  if (!isRealData)
+    GetByLabelStrict(evt, fParams.UnshiftedTriggerLabel().encode(), unshifted_trig_handle);
+
+  const bool isValidTrigger = extratrig_handle.isValid() && trig_handle.isValid() && trig_handle->size() == 1;
+  const bool isValidUnshiftedTrigger = unshifted_trig_handle.isValid() && unshifted_trig_handle->size() == 1;
+
+  const double triggerShift = (isValidUnshiftedTrigger && isValidTrigger)?
+    unshifted_trig_handle->at(0).TriggerTime() - trig_handle->at(0).TriggerTime() : 0.;
+
   caf::SRTrigger srtrigger;
-  if (extratrig_handle.isValid() && trig_handle.isValid() && trig_handle->size() == 1) {
-    FillTrigger(*extratrig_handle, trig_handle->at(0), srtrigger);
+  if (isValidTrigger) {
+      FillTrigger(*extratrig_handle, trig_handle->at(0), srtrigger, triggerShift);
   }
   // If not real data, fill in enough of the SRTrigger to make (e.g.) the CRT
   // time referencing work. TODO: add more stuff to a "MC"-Trigger?
@@ -1933,7 +1943,7 @@ void CAFMaker::produce(art::Event& evt) noexcept {
         const sbn::PFPCNNScore *cnnScores = fmCNNScores.at(iPart).at(0).get();
         FillCNNScores(thisParticle, cnnScores, pfp);
       }
-    
+
       if (!thisTrack.empty())  { // it has a track!
         assert(thisTrack.size() == 1);
 
@@ -2112,7 +2122,23 @@ void CAFMaker::produce(art::Event& evt) noexcept {
   // time from MC.
   //
   // PMT's:
-  double PMT_reference_time = fParams.ReferencePMTFromTriggerToBeam() ? srtrigger.trigger_within_gate : 0.;
+  //
+  // TW (2024-03-29): In MC, when an event doesn't fire the trigger, the raw::Trigger will be
+  // filled with the default values, which are set to the numerical limits of double.
+  // In this case, we should set the PMT_reference_time to 0.
+
+  const bool hasValidTriggerTime =
+    srtrigger.global_trigger_det_time >
+      (std::numeric_limits<double>::min() + std::numeric_limits<double>::epsilon()) &&
+    srtrigger.global_trigger_det_time <
+      (std::numeric_limits<double>::max() - std::numeric_limits<double>::epsilon());
+
+  double PMT_reference_time = fParams.ReferencePMTFromTriggerToBeam() && hasValidTriggerTime ? triggerShift : 0.;
+
+  mf::LogInfo("CAFMaker") << "Setting PMT reference time to " << PMT_reference_time << " us\n"
+			  << "    Trigger Time   = " << srtrigger.global_trigger_det_time << " us\n"
+			  << "    Beam Gate Time =  " << srtrigger.beam_gate_det_time << " us";
+
   FixPMTReferenceTimes(rec, PMT_reference_time);
 
   // TODO: TPC?

sbncode/CAFMaker/FillTrigger.cxx

@@ -5,12 +5,13 @@ namespace caf
 {
   void FillTrigger(const sbn::ExtraTriggerInfo& addltrig_info,
 		   const raw::Trigger& trig,
-		   caf::SRTrigger& triggerInfo)
+		   caf::SRTrigger& triggerInfo,
+		   const double time_offset = 0.0)
   {
     triggerInfo.global_trigger_time = addltrig_info.triggerTimestamp;
     triggerInfo.beam_gate_time_abs = addltrig_info.beamGateTimestamp;
-    triggerInfo.beam_gate_det_time = trig.BeamGateTime();
-    triggerInfo.global_trigger_det_time = trig.TriggerTime();
+    triggerInfo.beam_gate_det_time = trig.BeamGateTime() + time_offset;
+    triggerInfo.global_trigger_det_time = trig.TriggerTime() + time_offset;
     double diff_ts = triggerInfo.global_trigger_det_time - triggerInfo.beam_gate_det_time;
     triggerInfo.trigger_within_gate = diff_ts;
   }
@@ -20,9 +21,9 @@ namespace caf
     triggerInfo.beam_gate_time_abs = absolute_time;
 
     // Set this to 0 since the "MC" trigger is (for now) always at the spill time
-    triggerInfo.trigger_within_gate = 0.; 
+    triggerInfo.trigger_within_gate = 0.;
 
     // TODO: fill others?
   }
-    
+
 }

sbncode/CAFMaker/FillTrigger.h

@@ -12,7 +12,8 @@ namespace caf
 
   void FillTrigger(const sbn::ExtraTriggerInfo& addltrig_info,
                    const raw::Trigger& trig_info,
-                   caf::SRTrigger& triggerInfo);
+                   caf::SRTrigger& triggerInfo,
+                   const double time_offset);
 
   void FillTriggerMC(double absolute_time, caf::SRTrigger& triggerInfo);