Skip to content

Add Geant4Reweight configs #852

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
leoaliaga merged 4 commits into from
Oct 1, 2025
Merged

Add Geant4Reweight configs #852

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
90a91da
Add geant4 into CAFMaker defs
Jul 27, 2024
283ae7a
Add G4Rewight configs to cafmaker
Sep 18, 2025
16e3722
Update sbncode dependency to get G4RW support
Sep 18, 2025
8024eee
Mash G4RW into all systtools cafmakerjobs
Sep 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions fcl/caf/cafmaker_defs.fcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
#include "eventweight_genie_sbn.fcl"
#include "eventweight_genie_systtools.fcl"
#include "eventweight_flux_sbn.fcl"
#include "eventweight_geant4_sbn.fcl"
#include "mcsproducer.fcl"
#include "rangeproducer.fcl"
#include "flashmatch_simple_icarus.fcl"
Expand Down Expand Up @@ -102,6 +103,7 @@ recoana_caf_preprocess_producers: {
genieweight: @local::sbn_eventweight_genie
systtools: @local::sbn_systtools
fluxweight: @local::sbn_eventweight_flux
geant4weight: @local::sbn_eventweight_geant4
}

# Overwrite labels
Expand All @@ -121,6 +123,7 @@ recoana_caf_preprocess_producers.pandoraPidGausCryoW.CalorimetryModuleLabel: "pa

recoana_caf_preprocess_producers.genieweight.weight_functions: @local::recoana_caf_preprocess_producers.genieweight.weight_functions_genie
recoana_caf_preprocess_producers.fluxweight.weight_functions: @local::recoana_caf_preprocess_producers.fluxweight.weight_functions_flux
recoana_caf_preprocess_producers.geant4weight.weight_functions: @local::recoana_caf_preprocess_producers.geant4weight.weight_functions_reint

# Producers for making SCE products
recoana_sce_producers: {
Expand Down Expand Up @@ -253,7 +256,7 @@ caf_preprocess_data_sequence: [
ShowerCosmicDistCryoE, ShowerCosmicDistCryoW
]

caf_preprocess_evtw_sequence: [@sequence::caf_preprocess_sequence, rns, genieweight, fluxweight]
caf_preprocess_evtw_sequence: [@sequence::caf_preprocess_sequence, rns, genieweight, fluxweight, geant4weight]

caf_preprocess_sce_sequence: [
# Run the SCE correction
Expand All @@ -275,7 +278,7 @@ caf_preprocess_sce_sequence: [
# TODO: rns??
]

caf_preprocess_sce_evtw_sequence: [@sequence::caf_preprocess_sce_sequence, rns, genieweight, fluxweight]
caf_preprocess_sce_evtw_sequence: [@sequence::caf_preprocess_sce_sequence, rns, genieweight, fluxweight, geant4weight]

# CAFMaker config
cafmaker: @local::standard_cafmaker
Expand Down
4 changes: 2 additions & 2 deletions fcl/caf/cafmakerjob_icarus_detsim2d_systtools_and_fluxwgt_overlay.fcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

# overwrite the producers to use data versions
physics.producers: @local::caf_preprocess_data_producers
physics.runprod: [ @sequence::caf_preprocess_data_sequence, rns, systtools, fluxweight, cafmaker]
physics.runprod: [ @sequence::caf_preprocess_data_sequence, rns, systtools, geant4weight, fluxweight, cafmaker]

physics.producers.cafmaker.SystWeightLabels: ["systtools", "fluxweight"]
physics.producers.cafmaker.SystWeightLabels: ["systtools", "geant4weight", "fluxweight"]

#include "cafmaker_add_detsim2d_icarus.fcl"
#include "cafmaker_add_overlay_icarus.fcl"
4 changes: 2 additions & 2 deletions fcl/caf/cafmakerjob_icarus_sce_systtools.fcl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "cafmakerjob_icarus_sce.fcl"

physics.runprod: [ @sequence::caf_preprocess_sce_sequence, rns, systtools, cafmaker ]
physics.runprod: [ @sequence::caf_preprocess_sce_sequence, rns, systtools, geant4weight, cafmaker ]

physics.producers.cafmaker.SystWeightLabels: ["systtools"]
physics.producers.cafmaker.SystWeightLabels: ["systtools", "geant4weight"]

4 changes: 2 additions & 2 deletions fcl/caf/cafmakerjob_icarus_sce_systtools_and_fluxwgt.fcl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "cafmakerjob_icarus_sce.fcl"

physics.runprod: [ @sequence::caf_preprocess_sce_sequence, rns, systtools, fluxweight, cafmaker ]
physics.runprod: [ @sequence::caf_preprocess_sce_sequence, rns, systtools, geant4weight, fluxweight, cafmaker ]

physics.producers.cafmaker.SystWeightLabels: ["systtools", "fluxweight"]
physics.producers.cafmaker.SystWeightLabels: ["systtools", "geant4weight", "fluxweight"]

4 changes: 2 additions & 2 deletions fcl/caf/cafmakerjob_icarus_systtools.fcl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "cafmakerjob_icarus.fcl"

physics.runprod: [ @sequence::caf_preprocess_sequence, rns, systtools, cafmaker ]
physics.runprod: [ @sequence::caf_preprocess_sequence, rns, systtools, geant4weight, cafmaker ]

physics.producers.cafmaker.SystWeightLabels: ["systtools"]
physics.producers.cafmaker.SystWeightLabels: ["systtools", "geant4weight"]

4 changes: 2 additions & 2 deletions fcl/caf/cafmakerjob_icarus_systtools_and_fluxwgt.fcl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "cafmakerjob_icarus.fcl"

physics.runprod: [ @sequence::caf_preprocess_sequence, rns, systtools, fluxweight, cafmaker ]
physics.runprod: [ @sequence::caf_preprocess_sequence, rns, systtools, geant4weight, fluxweight, cafmaker ]

physics.producers.cafmaker.SystWeightLabels: ["systtools", "fluxweight"]
physics.producers.cafmaker.SystWeightLabels: ["systtools", "geant4weight", "fluxweight"]

2 changes: 1 addition & 1 deletion ups/product_deps
View file
Open in desktop
Copy link
Contributor

@gputnam gputnam Sep 30, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think @leoaliaga may want to handle the sbncode version bump -- otherwise this looks good!

Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ icarus_signal_processing v10_06_00_01 -
icarusalg v10_06_00_04 -
icarusutil v10_06_00_04 -
libwda v2_30_0a -
sbncode v10_06_00_04 -
sbncode v10_06_00_05 -
cetmodules v3_24_01 - only_for_build
end_product_list
####################################
Expand Down