Merge branch 'production/v10_06_00' into lnguyen/frame_shift_pr_spring

nathanielerowe · web-flow · commit 484557be7bc6 · 2025-09-04T22:49:05.000-05:00
diff --git a/sbndcode/Filters/SimEnergyDepFakeTriggerFilter_module.cc b/sbndcode/Filters/SimEnergyDepFakeTriggerFilter_module.cc
@@ -15,6 +15,7 @@ class SimEnergyDepFakeTriggerFilter : public art::EDFilter {
   const double fBeamTimeMin;   // Minimum time of beam window [us]
   const double fBeamTimeMax;   // Maximum time of beam window [us]
   const double fEnergyDeposit; // Minimum energy deposit in TPC for trigger [MeV]
+  const double fMaxEnergyDeposit; // Maximum energy deposit in TPC for trigger [MeV]
 
   const std::string fSimEnergyDepModuleName;
 };
@@ -24,6 +25,7 @@ SimEnergyDepFakeTriggerFilter::SimEnergyDepFakeTriggerFilter(fhicl::ParameterSet
     , fBeamTimeMin(pset.get<double>("BeamTimeMin"))
     , fBeamTimeMax(pset.get<double>("BeamTimeMax"))
     , fEnergyDeposit(pset.get<double>("EnergyDeposit"))
+    , fMaxEnergyDeposit(pset.get<double>("MaxEnergyDeposit", std::numeric_limits<double>::max()))
     , fSimEnergyDepModuleName(pset.get<std::string>("SimEnergyDepModuleName"))
 {
 }
@@ -46,7 +48,7 @@ bool SimEnergyDepFakeTriggerFilter::filter(art::Event& e)
   }
 
   // If the energy deposit within the beam time is greater than some limit then trigger the event
-  return energy > fEnergyDeposit;
+  return (energy > fEnergyDeposit) & (energy < fMaxEnergyDeposit);
 }
 
 DEFINE_ART_MODULE(SimEnergyDepFakeTriggerFilter)
diff --git a/sbndcode/Filters/fcls/simenergydepfaketriggerfilter.fcl b/sbndcode/Filters/fcls/simenergydepfaketriggerfilter.fcl
@@ -7,7 +7,7 @@ sbnd_simenergydepfaketriggerfilter:
   # Select the beam spill time to match that in sbnd_filtergenintime
   BeamTimeMin:    -0.2        # Minimum time of beam window [us]
   BeamTimeMax:     1.9        # Maximum time of beam window [us]
-  EnergyDeposit:   100        # Minimum energy deposit in TPC for trigger [MeV]
+  EnergyDeposit:   10         # Minimum energy deposit in TPC for trigger [MeV]
  
   # By default, take only the energy deposits within the TPC active volume
   SimEnergyDepModuleName: "largeant:LArG4DetectorServicevolTPCActive" # Name of SimEnergyDeposit producer module
diff --git a/sbndcode/JobConfigurations/standard/caf/cafmakerjob_sbnd.fcl b/sbndcode/JobConfigurations/standard/caf/cafmakerjob_sbnd.fcl
@@ -155,6 +155,7 @@ physics.producers.cafmaker.TPCPMTBarycenterMatchLabel: "tpcpmtbarycentermatching
 
 # Overwrite weight_functions label:
 physics.producers.fluxweight.weight_functions: @local::physics.producers.fluxweight.weight_functions_flux
+physics.producers.geant4weight.weight_functions: @local::physics.producers.geant4weight.weight_functions_reint
 
 # input art file.
 physics.producers.cafmaker.SystWeightLabels: []
diff --git a/sbndcode/JobConfigurations/standard/caf/cafmakerjob_sbnd_g4rw.fcl b/sbndcode/JobConfigurations/standard/caf/cafmakerjob_sbnd_g4rw.fcl
@@ -0,0 +1,4 @@
+#include "cafmakerjob_sbnd.fcl"
+
+physics.runprod: [rns, geant4weight , @sequence::physics.runprod]
+physics.producers.cafmaker.SystWeightLabels: [ "geant4weight" ]
diff --git a/sbndcode/JobConfigurations/standard/caf/cafmakerjob_sbnd_sce_systtools_and_fluxwgt_and_g4rw.fcl b/sbndcode/JobConfigurations/standard/caf/cafmakerjob_sbnd_sce_systtools_and_fluxwgt_and_g4rw.fcl
@@ -0,0 +1,4 @@
+#include "cafmakerjob_sbnd_sce.fcl"
+
+physics.runprod: [rns, systtools, fluxweight, geant4weight, @sequence::physics.runprod]
+physics.producers.cafmaker.SystWeightLabels: [ "systtools", "fluxweight", "geant4weight" ]
diff --git a/sbndcode/JobConfigurations/standard/caf/cafmakerjob_sbnd_systtools_and_fluxwgt_and_g4rw.fcl b/sbndcode/JobConfigurations/standard/caf/cafmakerjob_sbnd_systtools_and_fluxwgt_and_g4rw.fcl
@@ -0,0 +1,4 @@
+#include "cafmakerjob_sbnd.fcl"
+
+physics.runprod: [rns, systtools, fluxweight, geant4weight, @sequence::physics.runprod]
+physics.producers.cafmaker.SystWeightLabels: [ "systtools", "fluxweight", "geant4weight" ]
diff --git a/sbndcode/JobConfigurations/standard/detsim/detector_variations/CMakeLists.txt b/sbndcode/JobConfigurations/standard/detsim/detector_variations/CMakeLists.txt
@@ -1,2 +1,2 @@
 install_fhicl()
