From 69a4aa641e77ba61bb6cb41a22587a7ef0bfa548 Mon Sep 17 00:00:00 2001 From: Vito Di Benedetto <55766483+vitodb@users.noreply.github.com> Date: Tue, 2 Dec 2025 14:53:11 -0600 Subject: [PATCH 1/5] Fix g4 intime FHiCLs --- fcl/g4/larg4_icarus_intime.fcl | 1 + 1 file changed, 1 insertion(+) diff --git a/fcl/g4/larg4_icarus_intime.fcl b/fcl/g4/larg4_icarus_intime.fcl index 51b01edcb..4b4ee922a 100644 --- a/fcl/g4/larg4_icarus_intime.fcl +++ b/fcl/g4/larg4_icarus_intime.fcl @@ -67,6 +67,7 @@ physics.producers.pdfastsim.InputSourcesLabels: [ "pdfastsimintime", "pdfastsimo #Add a process that merges the dropped MCParticles physics.producers.largeantdropped: @local::icarus_merge_intime_dropped_mcparts +physics.producers.largeantdropped.SkipTrackIDOffsets: @erase physics.producers.largeantdropped.InputSourcesLabels: [ "larg4intime:droppedMCParticles", "larg4outtime:droppedMCParticles"] #Add a process for sedlite generation From 14f9ada68818ef0ea70f98ec0ce0d878c0d9c022 Mon Sep 17 00:00:00 2001 From: Vito Di Benedetto <55766483+vitodb@users.noreply.github.com> Date: Tue, 2 Dec 2025 14:54:27 -0600 Subject: [PATCH 2/5] In larg4 intime override EnergyDepositInstanceLabels --- fcl/g4/larg4_icarus_intime_sce.fcl | 1 + 1 file changed, 1 insertion(+) diff --git a/fcl/g4/larg4_icarus_intime_sce.fcl b/fcl/g4/larg4_icarus_intime_sce.fcl index 38acbd18e..bbba6ab34 100644 --- a/fcl/g4/larg4_icarus_intime_sce.fcl +++ b/fcl/g4/larg4_icarus_intime_sce.fcl @@ -1,3 +1,4 @@ #include "larg4_icarus_intime.fcl" #include "enable_spacecharge_icarus.fcl" +physics.producers.ionization.EnergyDepositInstanceLabels: [ "", "priorSCE" ] From 48cb5e833e5edf761a37e63748efa6d7fad7d2f6 Mon Sep 17 00:00:00 2001 From: Vito Di Benedetto <55766483+vitodb@users.noreply.github.com> Date: Tue, 2 Dec 2025 14:55:50 -0600 Subject: [PATCH 3/5] Add stage1 intime MC FHiCL --- fcl/reco/Stage1/mc/stage1_run2_icarus_MC_intime.fcl | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 fcl/reco/Stage1/mc/stage1_run2_icarus_MC_intime.fcl diff --git a/fcl/reco/Stage1/mc/stage1_run2_icarus_MC_intime.fcl b/fcl/reco/Stage1/mc/stage1_run2_icarus_MC_intime.fcl new file mode 100644 index 000000000..6c43f587f --- /dev/null +++ b/fcl/reco/Stage1/mc/stage1_run2_icarus_MC_intime.fcl @@ -0,0 +1,3 @@ +#include "stage1_run2_icarus_MC.fcl" + +physics.producers.mcreco.MCParticleDroppedLabel: "largeantdropped" From 308484a612e42a6f61497a762f7cdd8e744c67c2 Mon Sep 17 00:00:00 2001 From: Vito Di Benedetto <55766483+vitodb@users.noreply.github.com> Date: Tue, 2 Dec 2025 14:56:24 -0600 Subject: [PATCH 4/5] Update CI FHiCLs --- ...i_intimecosmic_detsim_quick_test_icaruscode.fcl | 2 +- ...us_ci_intimecosmic_g4_quick_test_icaruscode.fcl | 9 ++++++++- ...s_ci_intimecosmic_gen_quick_test_icaruscode.fcl | 4 ++-- ...ci_intimecosmic_reco0_quick_test_icaruscode.fcl | 2 +- ...ci_intimecosmic_reco1_quick_test_icaruscode.fcl | 2 +- ...s_ci_nucosmics_detsim_quick_test_icaruscode.fcl | 2 +- ...carus_ci_nucosmics_g4_quick_test_icaruscode.fcl | 2 +- ...arus_ci_nucosmics_gen_quick_test_icaruscode.fcl | 14 ++++++++------ ...us_ci_nucosmics_reco0_quick_test_icaruscode.fcl | 2 +- ...us_ci_nucosmics_reco1_quick_test_icaruscode.fcl | 2 +- ...arus_ci_single_detsim_quick_test_icaruscode.fcl | 2 +- .../icarus_ci_single_g4_quick_test_icaruscode.fcl | 2 +- ...carus_ci_single_reco0_quick_test_icaruscode.fcl | 2 +- ...carus_ci_single_reco1_quick_test_icaruscode.fcl | 2 +- 14 files changed, 29 insertions(+), 20 deletions(-) diff --git a/test/ci/icarus_ci_intimecosmic_detsim_quick_test_icaruscode.fcl b/test/ci/icarus_ci_intimecosmic_detsim_quick_test_icaruscode.fcl index 0b836e1fa..b4e93e8a7 100644 --- a/test/ci/icarus_ci_intimecosmic_detsim_quick_test_icaruscode.fcl +++ b/test/ci/icarus_ci_intimecosmic_detsim_quick_test_icaruscode.fcl @@ -1 +1 @@ -#include "detsim_2d_icarus.fcl" +#include "standard_mc_all_detsim_icarus.fcl" diff --git a/test/ci/icarus_ci_intimecosmic_g4_quick_test_icaruscode.fcl b/test/ci/icarus_ci_intimecosmic_g4_quick_test_icaruscode.fcl index e3695ae4b..845b11e30 100644 --- a/test/ci/icarus_ci_intimecosmic_g4_quick_test_icaruscode.fcl +++ b/test/ci/icarus_ci_intimecosmic_g4_quick_test_icaruscode.fcl @@ -1 +1,8 @@ -#include "larg4_icarus_intime_sce.fcl" +#include "standard_mc_intime_g4_icarus.fcl" + +# disable this parameter, possibly it is discontinued +# It is set through icaruscode/fcl/g4/mergesimsources_icarus.fcl +physics.producers.largeantdropped.SkipTrackIDOffsets: @erase + +# override this parameter, this is causing issues with detsim standard_mc_all_detsim_icarus.fcl +physics.producers.ionization.EnergyDepositInstanceLabels: [ "", "priorSCE" ] diff --git a/test/ci/icarus_ci_intimecosmic_gen_quick_test_icaruscode.fcl b/test/ci/icarus_ci_intimecosmic_gen_quick_test_icaruscode.fcl index e273a0877..ae4a199e7 100644 --- a/test/ci/icarus_ci_intimecosmic_gen_quick_test_icaruscode.fcl +++ b/test/ci/icarus_ci_intimecosmic_gen_quick_test_icaruscode.fcl @@ -1,5 +1,5 @@ #include "messages_icarus.fcl" -#include "prodcorsika_proton_intime_icarus_bnb_sce_on.fcl" +#include "prodcorsika_proton_intime_filter_bnb_sce.fcl" # non-interactive output settings, but keep them verbose services.message: @local::icarus_message_services_prod_debug @@ -19,7 +19,7 @@ physics.producers.generator.FluxSearchPaths: "/cvmfs/sbn.osgstorage.org/pnfs/fna # Override CORSIKA flux file path to be able to access them without a proxy physics.producers.generator.ShowerInputFiles:[ - "/cvmfs/sbn.osgstorage.org/pnfs/fnal.gov/usr/sbn/persistent/stash/physics/cosmics/Fermilab/CORSIKA/standard/v01_00/p_*.db" + "/cvmfs/sbn.osgstorage.org/pnfs/fnal.gov/usr/sbn/persistent/stash/physics/cosmics/Fermilab/CORSIKA/standard/v01_00/p_*.db" ] # "/cvmfs/sbn.osgstorage.org/pnfs/fnal.gov/usr/sbn/persistent/stash/physics/cosmics/Fermilab/CORSIKA/standard/p_*.db", # "/cvmfs/sbn.osgstorage.org/pnfs/fnal.gov/usr/sbn/persistent/stash/physics/cosmics/Fermilab/CORSIKA/standard/He_showers_*.db", diff --git a/test/ci/icarus_ci_intimecosmic_reco0_quick_test_icaruscode.fcl b/test/ci/icarus_ci_intimecosmic_reco0_quick_test_icaruscode.fcl index feb8aca63..d1df0a8ff 100644 --- a/test/ci/icarus_ci_intimecosmic_reco0_quick_test_icaruscode.fcl +++ b/test/ci/icarus_ci_intimecosmic_reco0_quick_test_icaruscode.fcl @@ -1 +1 @@ -#include "stage0_run2_icarus_mc.fcl" +#include "standard_mc_all_stage0_icarus.fcl" diff --git a/test/ci/icarus_ci_intimecosmic_reco1_quick_test_icaruscode.fcl b/test/ci/icarus_ci_intimecosmic_reco1_quick_test_icaruscode.fcl index 7f5fe82b0..78c6ea32d 100644 --- a/test/ci/icarus_ci_intimecosmic_reco1_quick_test_icaruscode.fcl +++ b/test/ci/icarus_ci_intimecosmic_reco1_quick_test_icaruscode.fcl @@ -1 +1 @@ -#include "stage1_run2_icarus_MC.fcl" +#include "stage1_run2_icarus_MC_intime.fcl" diff --git a/test/ci/icarus_ci_nucosmics_detsim_quick_test_icaruscode.fcl b/test/ci/icarus_ci_nucosmics_detsim_quick_test_icaruscode.fcl index e5693a86f..124dba6fb 100644 --- a/test/ci/icarus_ci_nucosmics_detsim_quick_test_icaruscode.fcl +++ b/test/ci/icarus_ci_nucosmics_detsim_quick_test_icaruscode.fcl @@ -1,2 +1,2 @@ -#include "detsim_2d_icarus.fcl" +#include "standard_mc_all_detsim_icarus.fcl" diff --git a/test/ci/icarus_ci_nucosmics_g4_quick_test_icaruscode.fcl b/test/ci/icarus_ci_nucosmics_g4_quick_test_icaruscode.fcl index fc07b6aee..b8bb21ee5 100644 --- a/test/ci/icarus_ci_nucosmics_g4_quick_test_icaruscode.fcl +++ b/test/ci/icarus_ci_nucosmics_g4_quick_test_icaruscode.fcl @@ -1 +1 @@ -#include "larg4_icarus.fcl" +#include "standard_mc_beamcosmics_g4_icarus.fcl" diff --git a/test/ci/icarus_ci_nucosmics_gen_quick_test_icaruscode.fcl b/test/ci/icarus_ci_nucosmics_gen_quick_test_icaruscode.fcl index 71c7daf32..58d83d5dd 100644 --- a/test/ci/icarus_ci_nucosmics_gen_quick_test_icaruscode.fcl +++ b/test/ci/icarus_ci_nucosmics_gen_quick_test_icaruscode.fcl @@ -1,5 +1,5 @@ #include "messages_icarus.fcl" -#include "prodcorsika_genie_standard_icarus.fcl" +#include "prodcorsika_bnb_genie_protononly_icarus.fcl" # non-interactive output settings, but keep them verbose services.message: @local::icarus_message_services_prod_debug @@ -17,9 +17,11 @@ physics.producers.generator.FluxSearchPaths: "/cvmfs/sbn.osgstorage.org/pnfs/fna # Override CORSIKA flux file path to be able to access them without a proxy physics.producers.cosmgen.ShowerInputFiles:[ - "/cvmfs/sbn.osgstorage.org/pnfs/fnal.gov/usr/sbn/persistent/stash/physics/cosmics/Fermilab/CORSIKA/standard/p_showers_*.db", - "/cvmfs/sbn.osgstorage.org/pnfs/fnal.gov/usr/sbn/persistent/stash/physics/cosmics/Fermilab/CORSIKA/standard/He_showers_*.db", - "/cvmfs/sbn.osgstorage.org/pnfs/fnal.gov/usr/sbn/persistent/stash/physics/cosmics/Fermilab/CORSIKA/standard/N_showers_*.db", - "/cvmfs/sbn.osgstorage.org/pnfs/fnal.gov/usr/sbn/persistent/stash/physics/cosmics/Fermilab/CORSIKA/standard/Mg_showers_*.db", - "/cvmfs/sbn.osgstorage.org/pnfs/fnal.gov/usr/sbn/persistent/stash/physics/cosmics/Fermilab/CORSIKA/standard/Fe_showers_*.db" + "/cvmfs/sbn.osgstorage.org/pnfs/fnal.gov/usr/sbn/persistent/stash/physics/cosmics/Fermilab/CORSIKA/standard/v01_00/p_*.db" ] +# "/cvmfs/sbn.osgstorage.org/pnfs/fnal.gov/usr/sbn/persistent/stash/physics/cosmics/Fermilab/CORSIKA/standard/p_*.db", +# "/cvmfs/sbn.osgstorage.org/pnfs/fnal.gov/usr/sbn/persistent/stash/physics/cosmics/Fermilab/CORSIKA/standard/He_showers_*.db", +# "/cvmfs/sbn.osgstorage.org/pnfs/fnal.gov/usr/sbn/persistent/stash/physics/cosmics/Fermilab/CORSIKA/standard/N_showers_*.db", +# "/cvmfs/sbn.osgstorage.org/pnfs/fnal.gov/usr/sbn/persistent/stash/physics/cosmics/Fermilab/CORSIKA/standard/Mg_showers_*.db", +# "/cvmfs/sbn.osgstorage.org/pnfs/fnal.gov/usr/sbn/persistent/stash/physics/cosmics/Fermilab/CORSIKA/standard/Fe_showers_*.db" +#] diff --git a/test/ci/icarus_ci_nucosmics_reco0_quick_test_icaruscode.fcl b/test/ci/icarus_ci_nucosmics_reco0_quick_test_icaruscode.fcl index feb8aca63..d1df0a8ff 100644 --- a/test/ci/icarus_ci_nucosmics_reco0_quick_test_icaruscode.fcl +++ b/test/ci/icarus_ci_nucosmics_reco0_quick_test_icaruscode.fcl @@ -1 +1 @@ -#include "stage0_run2_icarus_mc.fcl" +#include "standard_mc_all_stage0_icarus.fcl" diff --git a/test/ci/icarus_ci_nucosmics_reco1_quick_test_icaruscode.fcl b/test/ci/icarus_ci_nucosmics_reco1_quick_test_icaruscode.fcl index 7f5fe82b0..61514a21c 100644 --- a/test/ci/icarus_ci_nucosmics_reco1_quick_test_icaruscode.fcl +++ b/test/ci/icarus_ci_nucosmics_reco1_quick_test_icaruscode.fcl @@ -1 +1 @@ -#include "stage1_run2_icarus_MC.fcl" +#include "standard_mc_all_stage1_icarus.fcl" diff --git a/test/ci/icarus_ci_single_detsim_quick_test_icaruscode.fcl b/test/ci/icarus_ci_single_detsim_quick_test_icaruscode.fcl index 0b836e1fa..b4e93e8a7 100644 --- a/test/ci/icarus_ci_single_detsim_quick_test_icaruscode.fcl +++ b/test/ci/icarus_ci_single_detsim_quick_test_icaruscode.fcl @@ -1 +1 @@ -#include "detsim_2d_icarus.fcl" +#include "standard_mc_all_detsim_icarus.fcl" diff --git a/test/ci/icarus_ci_single_g4_quick_test_icaruscode.fcl b/test/ci/icarus_ci_single_g4_quick_test_icaruscode.fcl index fc07b6aee..b8bb21ee5 100644 --- a/test/ci/icarus_ci_single_g4_quick_test_icaruscode.fcl +++ b/test/ci/icarus_ci_single_g4_quick_test_icaruscode.fcl @@ -1 +1 @@ -#include "larg4_icarus.fcl" +#include "standard_mc_beamcosmics_g4_icarus.fcl" diff --git a/test/ci/icarus_ci_single_reco0_quick_test_icaruscode.fcl b/test/ci/icarus_ci_single_reco0_quick_test_icaruscode.fcl index feb8aca63..d1df0a8ff 100644 --- a/test/ci/icarus_ci_single_reco0_quick_test_icaruscode.fcl +++ b/test/ci/icarus_ci_single_reco0_quick_test_icaruscode.fcl @@ -1 +1 @@ -#include "stage0_run2_icarus_mc.fcl" +#include "standard_mc_all_stage0_icarus.fcl" diff --git a/test/ci/icarus_ci_single_reco1_quick_test_icaruscode.fcl b/test/ci/icarus_ci_single_reco1_quick_test_icaruscode.fcl index 7f5fe82b0..61514a21c 100644 --- a/test/ci/icarus_ci_single_reco1_quick_test_icaruscode.fcl +++ b/test/ci/icarus_ci_single_reco1_quick_test_icaruscode.fcl @@ -1 +1 @@ -#include "stage1_run2_icarus_MC.fcl" +#include "standard_mc_all_stage1_icarus.fcl" From 4bdcdd867e3364e02d7fc365cb96e26982e03fc2 Mon Sep 17 00:00:00 2001 From: Vito Di Benedetto <55766483+vitodb@users.noreply.github.com> Date: Tue, 2 Dec 2025 23:58:53 -0600 Subject: [PATCH 5/5] Remove override of parameters that are already included in other upstream FHiCLs --- .../ci/icarus_ci_intimecosmic_g4_quick_test_icaruscode.fcl | 7 ------- 1 file changed, 7 deletions(-) diff --git a/test/ci/icarus_ci_intimecosmic_g4_quick_test_icaruscode.fcl b/test/ci/icarus_ci_intimecosmic_g4_quick_test_icaruscode.fcl index 845b11e30..1b7edd561 100644 --- a/test/ci/icarus_ci_intimecosmic_g4_quick_test_icaruscode.fcl +++ b/test/ci/icarus_ci_intimecosmic_g4_quick_test_icaruscode.fcl @@ -1,8 +1 @@ #include "standard_mc_intime_g4_icarus.fcl" - -# disable this parameter, possibly it is discontinued -# It is set through icaruscode/fcl/g4/mergesimsources_icarus.fcl -physics.producers.largeantdropped.SkipTrackIDOffsets: @erase - -# override this parameter, this is causing issues with detsim standard_mc_all_detsim_icarus.fcl -physics.producers.ionization.EnergyDepositInstanceLabels: [ "", "priorSCE" ]