From 79083a3a20a57255982395f9ed8181a7e4a86e8c Mon Sep 17 00:00:00 2001 From: kjplows Date: Thu, 20 Nov 2025 21:29:29 -0600 Subject: [PATCH 1/7] no-op to reopen PR with --- sbnanaobj/StandardRecord/SRSoftwareTrigger.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sbnanaobj/StandardRecord/SRSoftwareTrigger.h b/sbnanaobj/StandardRecord/SRSoftwareTrigger.h index 9fb67f6..73ca4ef 100644 --- a/sbnanaobj/StandardRecord/SRSoftwareTrigger.h +++ b/sbnanaobj/StandardRecord/SRSoftwareTrigger.h @@ -18,10 +18,10 @@ namespace caf{ */ struct SRSoftwareTrigger { - int npmts = caf::kUninitializedInt; - float flash_peaktime = caf::kSignalingNaN; + int npmts = caf::kUninitializedInt; + float flash_peaktime = caf::kSignalingNaN; float flash_peakpe = caf::kSignalingNaN; }; } -#endif \ No newline at end of file +#endif From 235e9699ccf50aa1973f5c127a102a073ae5e231 Mon Sep 17 00:00:00 2001 From: kjplows Date: Thu, 20 Nov 2025 21:33:23 -0600 Subject: [PATCH 2/7] Restore ClassDef=15 to what v10_00_13 originally had --- sbnanaobj/StandardRecord/SRSoftwareTrigger.h | 2 +- sbnanaobj/StandardRecord/classes_def.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sbnanaobj/StandardRecord/SRSoftwareTrigger.h b/sbnanaobj/StandardRecord/SRSoftwareTrigger.h index 73ca4ef..f63cec1 100644 --- a/sbnanaobj/StandardRecord/SRSoftwareTrigger.h +++ b/sbnanaobj/StandardRecord/SRSoftwareTrigger.h @@ -17,7 +17,7 @@ namespace caf{ * @brief A struct to store software trigger information for SBND Data and MC */ - struct SRSoftwareTrigger { + struct SRSoftwareTrigger { int npmts = caf::kUninitializedInt; float flash_peaktime = caf::kSignalingNaN; float flash_peakpe = caf::kSignalingNaN; diff --git a/sbnanaobj/StandardRecord/classes_def.xml b/sbnanaobj/StandardRecord/classes_def.xml index c870bf1..d155b9f 100644 --- a/sbnanaobj/StandardRecord/classes_def.xml +++ b/sbnanaobj/StandardRecord/classes_def.xml @@ -8,7 +8,7 @@ - + From 47cffd7a3e29579cfc3bf41ee103f6fcc1069fba Mon Sep 17 00:00:00 2001 From: lynnt20 Date: Wed, 12 Nov 2025 16:31:58 -0600 Subject: [PATCH 3/7] first commit of software trigger additions --- sbnanaobj/StandardRecord/SRSoftwareTrigger.h | 25 ++++++++++++++++++++ sbnanaobj/StandardRecord/StandardRecord.h | 3 ++- sbnanaobj/StandardRecord/classes_def.xml | 2 ++ 3 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 sbnanaobj/StandardRecord/SRSoftwareTrigger.h diff --git a/sbnanaobj/StandardRecord/SRSoftwareTrigger.h b/sbnanaobj/StandardRecord/SRSoftwareTrigger.h new file mode 100644 index 0000000..dcb8faf --- /dev/null +++ b/sbnanaobj/StandardRecord/SRSoftwareTrigger.h @@ -0,0 +1,25 @@ +/** + * @file /sbnanaobj/StandardRecord/SRSoftwareTrigger.h + * @brief Defines CAF data structures to store sbnd::trigger::pmtSoftwareTrigger objects (header). + * @author Lynn Tung + * @date November 12, 2025 + * + */ + +#ifndef SRSOFTWARETRIGGER_H +#define SRSOFTWARETRIGGER_H + +namespace caf{ + + /** + * @brief A struct to store software trigger information for SBND Data and MC + */ + + struct SRSoftwareTrigger { + int npmts = std::numeric_limits::signaling_NaN(); + float flash_peaktime = std::numeric_limits::signaling_NaN(); + float flash_peakpe = std::numeric_limits::signaling_NaN(); + }; +} + +#endif \ No newline at end of file diff --git a/sbnanaobj/StandardRecord/StandardRecord.h b/sbnanaobj/StandardRecord/StandardRecord.h index ff8586b..7734946 100644 --- a/sbnanaobj/StandardRecord/StandardRecord.h +++ b/sbnanaobj/StandardRecord/StandardRecord.h @@ -22,6 +22,7 @@ #include "sbnanaobj/StandardRecord/SRFakeReco.h" #include "sbnanaobj/StandardRecord/SROpFlash.h" #include "sbnanaobj/StandardRecord/SRTrigger.h" +#include "sbnanaobj/StandardRecord/SRSoftwareTrigger.h" #include "sbnanaobj/StandardRecord/SRInteractionDLP.h" #include "sbnanaobj/StandardRecord/SRInteractionTruthDLP.h" @@ -66,7 +67,7 @@ namespace caf bool pass_flashtrig = false; ///< Whether this Record passed the Flash Trigger requirement SRSBNDFrameShiftInfo sbnd_frames; ///< List of Frame Shift in event in unit [ns] (SBND) SRSBNDTimingInfo sbnd_timings; ///< List of Timing Info in event in UNIX timestamp format(SBND) - + SRSoftwareTrigger soft_trig; ///< Software Trigger Info in event int ndlp = 0; ///< Number of reco DLP (ML) interactions. std::vector dlp; ///< Reco DLP (ML) interactions. int ndlp_true = 0; ///< Number of true DLP (ML) interactions. diff --git a/sbnanaobj/StandardRecord/classes_def.xml b/sbnanaobj/StandardRecord/classes_def.xml index ec79d7f..7cb9c3b 100644 --- a/sbnanaobj/StandardRecord/classes_def.xml +++ b/sbnanaobj/StandardRecord/classes_def.xml @@ -445,6 +445,8 @@ + + From 18be1b05bb32bfe241708e5c5cc36b94c5e49fc9 Mon Sep 17 00:00:00 2001 From: lynnt20 Date: Thu, 13 Nov 2025 11:17:36 -0600 Subject: [PATCH 4/7] update classes_def with new software trigger class, editing ClassesDef to keep with v10_00_13 --- sbnanaobj/StandardRecord/classes_def.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sbnanaobj/StandardRecord/classes_def.xml b/sbnanaobj/StandardRecord/classes_def.xml index 7cb9c3b..2030538 100644 --- a/sbnanaobj/StandardRecord/classes_def.xml +++ b/sbnanaobj/StandardRecord/classes_def.xml @@ -5,7 +5,8 @@ - + + From e686dd1310098e3d714f97884ac01b69182b839b Mon Sep 17 00:00:00 2001 From: lynnt20 Date: Tue, 18 Nov 2025 09:48:05 -0600 Subject: [PATCH 5/7] inherit SRConstants instead --- sbnanaobj/StandardRecord/SRSoftwareTrigger.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sbnanaobj/StandardRecord/SRSoftwareTrigger.h b/sbnanaobj/StandardRecord/SRSoftwareTrigger.h index dcb8faf..9fb67f6 100644 --- a/sbnanaobj/StandardRecord/SRSoftwareTrigger.h +++ b/sbnanaobj/StandardRecord/SRSoftwareTrigger.h @@ -9,6 +9,8 @@ #ifndef SRSOFTWARETRIGGER_H #define SRSOFTWARETRIGGER_H +#include "sbnanaobj/StandardRecord/SRConstants.h" + namespace caf{ /** @@ -16,9 +18,9 @@ namespace caf{ */ struct SRSoftwareTrigger { - int npmts = std::numeric_limits::signaling_NaN(); - float flash_peaktime = std::numeric_limits::signaling_NaN(); - float flash_peakpe = std::numeric_limits::signaling_NaN(); + int npmts = caf::kUninitializedInt; + float flash_peaktime = caf::kSignalingNaN; + float flash_peakpe = caf::kSignalingNaN; }; } From 185d58fd46198245dd7992d5d1ea79bd21d12e3c Mon Sep 17 00:00:00 2001 From: kjplows Date: Thu, 20 Nov 2025 21:52:01 -0600 Subject: [PATCH 6/7] Update classes_def.xml --- sbnanaobj/StandardRecord/classes_def.xml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sbnanaobj/StandardRecord/classes_def.xml b/sbnanaobj/StandardRecord/classes_def.xml index 2030538..007cbb3 100644 --- a/sbnanaobj/StandardRecord/classes_def.xml +++ b/sbnanaobj/StandardRecord/classes_def.xml @@ -6,7 +6,7 @@ - + @@ -446,7 +446,9 @@ - + + + From b1042679df4798c8f91fdd378bbfd59baf89167e Mon Sep 17 00:00:00 2001 From: Lynn Tung <71307529+lynnt20@users.noreply.github.com> Date: Thu, 20 Nov 2025 23:46:23 -0600 Subject: [PATCH 7/7] add descriptions to the Software Trigger class --- sbnanaobj/StandardRecord/SRSoftwareTrigger.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sbnanaobj/StandardRecord/SRSoftwareTrigger.h b/sbnanaobj/StandardRecord/SRSoftwareTrigger.h index 9fb67f6..8567d7e 100644 --- a/sbnanaobj/StandardRecord/SRSoftwareTrigger.h +++ b/sbnanaobj/StandardRecord/SRSoftwareTrigger.h @@ -18,10 +18,10 @@ namespace caf{ */ struct SRSoftwareTrigger { - int npmts = caf::kUninitializedInt; - float flash_peaktime = caf::kSignalingNaN; - float flash_peakpe = caf::kSignalingNaN; + int npmts = caf::kUninitializedInt; ///< In data, number of pmts over threshold; In simulation, number of pmt waveforms used for the trigger sim + float flash_peaktime = caf::kSignalingNaN; ///< Peak time of the flash [us] + float flash_peakpe = caf::kSignalingNaN; ///< Peak amplitude of the flash, 1 PE = 12.5 ADC }; } -#endif \ No newline at end of file +#endif