SBNSoftware · mmrosenberg · Oct 25, 2024 · Oct 22, 2024 · Oct 25, 2024
diff --git a/fcl/syst_variations/caf_variations_saveAR_icarus.fcl b/fcl/syst_variations/caf_variations_saveAR_icarus.fcl
diff --git a/fcl/syst_variations/detsim_2d_TPCnoise_refactored_variation_cohm1_icarus.fcl b/fcl/syst_variations/detsim_2d_TPCnoise_refactored_variation_cohm1_icarus.fcl
@@ -1,6 +1,6 @@
-#include "detsim_2d_variation_fitFR_refactored_icarus.fcl" 
+#include "detsim_2d_icarus_refactored.fcl" 
 
 process_name: TPCCohNoiseVarm1
 
-#Noise adjustment from preliminary study by J. Mueller looking at the range over a set of events the uncertainty on the coherent noise in the TPC (subject to change, this is a test case)
+#Noise adjustment from preliminary study by J. Mueller looking at the range over a set of events the uncertainty on the coherent noise in the TPC
 physics.producers.daq.wcls_main.structs.coh_noise_scale: 0.9565 
diff --git a/fcl/syst_variations/detsim_2d_TPCnoise_refactored_variation_cohm2_icarus.fcl b/fcl/syst_variations/detsim_2d_TPCnoise_refactored_variation_cohm2_icarus.fcl
diff --git a/fcl/syst_variations/detsim_2d_TPCnoise_refactored_variation_cohp1_icarus.fcl b/fcl/syst_variations/detsim_2d_TPCnoise_refactored_variation_cohp1_icarus.fcl
@@ -1,6 +1,6 @@
-#include "detsim_2d_variation_fitFR_refactored_icarus.fcl" 
+#include "detsim_2d_icarus_refactored.fcl" 
 
 process_name: TPCCohNoiseVarp1
 
-#Noise adjustment from preliminary study by J. Mueller looking at the range over a set of events the uncertainty on the coherent noise in the TPC (subject to change, this is a test case)
+#Noise adjustment from preliminary study by J. Mueller looking at the range over a set of events the uncertainty on the coherent noise in the TPC
 physics.producers.daq.wcls_main.structs.coh_noise_scale: 1.0435 
diff --git a/fcl/syst_variations/detsim_2d_TPCnoise_refactored_variation_cohp2_icarus.fcl b/fcl/syst_variations/detsim_2d_TPCnoise_refactored_variation_cohp2_icarus.fcl
diff --git a/fcl/syst_variations/detsim_2d_TPCnoise_refactored_variation_intm1_icarus.fcl b/fcl/syst_variations/detsim_2d_TPCnoise_refactored_variation_intm1_icarus.fcl
@@ -1,6 +1,6 @@
-#include "detsim_2d_variation_fitFR_refactored_icarus.fcl"
+#include "detsim_2d_icarus_refactored.fcl"
 
 process_name: TPCIntNoiseVarm1
 
-#Noise adjustment from preliminary study by J. Mueller looking at the range over a set of events the uncertainty on the intrinsic noise in the TPC (subject to change, this is a test case)
+#Noise adjustment from preliminary study by J. Mueller looking at the range over a set of events the uncertainty on the intrinsic noise in the TPC 
 physics.producers.daq.wcls_main.structs.int_noise_scale: 0.9624
diff --git a/fcl/syst_variations/detsim_2d_TPCnoise_refactored_variation_intnoise0p9_icarus.fcl b/fcl/syst_variations/detsim_2d_TPCnoise_refactored_variation_intnoise0p9_icarus.fcl
diff --git a/fcl/syst_variations/detsim_2d_TPCnoise_refactored_variation_intnoise1p1_icarus.fcl b/fcl/syst_variations/detsim_2d_TPCnoise_refactored_variation_intnoise1p1_icarus.fcl
diff --git a/fcl/syst_variations/detsim_2d_TPCnoise_refactored_variation_intp1_icarus.fcl b/fcl/syst_variations/detsim_2d_TPCnoise_refactored_variation_intp1_icarus.fcl
@@ -1,6 +1,6 @@
-#include "detsim_2d_variation_fitFR_refactored_icarus.fcl"
+#include "detsim_2d_icarus_refactored.fcl"
 
 process_name: TPCIntNoiseVarp1
 
