Feature/gp overlay fix

sbncode/CAFMaker/CAFMakerParams.h

@@ -392,24 +392,30 @@ namespace caf
       "OpFlash"
     };
 
-    Atom<long long> CRTSimT0Offset {
-      Name("CRTSimT0Offset"),
-      Comment("start of beam gate/simulation time in the simulated CRT clock"),
-      0,
-    };
-
     Atom<art::InputTag> TriggerLabel {
       Name("TriggerLabel"),
       Comment("Label of trigger."),
       "daqTrigger"
     };
 
-    Atom<art::InputTag> UnshiftedTriggerLabel {
-      Name("UnshiftedTriggerLabel"),
-      Comment("Label of trigger emulation before applying trigger time shifts."),
-      "emuTriggerUnshifted"
+    Atom<bool> ShiftTimeFromTriggerToBeamGate {
+      Name("ShiftTimeFromTriggerToBeamGate"),
+      Comment("Shifts time in branches from trigger time to beam gate time."),
+      false
+    };
+
+    Atom<double> GlobalTimeReferenceOffset {
+      Name("GlobalTimeReferenceOffset"),
+      Comment("Additional offset added to all times [us]"),
+      0.0
     };
 
+    Atom<double> CRTreferenceTimeOffset {
+      Name("CRTreferenceTimeOffset"),
+      Comment("Additional reference shift for relative CRT times (not timestamps) [us]"),
+      0.0
+    };
+
     Atom<string> FlashTrigLabel {
       Name("FlashTrigLabel"),
       Comment("Label of bool of passing flash trigger."),
@@ -470,24 +476,6 @@ namespace caf
       25.
     };
 
-    Atom<bool> ReferencePMTFromTriggerToBeam {
-      Name("ReferencePMTFromTriggerToBeam"),
-      Comment("Whether to switch the reference time of PMT reco from 'trigger' to 'beam spill' time."),
-      true
-    };
-
-    Atom<bool> ReferenceCRTT0ToBeam {
-      Name("ReferenceCRTT0ToBeam"),
-      Comment("Whether to switch the reference time of CRT T0 reco to the 'beam spill' time."),
-      true
-    };
-
-    Atom<bool> ReferenceCRTT1FromTriggerToBeam {
-      Name("ReferenceCRTT1FromTriggerToBeam"),
-      Comment("Whether to switch the reference time of CRT T1 reco from 'trigger' to the 'beam spill' time."),
-      true
-    };
-
     Atom<string> CVNLabel {
       Name("CVNLabel"),
       Comment("Label of CVN scores."),