Merge branch 'release/v10_10_03_02'

nathanielerowe · nathanielerowe · commit 2e14e4e5fdfc · 2025-09-24T17:06:32.000-05:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -15,7 +15,7 @@
 
 cmake_minimum_required(VERSION 3.20 FATAL_ERROR)
 
-set(${PROJECT_NAME}_CMAKE_PROJECT_VERSION_STRING 10.10.03.01)
+set(${PROJECT_NAME}_CMAKE_PROJECT_VERSION_STRING 10.10.03.02)
 find_package(cetmodules REQUIRED)
 project(sbndcode LANGUAGES CXX)
 
diff --git a/sbndcode/JobConfigurations/dnnroi/cafmakerjob_sbnd_data_sce_bnblight_dnnroi.fcl b/sbndcode/JobConfigurations/dnnroi/cafmakerjob_sbnd_data_sce_bnblight_dnnroi.fcl
@@ -0,0 +1,3 @@
+#include "cafmakerjob_sbnd_data_sce_bnblight.fcl"
+
+physics.producers.cnnid.WireLabel: "sptpc2d:dnnsp"
diff --git a/sbndcode/JobConfigurations/dnnroi/cafmakerjob_sbnd_data_sce_offbeamlight_dnnroi.fcl b/sbndcode/JobConfigurations/dnnroi/cafmakerjob_sbnd_data_sce_offbeamlight_dnnroi.fcl
@@ -0,0 +1,3 @@
+#include "cafmakerjob_sbnd_data_sce_offbeamlight.fcl"
+
+physics.producers.cnnid.WireLabel: "sptpc2d:dnnsp"
diff --git a/sbndcode/JobConfigurations/dnnroi/cafmakerjob_sbnd_sce_cosmics_dnnroi.fcl b/sbndcode/JobConfigurations/dnnroi/cafmakerjob_sbnd_sce_cosmics_dnnroi.fcl
@@ -0,0 +1,3 @@
+#include "cafmakerjob_sbnd_sce_cosmics.fcl"
+
+physics.producers.cnnid.WireLabel: "simtpc2d:dnnsp"
diff --git a/sbndcode/JobConfigurations/dnnroi/cafmakerjob_sbnd_sce_systtools_and_fluxwgt_dnnroi.fcl b/sbndcode/JobConfigurations/dnnroi/cafmakerjob_sbnd_sce_systtools_and_fluxwgt_dnnroi.fcl
@@ -0,0 +1,3 @@
+#include "cafmakerjob_sbnd_sce_systtools_and_fluxwgt.fcl"
+
+physics.producers.cnnid.WireLabel: "simtpc2d:dnnsp"
diff --git a/sbndcode/JobConfigurations/dnnroi/reco1_data_dnnroi.fcl b/sbndcode/JobConfigurations/dnnroi/reco1_data_dnnroi.fcl
@@ -6,7 +6,7 @@
 # for downstream reco1, run gaushitfinder on sptpc2d:gauss, from traditional ROI finding
 #                       to generate matching files with downstream reco1 run on sptpc2d:dnnsp, gaushits should be scrubbed and run again
 #
-#include "reco1_data.fcl"
+#include "reco1_data_storefilteredevents.fcl"
 
 physics.producers.sptpc2d: @local::sbnd_wcls_sp_data_bothrois
 

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+#include "cafmakerjob_sbnd_data_sce_bnblight.fcl"`
	`2`	`+`
	`3`	`+physics.producers.cnnid.WireLabel: "sptpc2d:dnnsp"`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+#include "cafmakerjob_sbnd_data_sce_offbeamlight.fcl"`
	`2`	`+`
	`3`	`+physics.producers.cnnid.WireLabel: "sptpc2d:dnnsp"`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+#include "cafmakerjob_sbnd_sce_cosmics.fcl"`
	`2`	`+`
	`3`	`+physics.producers.cnnid.WireLabel: "simtpc2d:dnnsp"`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+#include "cafmakerjob_sbnd_sce_systtools_and_fluxwgt.fcl"`
	`2`	`+`
	`3`	`+physics.producers.cnnid.WireLabel: "simtpc2d:dnnsp"`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`# for downstream reco1, run gaushitfinder on sptpc2d:gauss, from traditional ROI finding`
`7`	`7`	`# to generate matching files with downstream reco1 run on sptpc2d:dnnsp, gaushits should be scrubbed and run again`
`8`	`8`	`#`
`9`		`-#include "reco1_data.fcl"`
	`9`	`+#include "reco1_data_storefilteredevents.fcl"`
`10`	`10`
`11`	`11`	`physics.producers.sptpc2d: @local::sbnd_wcls_sp_data_bothrois`
`12`	`12`