Update CafMaker for refactoring frameshift module

Author: VCLanNguyen

sbncode/CAFMaker/CAFMaker_module.cc

@@ -327,8 +327,8 @@ class CAFMaker : public art::EDProducer {
   void FixPMTReferenceTimes(StandardRecord &rec, double PMT_reference_time);
   void FixCRTReferenceTimes(StandardRecord &rec, double CRTT0_reference_time, double CRTT1_reference_time);
 
-  //void SBNDShiftCRTReference(StandardRecord &rec, double SBNDFrame) const;
-  //void SBNDShiftPMTReference(StandardRecord &rec, double SBNDFrame) const;
+  void SBNDShiftCRTReference(StandardRecord &rec, double SBNDFrame) const;
+  void SBNDShiftPMTReference(StandardRecord &rec, double SBNDFrame) const;
 
   /// Equivalent of FindManyP except a return that is !isValid() prints a
   /// messsage and aborts if StrictMode is true.
@@ -516,43 +516,43 @@ void CAFMaker::BlindEnergyParameters(StandardRecord* brec) {
   }
 }
 
-//void CAFMaker::SBNDShiftCRTReference(StandardRecord &rec, double SBNDFrame) const {
-//
-//  //CRT Space Point
-//  for (SRCRTSpacePoint &sp: rec.crt_spacepoints){
-//    sp.time += SBNDFrame; //ns
-//  }
-//  
-//  //CRT Track
-//  for (SRSBNDCRTTrack &trk: rec.sbnd_crt_tracks){
-//    trk.time += SBNDFrame; //ns
-//  }
-//
-//  //TODO: CRT Space Point and Track Match
-//  for (SRSlice &slc: rec.slc){
-//    for (SRPFP &pfp: slc.reco.pfp){
-//      if(!std::isnan(pfp.trk.crtspacepoint.score)) pfp.trk.crtspacepoint.spacepoint.time += SBNDFrame;
-//
-//      if(!std::isnan(pfp.trk.crtsbndtrack.score)) pfp.trk.crtsbndtrack.track.time += SBNDFrame;
-//    }
-//  }
-//}
-//
-//void CAFMaker::SBNDShiftPMTReference(StandardRecord &rec, double SBNDFrame) const {
-//
-//  double SBNDFrame_us = SBNDFrame / 1000.0; //convert ns to us
-//
-//  //Op Flash
-//  for (SROpFlash &opf: rec.opflashes) {
-//    opf.time += SBNDFrame_us;
-//    opf.firsttime += SBNDFrame_us;
-//  }
-//  
-//  //OpT0 match to slice
-//  for (SRSlice &s: rec.slc) {
-//    s.opt0.time += SBNDFrame_us;
-//  }
-//}
+void CAFMaker::SBNDShiftCRTReference(StandardRecord &rec, double SBNDFrame) const {
+
+  //CRT Space Point
+  for (SRCRTSpacePoint &sp: rec.crt_spacepoints){
+    sp.time += SBNDFrame; //ns
+  }
+  
+  //CRT Track
+  for (SRSBNDCRTTrack &trk: rec.sbnd_crt_tracks){
+    trk.time += SBNDFrame; //ns
+  }
+
+  //TODO: CRT Space Point and Track Match
+  for (SRSlice &slc: rec.slc){
+    for (SRPFP &pfp: slc.reco.pfp){
+      if(!std::isnan(pfp.trk.crtspacepoint.score)) pfp.trk.crtspacepoint.spacepoint.time += SBNDFrame;
+
+      if(!std::isnan(pfp.trk.crtsbndtrack.score)) pfp.trk.crtsbndtrack.track.time += SBNDFrame;
+    }
+  }
+}
+
+void CAFMaker::SBNDShiftPMTReference(StandardRecord &rec, double SBNDFrame) const {
+
+  double SBNDFrame_us = SBNDFrame / 1000.0; //convert ns to us
+
+  //Op Flash
+  for (SROpFlash &opf: rec.opflashes) {
+    opf.time += SBNDFrame_us;
+    opf.firsttime += SBNDFrame_us;
+  }
+  
+  //OpT0 match to slice
+  for (SRSlice &s: rec.slc) {
+    s.opt0.time += SBNDFrame_us;
+  }
+}
 
 void CAFMaker::FixPMTReferenceTimes(StandardRecord &rec, double PMT_reference_time) {
   // Fix the flashes
@@ -2586,28 +2586,21 @@ void CAFMaker::produce(art::Event& evt) noexcept {
   FixPMTReferenceTimes(rec, PMT_reference_time);
 
   // TODO: TPC?
-  
-  //// SBND: Fix the Reference time in data depending on the stream
-  //// For more information, see: 
-  //// https://sbn-docdb.fnal.gov/cgi-bin/sso/RetrieveFile?docid=43090
-
-  //if (isRealData && (fDet == kSBND) && fSubRunPOT > 0)
-  //{
-  //  // Fill trigger info
-  //  FillTriggerSBND(srsbndtiminginfo, srtrigger);
-
-  //  // Shift timing reference frame
-  //  if (!std::isnan(rec.sbnd_frames.frameApplyAtCaf) && (rec.sbnd_frames.frameApplyAtCaf != 0.0)){
-  //    mf::LogInfo("CAFMaker") << "Setting Reference Timing for timing object in SBND \n"
-  //                            << "    Shift Apply At Caf Level = " << rec.sbnd_frames.frameApplyAtCaf << " ns\n";
-  //    
-  //    //shift reference frame for CRT objects: crt trk, crt sp, crt sp match, crt trk match
-  //    SBNDShiftCRTReference(rec, rec.sbnd_frames.frameApplyAtCaf);
-
-  //    //shift reference frame for PMT objects: opflash, opt0
-  //    SBNDShiftPMTReference(rec, rec.sbnd_frames.frameApplyAtCaf);
-  //  }
-  //}
+ 
+
+  if (isRealData && (fDet == kSBND))
+  {
+    // Fill trigger info
+    FillTriggerSBND(srsbndtiminginfo, srtrigger);
+
+    //// Legacy: Timing correction is being done at decoding/reconstruction level
+    //// SBND: Fix the Reference time in data depending on the stream
+    ////shift reference frame for CRT objects: crt trk, crt sp, crt sp match, crt trk match
+    //SBNDShiftCRTReference(rec, rec.sbnd_frames.frameApplyAtCaf);
+
+    ////shift reference frame for PMT objects: opflash, opt0
+    //SBNDShiftPMTReference(rec, rec.sbnd_frames.frameApplyAtCaf);
+  }
 
   // Get metadata information for header
   unsigned int run = evt.run();

sbncode/CAFMaker/FillReco.cxx

@@ -192,14 +192,22 @@ namespace caf
                         caf::SRSBNDFrameShiftInfo &srsbndframe,
                         bool allowEmpty)
   {
-    std::cout << "FIX ME: FillSBNDFrameShiftInfo" << std::endl;
-    //srsbndframe.timingType = frame.TimingType();
-    //srsbndframe.frameTdcCrtt1 = frame.FrameTdcCrtt1();
-    //srsbndframe.frameTdcBes = frame.FrameTdcBes();
-    //srsbndframe.frameTdcRwm = frame.FrameTdcRwm();
-    //srsbndframe.frameHltCrtt1 = frame.FrameHltCrtt1();
-    //srsbndframe.frameHltBeamGate = frame.FrameHltBeamGate();
-    //srsbndframe.frameApplyAtCaf = frame.FrameApplyAtCaf();
+    srsbndframe.frameCrtt1         = frame.FrameCrtt1();
+    srsbndframe.timingTypeCrtt1    = frame.TimingTypeCrtt1();
+    srsbndframe.timingChannelCrtt1 = frame.TimingChannelCrtt1();
+
+    srsbndframe.frameBeamGate         = frame.FrameBeamGate();
+    srsbndframe.timingTypeBeamGate    = frame.TimingTypeBeamGate();
+    srsbndframe.timingChannelBeamGate = frame.TimingChannelBeamGate();
+
+    srsbndframe.frameEtrig         = frame.FrameEtrig();
+    srsbndframe.timingTypeEtrig    = frame.TimingTypeEtrig();
+    srsbndframe.timingChannelEtrig = frame.TimingChannelEtrig();
+
+    srsbndframe.frameDefault         = frame.FrameDefault();
+    srsbndframe.timingTypeDefault    = frame.TimingTypeDefault();
+    srsbndframe.timingChannelDefault = frame.TimingChannelDefault();
+
   }
 
   void FillSBNDTimingInfo(const sbnd::timing::TimingInfo &timing,

sbncode/CAFMaker/FillTrigger.cxx

@@ -39,13 +39,21 @@ namespace caf
   }
 
   void FillTriggerSBND(caf::SRSBNDTimingInfo& timingInfo, caf::SRTrigger& triggerInfo){
-      
-    triggerInfo.global_trigger_time = timingInfo.hltEtrig;
-    triggerInfo.beam_gate_time_abs = timingInfo.hltBeamGate;
-    std::cout << "triggerInfo.global_trigger_det_time: " << triggerInfo.global_trigger_det_time << std::endl;
-	std::cout << "triggerInfo.beam_gate_det_time: " << triggerInfo.beam_gate_det_time << std::endl;
-    double diff_ts = triggerInfo.global_trigger_det_time - triggerInfo.beam_gate_det_time;
-	std::cout << "diff_ts: " << diff_ts << std::endl;
+
+    if (timingInfo.hltEtrig != std::numeric_limits<uint64_t>::max()) triggerInfo.global_trigger_time = timingInfo.hltEtrig;
+    if (timingInfo.hltBeamGate != std::numeric_limits<uint64_t>::max()) triggerInfo.beam_gate_time_abs = timingInfo.hltBeamGate;
+
+    double diff_ts = std::numeric_limits<double>::max();
+
+    if ((triggerInfo.global_trigger_time != std::numeric_limits<uint64_t>::max()) & (triggerInfo.beam_gate_time_abs != std::numeric_limits<uint64_t>::max())){
+
+      if (triggerInfo.global_trigger_time > triggerInfo.beam_gate_time_abs){
+        diff_ts = triggerInfo.global_trigger_time - triggerInfo.beam_gate_time_abs;
+      }
+      else{
+        diff_ts = (triggerInfo.beam_gate_time_abs - triggerInfo.global_trigger_time)*(double)-1;
+      }
+    }
     triggerInfo.trigger_within_gate = diff_ts;
   }