From 807f1bd4d6e6388634995e5406ede41458b364eb Mon Sep 17 00:00:00 2001 From: nathanielerowe <70993723+nathanielerowe@users.noreply.github.com> Date: Wed, 17 Sep 2025 14:02:49 -0500 Subject: [PATCH 1/6] Update FillTrigger.cxx --- sbncode/CAFMaker/FillTrigger.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbncode/CAFMaker/FillTrigger.cxx b/sbncode/CAFMaker/FillTrigger.cxx index 8bf82c02c..c214f0a8d 100644 --- a/sbncode/CAFMaker/FillTrigger.cxx +++ b/sbncode/CAFMaker/FillTrigger.cxx @@ -40,7 +40,7 @@ namespace caf triggerInfo.global_trigger_time = timingInfo.hltEtrig; triggerInfo.beam_gate_time_abs = timingInfo.hltBeamGate; - double diff_ts = triggerInfo.global_trigger_det_time - triggerInfo.beam_gate_det_time; + uint64_t diff_ts = triggerInfo.global_trigger_det_time - triggerInfo.beam_gate_det_time; triggerInfo.trigger_within_gate = diff_ts; } From 9316f6f2662fdccfc2ac1d2b75cb86d5a2d6eb0b Mon Sep 17 00:00:00 2001 From: nathanielerowe <70993723+nathanielerowe@users.noreply.github.com> Date: Wed, 17 Sep 2025 16:21:46 -0500 Subject: [PATCH 2/6] Update FillTrigger.cxx --- sbncode/CAFMaker/FillTrigger.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbncode/CAFMaker/FillTrigger.cxx b/sbncode/CAFMaker/FillTrigger.cxx index c214f0a8d..86f52626c 100644 --- a/sbncode/CAFMaker/FillTrigger.cxx +++ b/sbncode/CAFMaker/FillTrigger.cxx @@ -41,7 +41,7 @@ namespace caf triggerInfo.beam_gate_time_abs = timingInfo.hltBeamGate; uint64_t diff_ts = triggerInfo.global_trigger_det_time - triggerInfo.beam_gate_det_time; - triggerInfo.trigger_within_gate = diff_ts; + triggerInfo.trigger_within_gate = static_cast(diff_ts); } } From 4f20a897677f235d7c4a17f109aaa67c38354815 Mon Sep 17 00:00:00 2001 From: nathanielerowe <70993723+nathanielerowe@users.noreply.github.com> Date: Wed, 17 Sep 2025 18:08:00 -0500 Subject: [PATCH 3/6] Update FillTrigger.cxx --- sbncode/CAFMaker/FillTrigger.cxx | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sbncode/CAFMaker/FillTrigger.cxx b/sbncode/CAFMaker/FillTrigger.cxx index 86f52626c..369dbda05 100644 --- a/sbncode/CAFMaker/FillTrigger.cxx +++ b/sbncode/CAFMaker/FillTrigger.cxx @@ -39,9 +39,11 @@ namespace caf triggerInfo.global_trigger_time = timingInfo.hltEtrig; triggerInfo.beam_gate_time_abs = timingInfo.hltBeamGate; - - uint64_t diff_ts = triggerInfo.global_trigger_det_time - triggerInfo.beam_gate_det_time; - triggerInfo.trigger_within_gate = static_cast(diff_ts); + 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; + triggerInfo.trigger_within_gate = diff_ts; } } From 9eb83267a8f65d91ea80c4d04f0e80dee26c6c05 Mon Sep 17 00:00:00 2001 From: nathanielerowe <70993723+nathanielerowe@users.noreply.github.com> Date: Wed, 17 Sep 2025 18:39:09 -0500 Subject: [PATCH 4/6] Update FillTrigger.cxx --- sbncode/CAFMaker/FillTrigger.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbncode/CAFMaker/FillTrigger.cxx b/sbncode/CAFMaker/FillTrigger.cxx index 369dbda05..9df7a190f 100644 --- a/sbncode/CAFMaker/FillTrigger.cxx +++ b/sbncode/CAFMaker/FillTrigger.cxx @@ -1,4 +1,4 @@ - +#include #include "sbncode/CAFMaker/FillTrigger.h" namespace caf From e599e803362663f89b19599d4e61bb116aaeed31 Mon Sep 17 00:00:00 2001 From: nathanielerowe <70993723+nathanielerowe@users.noreply.github.com> Date: Wed, 17 Sep 2025 19:46:27 -0500 Subject: [PATCH 5/6] Update FillTrigger.cxx --- sbncode/CAFMaker/FillTrigger.cxx | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sbncode/CAFMaker/FillTrigger.cxx b/sbncode/CAFMaker/FillTrigger.cxx index 9df7a190f..392d46566 100644 --- a/sbncode/CAFMaker/FillTrigger.cxx +++ b/sbncode/CAFMaker/FillTrigger.cxx @@ -12,7 +12,10 @@ namespace caf triggerInfo.beam_gate_time_abs = addltrig_info.beamGateTimestamp; triggerInfo.beam_gate_det_time = trig.BeamGateTime() + time_offset; triggerInfo.global_trigger_det_time = trig.TriggerTime() + time_offset; + std::cout << "Gen triggerInfo.global_trigger_det_time: " << triggerInfo.global_trigger_det_time << std::endl; + std::cout << "Gen 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; triggerInfo.trigger_within_gate = diff_ts; triggerInfo.prev_global_trigger_time = addltrig_info.previousTriggerTimestamp; From 3b130923403fe481ab89b871e824b427901b740d Mon Sep 17 00:00:00 2001 From: nathanielerowe <70993723+nathanielerowe@users.noreply.github.com> Date: Wed, 17 Sep 2025 19:49:58 -0500 Subject: [PATCH 6/6] Update CAFMaker_module.cc --- sbncode/CAFMaker/CAFMaker_module.cc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sbncode/CAFMaker/CAFMaker_module.cc b/sbncode/CAFMaker/CAFMaker_module.cc index 29a35d0ee..2d82e3ebf 100644 --- a/sbncode/CAFMaker/CAFMaker_module.cc +++ b/sbncode/CAFMaker/CAFMaker_module.cc @@ -1628,6 +1628,8 @@ void CAFMaker::produce(art::Event& evt) noexcept { // } // try to find the result of the Flash trigger if it was run + mf::LogInfo("CAFMaker") << " New Trigger Time = " << srtrigger.global_trigger_det_time << " us\n" + << " New Beam Gate Time = " << srtrigger.beam_gate_det_time << " us"; bool pass_flash_trig = false; art::Handle flashtrig_handle; GetByLabelStrict(evt, fParams.FlashTrigLabel(), flashtrig_handle);