Merge branch 'develop' into feature/TriggerWorkNikkiCAFs

kjplows · web-flow · commit a342ca7ed1b5 · 2025-09-30T18:11:10.000-05:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -16,7 +16,7 @@
 cmake_minimum_required(VERSION 3.20 FATAL_ERROR)
 
 find_package(cetmodules 3.20.00 REQUIRED)
-project(sbncode VERSION 10.10.03.01 LANGUAGES CXX)
+project(sbncode VERSION 10.10.03.02 LANGUAGES CXX)
 
 message(STATUS "\n\n  ==========================   ${PROJECT_NAME}   ==========================")
 
diff --git a/sbncode/CAFMaker/CAFMaker_module.cc b/sbncode/CAFMaker/CAFMaker_module.cc
@@ -1654,6 +1654,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<bool> flashtrig_handle;
   GetByLabelStrict(evt, fParams.FlashTrigLabel(), flashtrig_handle);
diff --git a/sbncode/CAFMaker/FillTrigger.cxx b/sbncode/CAFMaker/FillTrigger.cxx
@@ -1,4 +1,4 @@
-
+#include<iostream>
 #include "sbncode/CAFMaker/FillTrigger.h"
 
 namespace caf
@@ -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;
@@ -39,8 +42,10 @@ namespace caf
       
     triggerInfo.global_trigger_time = timingInfo.hltEtrig;
     triggerInfo.beam_gate_time_abs = timingInfo.hltBeamGate;
-    
+    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;
   }
 
diff --git a/sbncode/Supera b/sbncode/Supera
@@ -1 +1 @@
-Subproject commit d84d726d95017f4b86a99537f6d86deeda3216c3
+Subproject commit 26e2abb92fe757510ca0a7e54444e8018aa721f7
diff --git a/ups/product_deps b/ups/product_deps
@@ -255,7 +255,7 @@ product			version		qual	flags		<table_format=2>
 genie_xsec		v3_04_00	-
 larcv2			v2_2_6		-
 larsoft			v10_10_03	-
-sbnalg		        v10_10_03	-
+sbnalg		        v10_10_03_01	-
 sbndaq_artdaq_core	v1_10_06	-
 sbndata			v01_08		-
 systematicstools	v01_04_04	-
