From c62dbdf036c0300806b452e5c4bbfab44e10c16c Mon Sep 17 00:00:00 2001 From: gputnam Date: Fri, 28 Jul 2023 15:50:15 -0500 Subject: [PATCH 1/3] Allow time shift in trigger to IFBeam timing. Skip first event in stream in each run. --- sbncode/CAFMaker/FillTrigger.cxx | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sbncode/CAFMaker/FillTrigger.cxx b/sbncode/CAFMaker/FillTrigger.cxx index 5f8d4b6d1..a1cd07aee 100644 --- a/sbncode/CAFMaker/FillTrigger.cxx +++ b/sbncode/CAFMaker/FillTrigger.cxx @@ -14,6 +14,15 @@ namespace caf 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; + + triggerInfo.prev_global_trigger_time = addltrig_info.previousTriggerTimestamp; + triggerInfo.source_type = (int)addltrig_info.sourceType; + triggerInfo.trigger_type = (int)addltrig_info.triggerType; + triggerInfo.trigger_id = addltrig_info.triggerID; + triggerInfo.gate_id = addltrig_info.gateID; + triggerInfo.trigger_count = addltrig_info.triggerCount; + triggerInfo.gate_count = addltrig_info.gateCount; + triggerInfo.gate_delta = (int)addltrig_info.gateCountFromPreviousTrigger; } void FillTriggerMC(double absolute_time, caf::SRTrigger& triggerInfo) { From d90537f1b68bcced616e71ef889f91f8c5c0ebeb Mon Sep 17 00:00:00 2001 From: Bruce Howard Date: Wed, 22 May 2024 16:54:16 -0500 Subject: [PATCH 2/3] Update following Gianluca's comments - those were related to PR 431 for the NuMI reprocessing release, but put here in the version for develop. --- sbncode/CAFMaker/FillTrigger.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sbncode/CAFMaker/FillTrigger.cxx b/sbncode/CAFMaker/FillTrigger.cxx index a1cd07aee..d29798643 100644 --- a/sbncode/CAFMaker/FillTrigger.cxx +++ b/sbncode/CAFMaker/FillTrigger.cxx @@ -16,13 +16,13 @@ namespace caf triggerInfo.trigger_within_gate = diff_ts; triggerInfo.prev_global_trigger_time = addltrig_info.previousTriggerTimestamp; - triggerInfo.source_type = (int)addltrig_info.sourceType; - triggerInfo.trigger_type = (int)addltrig_info.triggerType; + triggerInfo.source_type = value(addltrig_info.sourceType); + triggerInfo.trigger_type = value(addltrig_info.triggerType); triggerInfo.trigger_id = addltrig_info.triggerID; triggerInfo.gate_id = addltrig_info.gateID; triggerInfo.trigger_count = addltrig_info.triggerCount; triggerInfo.gate_count = addltrig_info.gateCount; - triggerInfo.gate_delta = (int)addltrig_info.gateCountFromPreviousTrigger; + triggerInfo.gate_delta = value(addltrig_info.gateCountFromPreviousTrigger); } void FillTriggerMC(double absolute_time, caf::SRTrigger& triggerInfo) { From afccd18c33e87c8c38590e59b3172ffdbfae778f Mon Sep 17 00:00:00 2001 From: Bruce Howard Date: Wed, 22 May 2024 21:57:11 -0500 Subject: [PATCH 3/3] Per Gianluca's suggestion, adding the sbn bits value to get source type and trigger type --- sbncode/CAFMaker/FillTrigger.cxx | 6 +++--- sbncode/CAFMaker/FillTrigger.h | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/sbncode/CAFMaker/FillTrigger.cxx b/sbncode/CAFMaker/FillTrigger.cxx index d29798643..009deccef 100644 --- a/sbncode/CAFMaker/FillTrigger.cxx +++ b/sbncode/CAFMaker/FillTrigger.cxx @@ -16,13 +16,13 @@ namespace caf triggerInfo.trigger_within_gate = diff_ts; triggerInfo.prev_global_trigger_time = addltrig_info.previousTriggerTimestamp; - triggerInfo.source_type = value(addltrig_info.sourceType); - triggerInfo.trigger_type = value(addltrig_info.triggerType); + triggerInfo.source_type = sbn::bits::value(addltrig_info.sourceType); + triggerInfo.trigger_type = sbn::bits::value(addltrig_info.triggerType); triggerInfo.trigger_id = addltrig_info.triggerID; triggerInfo.gate_id = addltrig_info.gateID; triggerInfo.trigger_count = addltrig_info.triggerCount; triggerInfo.gate_count = addltrig_info.gateCount; - triggerInfo.gate_delta = value(addltrig_info.gateCountFromPreviousTrigger); + triggerInfo.gate_delta = addltrig_info.gateCountFromPreviousTrigger; } void FillTriggerMC(double absolute_time, caf::SRTrigger& triggerInfo) { diff --git a/sbncode/CAFMaker/FillTrigger.h b/sbncode/CAFMaker/FillTrigger.h index 1968ab3ba..b83c2e9f0 100644 --- a/sbncode/CAFMaker/FillTrigger.h +++ b/sbncode/CAFMaker/FillTrigger.h @@ -2,6 +2,7 @@ #define CAF_FILLTRIGGER_H #include "sbnobj/Common/Trigger/ExtraTriggerInfo.h" +#include "sbnobj/Common/Trigger/BeamBits.h" #include "sbnanaobj/StandardRecord/SRTrigger.h" #include "lardataobj/RawData/TriggerData.h"