Revert "Merge pull request #882 from SBNSoftware/develop"

jas1005 · jas1005 · commit 4eb60f6ab5a2 · 2026-01-28T17:01:46.000-06:00
This reverts commit 378b1bf, reversing changes made to 848d6d1.
diff --git a/fcl/g4/2d_drift_sim/larg4_icarus_intime_sce_2d_drift.fcl b/fcl/g4/2d_drift_sim/larg4_icarus_intime_sce_2d_drift.fcl
@@ -1,5 +1,3 @@
 #include "larg4_icarus_intime.fcl"
 
 #include "enable_spacecharge_services_icarus_2D_DriftSimOnly.fcl"
-
-physics.producers.ionization.EnergyDepositInstanceLabels: [ "", "priorSCE" ]
diff --git a/fcl/g4/larg4_icarus_intime.fcl b/fcl/g4/larg4_icarus_intime.fcl
@@ -67,7 +67,6 @@ 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
@@ -1,4 +1,3 @@
 #include "larg4_icarus_intime.fcl"
 
 #include "enable_spacecharge_icarus.fcl"
-physics.producers.ionization.EnergyDepositInstanceLabels: [ "", "priorSCE" ]
diff --git a/fcl/reco/Stage0/data/stage0_daqPMT_drop.fcl b/fcl/reco/Stage0/data/stage0_daqPMT_drop.fcl
diff --git a/fcl/reco/Stage0/data/stage0_run2_icarus.fcl b/fcl/reco/Stage0/data/stage0_run2_icarus.fcl
@@ -26,6 +26,7 @@ outputs.rootOutput.outputCommands: [
     "drop artdaq::Fragments_*_*_ICARUSReprocessRaw",
     "drop *_*_*_DAQ*",
     "drop *_ophituncorrected_*_*",
+    "drop *_daqPMT_*_*",
     "drop *_daqPMTonbeam_*_*",
     "drop *_daqCRT_*_*",
     "drop *_daqTPCROI_*_*", 
diff --git a/fcl/reco/Stage0/data/stage0_run2_wc_icarus.fcl b/fcl/reco/Stage0/data/stage0_run2_wc_icarus.fcl
@@ -27,6 +27,7 @@ outputs.rootOutput.outputCommands: [
     "drop artdaq::Fragments_*_*_ICARUSReprocessRaw",
     "drop *_*_*_DAQ*",
     "drop *_ophituncorrected_*_*",
+    "drop *_daqPMT_*_*",
     "drop *_daqPMTonbeam_*_*",
     "drop *_daqCRT_*_*",
     "drop *_daqTPCROI_*_*", 
diff --git a/fcl/reco/Stage1/mc/stage1_run2_icarus_MC_intime.fcl b/fcl/reco/Stage1/mc/stage1_run2_icarus_MC_intime.fcl
diff --git a/fcl/standard/standard_mc_all_detsim_icarus.fcl b/fcl/standard/standard_mc_all_detsim_icarus.fcl
@@ -1 +1 @@
-#include "detsim_2d_icarus_refactored_yzsim.fcl"
+#include "detsim_2d_icarus_refactored.fcl"
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 "standard_mc_all_detsim_icarus.fcl"
+#include "detsim_2d_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 "standard_mc_intime_g4_icarus.fcl"
+#include "larg4_icarus_intime_sce.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_filter_bnb_sce.fcl"
+#include "prodcorsika_proton_intime_icarus_bnb_sce_on.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 "standard_mc_all_stage0_icarus.fcl"
+#include "stage0_run2_icarus_mc.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,6 +1 @@
-#include "standard_mc_all_stage1_icarus.fcl"
-
-physics.producers.mcreco.MCParticleDroppedLabel: "largeantdropped"
-
-# silence SimDriftElectrons warnings, for 1 event these crerate a 900MB log file.
-services.message.destinations.STDCOUT.categories.SimDriftElectrons: { limit: 0 }
+#include "stage1_run2_icarus_MC.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 "standard_mc_all_detsim_icarus.fcl"
+#include "detsim_2d_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 "standard_mc_beamcosmics_g4_icarus.fcl"
+#include "larg4_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_bnb_genie_protononly_icarus.fcl"
+#include "prodcorsika_genie_standard_icarus.fcl"
 
 # non-interactive output settings, but keep them verbose
 services.message: @local::icarus_message_services_prod_debug
@@ -17,11 +17,9 @@ 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/v01_00/p_*.db"
+            "/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/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
@@ -1 +1 @@
-#include "standard_mc_all_stage0_icarus.fcl"
+#include "stage0_run2_icarus_mc.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
@@ -1 +1 @@
-#include "standard_mc_all_stage1_icarus.fcl"
+#include "stage1_run2_icarus_MC.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
@@ -1 +1 @@
-#include "standard_mc_all_detsim_icarus.fcl"
+#include "detsim_2d_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 "standard_mc_beamcosmics_g4_icarus.fcl"
+#include "larg4_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 "standard_mc_all_stage0_icarus.fcl"
+#include "stage0_run2_icarus_mc.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 "standard_mc_all_stage1_icarus.fcl"
+#include "stage1_run2_icarus_MC.fcl"

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`	`1`	`#include "larg4_icarus_intime.fcl"`
`2`	`2`
`3`	`3`	`#include "enable_spacecharge_icarus.fcl"`
`4`		`-physics.producers.ionization.EnergyDepositInstanceLabels: [ "", "priorSCE" ]`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-#include "detsim_2d_icarus_refactored_yzsim.fcl"`
	`1`	`+#include "detsim_2d_icarus_refactored.fcl"`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-#include "standard_mc_all_detsim_icarus.fcl"`
	`1`	`+#include "detsim_2d_icarus.fcl"`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-#include "standard_mc_intime_g4_icarus.fcl"`
	`1`	`+#include "larg4_icarus_intime_sce.fcl"`