-#Noise adjustment from preliminary study by J. Mueller looking at the range over a set of events the uncertainty on the intrinsic noise in the TPC (subject to change, this is a test case)
+#Noise adjustment from preliminary study by J. Mueller looking at the range over a set of events the uncertainty on the intrinsic noise in the TPC
 physics.producers.daq.wcls_main.structs.int_noise_scale: 1.0376
diff --git a/fcl/syst_variations/detsim_2d_icarus_refactored_light_variations.fcl b/fcl/syst_variations/detsim_2d_icarus_refactored_light_variations.fcl
diff --git a/fcl/syst_variations/detsim_2d_icarus_refactored_untuned_variations.fcl b/fcl/syst_variations/detsim_2d_icarus_refactored_untuned_variations.fcl
diff --git a/fcl/syst_variations/detsim_2d_icarus_refactored_variation_ind0gainhi.fcl b/fcl/syst_variations/detsim_2d_icarus_refactored_variation_ind0gainhi.fcl
@@ -1,9 +1,9 @@
 #originally developed by G. Putnam, adapt once that PR is in place 
 # Fit field responses, turned up noise on each plane
 #
-#include "detsim_2d_variation_fitFR_refactored_icarus.fcl"
+#include "detsim_2d_icarus_refactored.fcl"
 
 # variation increase gain by 15%
-physics.producers.daq.wcls_main.structs.gain0: 13.79065
+physics.producers.daq.wcls_main.structs.gain0: 19.6099
 
 process_name: DetSimInd0GainHi
diff --git a/fcl/syst_variations/detsim_2d_icarus_refactored_variation_ind0gainlow.fcl b/fcl/syst_variations/detsim_2d_icarus_refactored_variation_ind0gainlow.fcl
@@ -1,9 +1,9 @@
 #originally developed by G. Putnam 
 # Fit field responses
 #
-#include "detsim_2d_variation_fitFR_refactored_icarus.fcl"
+#include "detsim_2d_icarus_refactored.fcl"
 
 # variation decrease gain factor on induction 1 plane by 15%
-physics.producers.daq.wcls_main.structs.gain0: 10.1930
+physics.producers.daq.wcls_main.structs.gain0: 14.4943
 
 process_name: DetSimInd0GainLow
diff --git a/fcl/syst_variations/detsim_2d_icarus_refactored_variation_ind1_opaque.fcl b/fcl/syst_variations/detsim_2d_icarus_refactored_variation_ind1_opaque.fcl
@@ -2,7 +2,7 @@
 # Fit field responses, turned up noise on each plane
 #
 
-#include "detsim_2d_variation_fitFR_refactored_icarus.fcl"
+#include "detsim_2d_icarus_refactored.fcl"
 
 # variation on ind 0
 physics.producers.daq.wcls_main.params.files_fields: "icarus_fnal_fit_ks_ind1bin0.json.bz2"

diff --git a/fcl/syst_variations/detsim_2d_icarus_refactored_variation_ind1_transparent.fcl b/fcl/syst_variations/detsim_2d_icarus_refactored_variation_ind1_transparent.fcl
@@ -2,7 +2,7 @@
 # Fit field responses, turned up noise on each plane
 #
 
-#include "detsim_2d_variation_fitFR_refactored_icarus.fcl"
+#include "detsim_2d_icarus_refactored.fcl"
 
 # variation on ind 0
 physics.producers.daq.wcls_main.params.files_fields: "icarus_fnal_fit_ks_ind1bin14.json.bz2"

diff --git a/fcl/syst_variations/detsim_2d_icarus_refactored_variation_run2lifetimehi.fcl b/fcl/syst_variations/detsim_2d_icarus_refactored_variation_run2lifetimehi.fcl
@@ -1,7 +1,7 @@
-#include "detsim_2d_variation_fitFR_refactored_icarus.fcl"
+#include "detsim_2d_icarus_refactored.fcl"
 