-add_subdirectory(pmt_variations)
+add_subdirectory(pmt_variations)
diff --git a/sbndcode/JobConfigurations/standard/detsim/detector_variations/detsim_enable_doublespacecharge_sbnd.fcl b/sbndcode/JobConfigurations/standard/detsim/detector_variations/detsim_enable_doublespacecharge_sbnd.fcl
@@ -1,6 +1,6 @@
-#include "standard_g4_sbnd.fcl"
+#include "detsim_detvar.fcl"
 
 services.SpaceCharge.EnableSimSpatialSCE: true
 services.SpaceCharge.EnableSimEfieldSCE: true
 
-services.SpaceCharge.InputFilename: "SCEoffsets/SCEoffsets_SBND_E500_DoubleCharge_voxelTH3.root"
+services.SpaceCharge.InputFilename: "SCEoffsets/SCEoffsets_SBND_E500_dualmap_2x_voxelTH3.root"
diff --git a/sbndcode/JobConfigurations/standard/detsim/detector_variations/detsim_enable_zerospacecharge_sbnd.fcl b/sbndcode/JobConfigurations/standard/detsim/detector_variations/detsim_enable_zerospacecharge_sbnd.fcl
@@ -0,0 +1,6 @@
+#include "detsim_detvar.fcl"
+
+services.SpaceCharge.EnableSimSpatialSCE: true
+services.SpaceCharge.EnableSimEfieldSCE: true
+
+services.SpaceCharge.InputFilename: "SCEoffsets/SCEoffsets_SBND_E500_dualmap_0x_voxelTH3.root"
diff --git a/sbndcode/JobConfigurations/standard/gen/genie_corsika/prodgenie_corsika_proton_rockbox100_sbnd.fcl b/sbndcode/JobConfigurations/standard/gen/genie_corsika/prodgenie_corsika_proton_rockbox100_sbnd.fcl
@@ -0,0 +1,3 @@
+#include "prodgenie_corsika_proton_rockbox_sbnd.fcl"
+
+physics.filters.dirtfilter.EnergyDeposit: 100 # MeV
diff --git a/sbndcode/JobConfigurations/standard/gen/genie_corsika/prodgenie_corsika_proton_rockbox_lowenergydirt_sbnd.fcl b/sbndcode/JobConfigurations/standard/gen/genie_corsika/prodgenie_corsika_proton_rockbox_lowenergydirt_sbnd.fcl
@@ -0,0 +1,7 @@
+#include "prodgenie_corsika_proton_rockbox_sbnd.fcl"
+
+physics.filters.dirtfilter.EnergyDeposit: 1 # MeV
+physics.filters.dirtfilter.MaxEnergyDeposit: 100 # MeV
+
+# Only keep dirt events
+outputs.out1.SelectEvents: [ "simulatedirt" ]
diff --git a/sbndcode/SpaceCharge/SpaceChargeSBND.cxx b/sbndcode/SpaceCharge/SpaceChargeSBND.cxx
@@ -46,6 +46,7 @@ bool spacecharge::SpaceChargeSBND::Configure(fhicl::ParameterSet const& pset)
                 }
 
             if(fRepresentationType == "Voxelized_TH3"){
+      	      std::cout << "Opening " << fname << std::endl;
       	      std::cout << "begin loading voxelized TH3s..." << std::endl;
 
       	      //Load in histograms

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@ class SimEnergyDepFakeTriggerFilter : public art::EDFilter {`
`15`	`15`	`const double fBeamTimeMin; // Minimum time of beam window [us]`
`16`	`16`	`const double fBeamTimeMax; // Maximum time of beam window [us]`
`17`	`17`	`const double fEnergyDeposit; // Minimum energy deposit in TPC for trigger [MeV]`
	`18`	`+ const double fMaxEnergyDeposit; // Maximum energy deposit in TPC for trigger [MeV]`
`18`	`19`
`19`	`20`	`const std::string fSimEnergyDepModuleName;`
`20`	`21`	`};`
`@@ -24,6 +25,7 @@ SimEnergyDepFakeTriggerFilter::SimEnergyDepFakeTriggerFilter(fhicl::ParameterSet`
`24`	`25`	`, fBeamTimeMin(pset.get<double>("BeamTimeMin"))`
`25`	`26`	`, fBeamTimeMax(pset.get<double>("BeamTimeMax"))`
`26`	`27`	`, fEnergyDeposit(pset.get<double>("EnergyDeposit"))`
	`28`	`+ , fMaxEnergyDeposit(pset.get<double>("MaxEnergyDeposit", std::numeric_limits<double>::max()))`
`27`	`29`	`, fSimEnergyDepModuleName(pset.get<std::string>("SimEnergyDepModuleName"))`
`28`	`30`	`{`
`29`	`31`	`}`
`@@ -46,7 +48,7 @@ bool SimEnergyDepFakeTriggerFilter::filter(art::Event& e)`
`46`	`48`	`}`
`47`	`49`
`48`	`50`	`// If the energy deposit within the beam time is greater than some limit then trigger the event`
`49`		`- return energy > fEnergyDeposit;`
	`51`	`+ return (energy > fEnergyDeposit) & (energy < fMaxEnergyDeposit);`
`50`	`52`	`}`
`51`	`53`
`52`	`54`	`DEFINE_ART_MODULE(SimEnergyDepFakeTriggerFilter)`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`install_fhicl()`
`2`		`-add_subdirectory(pmt_variations)`
	`2`	`+add_subdirectory(pmt_variations)`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+#include "prodgenie_corsika_proton_rockbox_sbnd.fcl"`
	`2`	`+`
	`3`	`+physics.filters.dirtfilter.EnergyDeposit: 100 # MeV`