Merge branch 'production/v10_06_00' into feature/lkashur_sce_detvar_prod

Author: nathanielerowe

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)

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

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: []

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" ]

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" ]

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" ]

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

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" ]