From e7ba2d7c4249dd959845ee1e24aa9f42eb99fb60 Mon Sep 17 00:00:00 2001 From: Vito Di Benedetto <55766483+vitodb@users.noreply.github.com> Date: Thu, 13 Nov 2025 18:11:25 -0600 Subject: [PATCH 01/11] Update CI FHiCL by using a set of standard FHiCLs --- ...i_intimecosmic_detsim_quick_test_icaruscode.fcl | 2 +- ...us_ci_intimecosmic_g4_quick_test_icaruscode.fcl | 2 +- ...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 ++++++++------ ...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 +- 12 files changed, 20 insertions(+), 18 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..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 +1 @@ -#include "larg4_icarus_intime_sce.fcl" +#include "standard_mc_intime_g4_icarus.fcl" 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..74ec2cf33 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_bnb_genie_protononly_icarus.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..61514a21c 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 "standard_mc_all_stage1_icarus.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_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 25f50dd5f777529ef06bd7cb1f79b6ed818089b1 Mon Sep 17 00:00:00 2001 From: Vito Di Benedetto <55766483+vitodb@users.noreply.github.com> Date: Thu, 13 Nov 2025 18:11:25 -0600 Subject: [PATCH 02/11] Update CI FHiCL by using a set of standard FHiCLs --- ...i_intimecosmic_detsim_quick_test_icaruscode.fcl | 2 +- ...us_ci_intimecosmic_g4_quick_test_icaruscode.fcl | 2 +- ...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 ++++++++------ ...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 +- 12 files changed, 20 insertions(+), 18 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..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 +1 @@ -#include "larg4_icarus_intime_sce.fcl" +#include "standard_mc_intime_g4_icarus.fcl" 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..74ec2cf33 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_bnb_genie_protononly_icarus.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..61514a21c 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 "standard_mc_all_stage1_icarus.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_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 907c6eb97bdd62f53e5d72a1a38f9478d6cab7b5 Mon Sep 17 00:00:00 2001 From: Vito Di Benedetto <55766483+vitodb@users.noreply.github.com> Date: Mon, 17 Nov 2025 19:27:20 -0600 Subject: [PATCH 03/11] Update nucosmics_reco1/2 CI FHiCLs by using standard FHiCLs --- test/ci/icarus_ci_nucosmics_reco0_quick_test_icaruscode.fcl | 2 +- test/ci/icarus_ci_nucosmics_reco1_quick_test_icaruscode.fcl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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" From 766d0d0d015e206519d9d07e66d99ba467d86123 Mon Sep 17 00:00:00 2001 From: Vito Di Benedetto <55766483+vitodb@users.noreply.github.com> Date: Wed, 19 Nov 2025 16:00:02 -0600 Subject: [PATCH 04/11] Update the base gen FHiCL for intimecosmic workflow --- test/ci/icarus_ci_intimecosmic_gen_quick_test_icaruscode.fcl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 74ec2cf33..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_bnb_genie_protononly_icarus.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 From 859322b8828f17970f0c8240d93f3a91c8a7c4ae Mon Sep 17 00:00:00 2001 From: Vito Di Benedetto <55766483+vitodb@users.noreply.github.com> Date: Wed, 19 Nov 2025 16:01:48 -0600 Subject: [PATCH 05/11] Disable SkipTrackIDOffsets param --- test/ci/icarus_ci_intimecosmic_g4_quick_test_icaruscode.fcl | 4 ++++ 1 file changed, 4 insertions(+) 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 1b7edd561..904480d2f 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,5 @@ #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 From 8049f076ed7ade3b39940abffd9c77bf37d4e937 Mon Sep 17 00:00:00 2001 From: Vito Di Benedetto <55766483+vitodb@users.noreply.github.com> Date: Fri, 21 Nov 2025 10:40:50 -0600 Subject: [PATCH 06/11] For intimecosmic g4 override EnergyDepositInstanceLabels --- test/ci/icarus_ci_intimecosmic_g4_quick_test_icaruscode.fcl | 3 +++ 1 file changed, 3 insertions(+) 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 904480d2f..845b11e30 100644 --- a/test/ci/icarus_ci_intimecosmic_g4_quick_test_icaruscode.fcl +++ b/test/ci/icarus_ci_intimecosmic_g4_quick_test_icaruscode.fcl @@ -3,3 +3,6 @@ # 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" ] From b0e7f46480161faf01e5778200af84bc3a7a7d20 Mon Sep 17 00:00:00 2001 From: Vito Di Benedetto <55766483+vitodb@users.noreply.github.com> Date: Fri, 21 Nov 2025 11:04:30 -0600 Subject: [PATCH 07/11] Update icarus_ci_intimecosmic_reco1_quick_test_icaruscode.fcl --- test/ci/icarus_ci_intimecosmic_reco1_quick_test_icaruscode.fcl | 3 +++ 1 file changed, 3 insertions(+) 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 61514a21c..bafdab9fa 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,4 @@ #include "standard_mc_all_stage1_icarus.fcl" + +# overriding this parameter, possibly we need a specific stage1 FHiCL for "intimecosmic" reco1 +physics.producers.mcreco.MCParticleDroppedLabel: "largeantdropped" From 1bf9fbbf90bd22faa640966d163c5f85464da166 Mon Sep 17 00:00:00 2001 From: Vito Di Benedetto <55766483+vitodb@users.noreply.github.com> Date: Fri, 21 Nov 2025 17:34:37 -0600 Subject: [PATCH 08/11] Fix g4 intime FHiCLs --- fcl/g4/larg4_icarus_intime.fcl | 1 + fcl/g4/larg4_icarus_intime_sce.fcl | 1 + 2 files changed, 2 insertions(+) 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 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 7db1c6ad2fd83b45d03bf1318449c7e8048e0fcf Mon Sep 17 00:00:00 2001 From: Vito Di Benedetto <55766483+vitodb@users.noreply.github.com> Date: Fri, 21 Nov 2025 17:35:09 -0600 Subject: [PATCH 09/11] 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 c00550c5f9dbaa01b12832be7c82074e5124cc71 Mon Sep 17 00:00:00 2001 From: Vito Di Benedetto <55766483+vitodb@users.noreply.github.com> Date: Fri, 21 Nov 2025 17:36:02 -0600 Subject: [PATCH 10/11] Update CI reco1 intimecosmic FHiCL --- .../icarus_ci_intimecosmic_reco1_quick_test_icaruscode.fcl | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) 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 bafdab9fa..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,4 +1 @@ -#include "standard_mc_all_stage1_icarus.fcl" - -# overriding this parameter, possibly we need a specific stage1 FHiCL for "intimecosmic" reco1 -physics.producers.mcreco.MCParticleDroppedLabel: "largeantdropped" +#include "stage1_run2_icarus_MC_intime.fcl" From 54e5f146815cc70f0c011760c1c5a113163d678a Mon Sep 17 00:00:00 2001 From: Vito Di Benedetto <55766483+vitodb@users.noreply.github.com> Date: Tue, 2 Dec 2025 23:59:50 -0600 Subject: [PATCH 11/11] 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" ]