From 8e53d3e3b8729116970146931455762cfac49216 Mon Sep 17 00:00:00 2001
From: Nikki Pallat <palla110@umn.edu>
Date: Tue, 23 Sep 2025 12:46:47 -0500
Subject: [PATCH 1/2] Update definitions for new trigger variables for the cafs

---
 sbnobj/Common/Trigger/ExtraTriggerInfo.h | 15 ++++++++++++++-
 sbnobj/Common/Trigger/classes_def.xml    |  3 ++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/sbnobj/Common/Trigger/ExtraTriggerInfo.h b/sbnobj/Common/Trigger/ExtraTriggerInfo.h
index ce07df500..a6048c5d8 100644
--- a/sbnobj/Common/Trigger/ExtraTriggerInfo.h
+++ b/sbnobj/Common/Trigger/ExtraTriggerInfo.h
@@ -19,6 +19,7 @@
 #include <iosfwd> // std::ostream
 #include <limits> // std::numeric_limits<>
 #include <cstdint> // std::uint64_t
+#include <vector>
 
 
 // -----------------------------------------------------------------------------
@@ -87,7 +88,19 @@ struct sbn::ExtraTriggerInfo {
   
   /// Incremental counter of gates from this source opened from start of the run.
   unsigned int gateCount { 0 };
-  
+
+  // Boolean telling if the event passed the trigger
+  bool triggerEmulation { false };
+
+  // Number of PMT pairs over the trigger threshold
+  int pairsOverThreshold { 0 };
+
+  // Trigger responses for all of the waveforms in the event (flattened)
+  std::vector<int> MonPulses { std::vector<int>() }; // default ???
+
+  // Length of each trigger response to unflatten the trigger responses
+  std::vector<int> MonPulseSizes { std::vector<int>() }; 
+
   /// @}
   // --- END ---- Since the beginning of the run -------------------------------
   
diff --git a/sbnobj/Common/Trigger/classes_def.xml b/sbnobj/Common/Trigger/classes_def.xml
index 92bfe3570..e57e224c7 100644
--- a/sbnobj/Common/Trigger/classes_def.xml
+++ b/sbnobj/Common/Trigger/classes_def.xml
@@ -19,7 +19,8 @@
   <!-- sbn::ExtraTriggerInfo -->
 
   <!--   class -->
-  <class name="sbn::ExtraTriggerInfo" ClassVersion="10" >
+  <class name="sbn::ExtraTriggerInfo" ClassVersion="11" >
+   <version ClassVersion="11" checksum="587699878"/>
    <version ClassVersion="10" checksum="1967722932"/>
   </class>
   

From ad1730be0690db100bc43ca86c3cbb7a39f34c81 Mon Sep 17 00:00:00 2001
From: Nikki Pallat <palla110@umn.edu>
Date: Tue, 30 Sep 2025 17:55:46 -0500
Subject: [PATCH 2/2] Updated to work with and fill trigger emulation variables

---
 sbnobj/Common/Trigger/ExtraTriggerInfo.h | 12 ------------
 sbnobj/Common/Trigger/classes_def.xml    |  3 ++-
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/sbnobj/Common/Trigger/ExtraTriggerInfo.h b/sbnobj/Common/Trigger/ExtraTriggerInfo.h
index a6048c5d8..4133b2891 100644
--- a/sbnobj/Common/Trigger/ExtraTriggerInfo.h
+++ b/sbnobj/Common/Trigger/ExtraTriggerInfo.h
@@ -89,18 +89,6 @@ struct sbn::ExtraTriggerInfo {
   /// Incremental counter of gates from this source opened from start of the run.
   unsigned int gateCount { 0 };
 
-  // Boolean telling if the event passed the trigger
-  bool triggerEmulation { false };
-
-  // Number of PMT pairs over the trigger threshold
-  int pairsOverThreshold { 0 };
-
-  // Trigger responses for all of the waveforms in the event (flattened)
-  std::vector<int> MonPulses { std::vector<int>() }; // default ???
-
-  // Length of each trigger response to unflatten the trigger responses
-  std::vector<int> MonPulseSizes { std::vector<int>() }; 
-
   /// @}
   // --- END ---- Since the beginning of the run -------------------------------
   
diff --git a/sbnobj/Common/Trigger/classes_def.xml b/sbnobj/Common/Trigger/classes_def.xml
index e57e224c7..92873597b 100644
--- a/sbnobj/Common/Trigger/classes_def.xml
+++ b/sbnobj/Common/Trigger/classes_def.xml
@@ -19,7 +19,8 @@
   <!-- sbn::ExtraTriggerInfo -->
 
   <!--   class -->
-  <class name="sbn::ExtraTriggerInfo" ClassVersion="11" >
+  <class name="sbn::ExtraTriggerInfo" ClassVersion="12" >
+   <version ClassVersion="12" checksum="1967722932"/>
    <version ClassVersion="11" checksum="587699878"/>
    <version ClassVersion="10" checksum="1967722932"/>
   </class>