From 0126aae422ed43e1a6cdd33857727d9e7ed99500 Mon Sep 17 00:00:00 2001 From: lynnt20 Date: Wed, 2 Jul 2025 15:47:09 -0500 Subject: [PATCH 1/7] make comment syntax uniform --- .../genie_corsika/prodgenie_corsika_proton_rockbox_sbnd.fcl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sbndcode/JobConfigurations/standard/gen/genie_corsika/prodgenie_corsika_proton_rockbox_sbnd.fcl b/sbndcode/JobConfigurations/standard/gen/genie_corsika/prodgenie_corsika_proton_rockbox_sbnd.fcl index 52efb6487..1fb5dd807 100644 --- a/sbndcode/JobConfigurations/standard/gen/genie_corsika/prodgenie_corsika_proton_rockbox_sbnd.fcl +++ b/sbndcode/JobConfigurations/standard/gen/genie_corsika/prodgenie_corsika_proton_rockbox_sbnd.fcl @@ -22,13 +22,13 @@ physics.producers.largeant: @local::sbnd_merge_overlay_sim_sources # Tell the dirt filter to use the new largeant for neutrinos only physics.filters.dirtfilter.SimEnergyDepModuleName: "largeantnu:LArG4DetectorServicevolTPCActive" -#Merge dropped MCParticle collections +# Merge dropped MCParticle collections physics.producers.largeantdropped: @local::sbnd_merge_dropped_mcpart_overlay # Change simple merge inputs since we're using an overlay sample physics.producers.simplemerge.InputSourcesLabels: ["largeant", "largeantdropped"] -// Change the name of largeant->largeantnu and add corsika and largeant merging +# Change the name of largeant->largeantnu and add corsika and largeant merging physics.simulatetpc: [ rns, generator, loader, largeantnu, tpcfilter, corsika, largeantcosmic, largeant, largeantdropped, simplemerge ] physics.simulatedirt: [ rns, generator, loader, largeantnu, "!tpcfilter", dirtfilter, corsika, largeantcosmic, largeant, largeantdropped, simplemerge ] From 2f6650a225202b3fe62f123ca100d1e9f7f4a1ab Mon Sep 17 00:00:00 2001 From: lynnt20 Date: Wed, 2 Jul 2025 15:47:24 -0500 Subject: [PATCH 2/7] create new rockbox fcl that includes ccnue filter --- .../prodgenie_corsika_proton_rockbox_ccnue_sbnd.fcl | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 sbndcode/JobConfigurations/standard/gen/genie_corsika/prodgenie_corsika_proton_rockbox_ccnue_sbnd.fcl diff --git a/sbndcode/JobConfigurations/standard/gen/genie_corsika/prodgenie_corsika_proton_rockbox_ccnue_sbnd.fcl b/sbndcode/JobConfigurations/standard/gen/genie_corsika/prodgenie_corsika_proton_rockbox_ccnue_sbnd.fcl new file mode 100644 index 000000000..bd8909aa1 --- /dev/null +++ b/sbndcode/JobConfigurations/standard/gen/genie_corsika/prodgenie_corsika_proton_rockbox_ccnue_sbnd.fcl @@ -0,0 +1,8 @@ +#include "filters_sbnd.fcl" +#include "prodgenie_corsika_proton_rockbox_sbnd.fcl" + +physics.filters.ccnuefilter: @local::sbnd_ccnuefilter + +physics.simulatetpc: [ rns, generator, loader, largeantnu, tpcfilter, + ccnuefilter, # adding this filter to the path + corsika, largeantcosmic, largeant, largeantdropped, simplemerge ] \ No newline at end of file From 0c7ef61eb3e074ef3a22d2aa3892df235c7912ca Mon Sep 17 00:00:00 2001 From: lynnt20 Date: Wed, 2 Jul 2025 15:47:56 -0500 Subject: [PATCH 3/7] add new `ccnuefilter` filter block, remove deprecated fcl block --- sbndcode/Filters/fcls/filters_sbnd.fcl | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/sbndcode/Filters/fcls/filters_sbnd.fcl b/sbndcode/Filters/fcls/filters_sbnd.fcl index 30e3efb8e..b500461f8 100644 --- a/sbndcode/Filters/fcls/filters_sbnd.fcl +++ b/sbndcode/Filters/fcls/filters_sbnd.fcl @@ -7,10 +7,13 @@ sbnd_finalstateparticlefilter: PDG: [13, 2212] } -sbnd_nuefilter: +sbnd_ccnuefilter: { - module_type: NueFilter - PdgCode: 12 # 12=nue, 14=numu + module_type: GenNuFilter + VtxInTPC: true + CC: true + NC: false + LepPDGs: [11,-11] } From ff269549211ae04038080949df51c691e0068e9f Mon Sep 17 00:00:00 2001 From: lynnt20 Date: Tue, 8 Jul 2025 10:52:02 -0500 Subject: [PATCH 4/7] fix to ensure that events with only numu dirt do not pass --- .../prodgenie_corsika_proton_rockbox_ccnue_sbnd.fcl | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/sbndcode/JobConfigurations/standard/gen/genie_corsika/prodgenie_corsika_proton_rockbox_ccnue_sbnd.fcl b/sbndcode/JobConfigurations/standard/gen/genie_corsika/prodgenie_corsika_proton_rockbox_ccnue_sbnd.fcl index bd8909aa1..9fc2123c6 100644 --- a/sbndcode/JobConfigurations/standard/gen/genie_corsika/prodgenie_corsika_proton_rockbox_ccnue_sbnd.fcl +++ b/sbndcode/JobConfigurations/standard/gen/genie_corsika/prodgenie_corsika_proton_rockbox_ccnue_sbnd.fcl @@ -3,6 +3,10 @@ physics.filters.ccnuefilter: @local::sbnd_ccnuefilter -physics.simulatetpc: [ rns, generator, loader, largeantnu, tpcfilter, - ccnuefilter, # adding this filter to the path - corsika, largeantcosmic, largeant, largeantdropped, simplemerge ] \ No newline at end of file +physics.simulatetpc: [ rns, generator, loader, largeantnu, + ccnuefilter, + corsika, largeantcosmic, largeant, largeantdropped, simplemerge] + +physics.simulatedirt: [ rns, generator, loader, largeantnu, "!tpcfilter", + dirtfilter, corsika, largeantcosmic, largeant, largeantdropped, simplemerge, + ccnuefilter] From 7197f4b96eed3ba25d8fb257e6fd368fd34ea9bc Mon Sep 17 00:00:00 2001 From: Nathaniel Date: Thu, 17 Jul 2025 17:00:49 -0500 Subject: [PATCH 5/7] Bump versioning for production patch release --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b1a8db95f..e8360926b 100644 --- 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.06.00.02) +set(${PROJECT_NAME}_CMAKE_PROJECT_VERSION_STRING 10.06.00.03) find_package(cetmodules REQUIRED) project(sbndcode LANGUAGES CXX) From 63972009abaefb3e2b4094b354d8a66ec8e82f83 Mon Sep 17 00:00:00 2001 From: Patrick Green Date: Thu, 24 Jul 2025 08:05:00 -0500 Subject: [PATCH 6/7] adding cafmaker fhicl for g4rw --- .../standard/caf/cafmakerjob_sbnd_g4rw.fcl | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 sbndcode/JobConfigurations/standard/caf/cafmakerjob_sbnd_g4rw.fcl diff --git a/sbndcode/JobConfigurations/standard/caf/cafmakerjob_sbnd_g4rw.fcl b/sbndcode/JobConfigurations/standard/caf/cafmakerjob_sbnd_g4rw.fcl new file mode 100644 index 000000000..9b98c595e --- /dev/null +++ b/sbndcode/JobConfigurations/standard/caf/cafmakerjob_sbnd_g4rw.fcl @@ -0,0 +1,8 @@ +#include "cafmakerjob_sbnd.fcl" + +physics.runprod: [rns, geant4weight , @sequence::physics.runprod] +physics.producers.cafmaker.SystWeightLabels: [ "geant4weight" ] + +physics.producers.geant4weight.weight_functions: @local::physics.producers.geant4weight.weight_functions_reint + + From e69fb788540bdcb3bf2e0c965dcccdfea21834fd Mon Sep 17 00:00:00 2001 From: Patrick Green Date: Mon, 4 Aug 2025 15:36:15 -0500 Subject: [PATCH 7/7] add set of cafmaker fhicls for g4rw --- sbndcode/JobConfigurations/standard/caf/cafmakerjob_sbnd.fcl | 1 + .../JobConfigurations/standard/caf/cafmakerjob_sbnd_g4rw.fcl | 4 ---- .../cafmakerjob_sbnd_sce_systtools_and_fluxwgt_and_g4rw.fcl | 4 ++++ .../caf/cafmakerjob_sbnd_systtools_and_fluxwgt_and_g4rw.fcl | 4 ++++ 4 files changed, 9 insertions(+), 4 deletions(-) create mode 100644 sbndcode/JobConfigurations/standard/caf/cafmakerjob_sbnd_sce_systtools_and_fluxwgt_and_g4rw.fcl create mode 100644 sbndcode/JobConfigurations/standard/caf/cafmakerjob_sbnd_systtools_and_fluxwgt_and_g4rw.fcl diff --git a/sbndcode/JobConfigurations/standard/caf/cafmakerjob_sbnd.fcl b/sbndcode/JobConfigurations/standard/caf/cafmakerjob_sbnd.fcl index 3adef6ba4..052da0ced 100644 --- a/sbndcode/JobConfigurations/standard/caf/cafmakerjob_sbnd.fcl +++ b/sbndcode/JobConfigurations/standard/caf/cafmakerjob_sbnd.fcl @@ -155,6 +155,7 @@ physics.producers.cafmaker.TPCPMTBarycenterMatchLabel: "tpcpmtbarycentermatching # Overwrite weight_functions label: physics.producers.fluxweight.weight_functions: @local::physics.producers.fluxweight.weight_functions_flux +physics.producers.geant4weight.weight_functions: @local::physics.producers.geant4weight.weight_functions_reint # input art file. physics.producers.cafmaker.SystWeightLabels: [] diff --git a/sbndcode/JobConfigurations/standard/caf/cafmakerjob_sbnd_g4rw.fcl b/sbndcode/JobConfigurations/standard/caf/cafmakerjob_sbnd_g4rw.fcl index 9b98c595e..00a056887 100644 --- a/sbndcode/JobConfigurations/standard/caf/cafmakerjob_sbnd_g4rw.fcl +++ b/sbndcode/JobConfigurations/standard/caf/cafmakerjob_sbnd_g4rw.fcl @@ -2,7 +2,3 @@ physics.runprod: [rns, geant4weight , @sequence::physics.runprod] physics.producers.cafmaker.SystWeightLabels: [ "geant4weight" ] - -physics.producers.geant4weight.weight_functions: @local::physics.producers.geant4weight.weight_functions_reint - - diff --git a/sbndcode/JobConfigurations/standard/caf/cafmakerjob_sbnd_sce_systtools_and_fluxwgt_and_g4rw.fcl b/sbndcode/JobConfigurations/standard/caf/cafmakerjob_sbnd_sce_systtools_and_fluxwgt_and_g4rw.fcl new file mode 100644 index 000000000..52cf2b49c --- /dev/null +++ b/sbndcode/JobConfigurations/standard/caf/cafmakerjob_sbnd_sce_systtools_and_fluxwgt_and_g4rw.fcl @@ -0,0 +1,4 @@ +#include "cafmakerjob_sbnd_sce.fcl" + +physics.runprod: [rns, systtools, fluxweight, geant4weight, @sequence::physics.runprod] +physics.producers.cafmaker.SystWeightLabels: [ "systtools", "fluxweight", "geant4weight" ] \ No newline at end of file diff --git a/sbndcode/JobConfigurations/standard/caf/cafmakerjob_sbnd_systtools_and_fluxwgt_and_g4rw.fcl b/sbndcode/JobConfigurations/standard/caf/cafmakerjob_sbnd_systtools_and_fluxwgt_and_g4rw.fcl new file mode 100644 index 000000000..6f4901a68 --- /dev/null +++ b/sbndcode/JobConfigurations/standard/caf/cafmakerjob_sbnd_systtools_and_fluxwgt_and_g4rw.fcl @@ -0,0 +1,4 @@ +#include "cafmakerjob_sbnd.fcl" + +physics.runprod: [rns, systtools, fluxweight, geant4weight, @sequence::physics.runprod] +physics.producers.cafmaker.SystWeightLabels: [ "systtools", "fluxweight", "geant4weight" ] \ No newline at end of file