-#Highest value of e- lifetime across both TPCs in Run 2 (9.2 ms in West cryostat) - Values provided by C. Farnese
-services.DetectorPropertiesService.Electronlifetime: 9200 
-physics.producers.daq.wcls_main.structs.lifetime: 9200
+#Average value of e- lifetime in West Cryostat in Run 2 (8.0 ms in West cryostat) 
+services.DetectorPropertiesService.Electronlifetime: 8000 
+physics.producers.daq.wcls_main.structs.lifetime: 8000
 
 process_name: ELRun2MaxVar
diff --git a/fcl/syst_variations/detsim_2d_icarus_refactored_variation_run2lifetimelow.fcl b/fcl/syst_variations/detsim_2d_icarus_refactored_variation_run2lifetimelow.fcl
@@ -1,7 +1,7 @@
-#include "detsim_2d_variation_fitFR_refactored_icarus.fcl"
+#include "detsim_2d_icarus_refactored.fcl"
 
-#Lowest value of e- lifetime across both TPCs in Run 2 (3.8 ms in East cryostat) - Values provided by C. Farnese
-services.DetectorPropertiesService.Electronlifetime: 3800 
-physics.producers.daq.wcls_main.structs.lifetime: 3800
+#Average value of e- lifetime in East Cryostat in Run 2 (4.0 ms in East cryostat)
+services.DetectorPropertiesService.Electronlifetime: 4000 
+physics.producers.daq.wcls_main.structs.lifetime: 4000
 
 process_name: ELRun2MinVar
diff --git a/fcl/syst_variations/detsim_2d_variation_fitFR_refactored_icarus.fcl b/fcl/syst_variations/detsim_2d_variation_fitFR_refactored_icarus.fcl
diff --git a/fcl/syst_variations/detsim_2d_variation_refactored_icarus.fcl b/fcl/syst_variations/detsim_2d_variation_refactored_icarus.fcl
@@ -0,0 +1,3 @@
+#include "detsim_2d_icarus_refactored.fcl"
+
+process_name: DetSimVar
diff --git a/fcl/syst_variations/nuonly_sample_gen.fcl b/fcl/syst_variations/nuonly_sample_gen.fcl
diff --git a/fcl/syst_variations/run_icarusMC_supera.fcl b/fcl/syst_variations/run_icarusMC_supera.fcl
diff --git a/fcl/syst_variations/scrub_stage1_qechange_variations_icarus.fcl b/fcl/syst_variations/scrub_stage1_qechange_variations_icarus.fcl
diff --git a/fcl/syst_variations/scrub_stage1_variations_icarus.fcl b/fcl/syst_variations/scrub_stage1_variations_icarus.fcl
@@ -5,14 +5,15 @@
 # Author Jacob Zettlemoyer (jzettle@fnal.gov), originally implemented by H. Lay for SBND
 
 #include "rootoutput_icarus.fcl"
+#include "services_common_icarus.fcl"
 
 process_name: Scrub
 
 source:
 {
   module_type:   RootInput
   inputCommands: [ "keep *_*_*_*",
-  		   "drop *_*_*_G4step2",
+  		   "drop *_*_*_G4Step2",
                    "drop *_*_*_DetSim",
 		   "drop *_*_*_MCstage0",
                    "drop *_*_*_MCstage1" ]

diff --git a/fcl/syst_variations/stage0_variation_icarus_savewires.fcl b/fcl/syst_variations/stage0_variation_icarus_savewires.fcl
diff --git a/fcl/syst_variations/stage1_variation_icarus.fcl b/fcl/syst_variations/stage1_variation_icarus.fcl
diff --git a/fcl/syst_variations/stage1_variation_icarus_saveallcalibtracks.fcl b/fcl/syst_variations/stage1_variation_icarus_saveallcalibtracks.fcl
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		#include "detsim_2d_icarus_refactored.fcl"

		process_name: DetSimVar