Update CI FHiCL by using a set of standard FHiCLs

vitodb · vitodb · commit 25f50dd5f777 · 2025-11-17T18:08:16.000-06:00
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1 +1 @@
-#include "stage1_run2_icarus_MC.fcl"
+#include "standard_mc_all_stage1_icarus.fcl"

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-#include "detsim_2d_icarus.fcl"`
	`1`	`+#include "standard_mc_all_detsim_icarus.fcl"`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-#include "larg4_icarus_intime_sce.fcl"`
	`1`	`+#include "standard_mc_intime_g4_icarus.fcl"`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-#include "stage0_run2_icarus_mc.fcl"`
	`1`	`+#include "standard_mc_all_stage0_icarus.fcl"`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-#include "stage1_run2_icarus_MC.fcl"`
	`1`	`+#include "standard_mc_all_stage1_icarus.fcl"`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-#include "detsim_2d_icarus.fcl"`
	`1`	`+#include "standard_mc_all_detsim_icarus.fcl"`
`2`	`2`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-#include "larg4_icarus.fcl"`
	`1`	`+#include "standard_mc_beamcosmics_g4_icarus.fcl"`