Skip to content

Commit bef17a6

Browse files
Merge branch 'develop' into feature/aliciavr_XARAPUCA_offline_decoder_v3.0-timing
2 parents da10dd5 + e5a001c commit bef17a6

32 files changed

+1750
-44
lines changed

sbndcode/Filters/SimEnergyDepFakeTriggerFilter_module.cc

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ class SimEnergyDepFakeTriggerFilter : public art::EDFilter {
1515
const double fBeamTimeMin; // Minimum time of beam window [us]
1616
const double fBeamTimeMax; // Maximum time of beam window [us]
1717
const double fEnergyDeposit; // Minimum energy deposit in TPC for trigger [MeV]
18+
const double fMaxEnergyDeposit; // Maximum energy deposit in TPC for trigger [MeV]
1819

1920
const std::string fSimEnergyDepModuleName;
2021
};
@@ -24,6 +25,7 @@ SimEnergyDepFakeTriggerFilter::SimEnergyDepFakeTriggerFilter(fhicl::ParameterSet
2425
, fBeamTimeMin(pset.get<double>("BeamTimeMin"))
2526
, fBeamTimeMax(pset.get<double>("BeamTimeMax"))
2627
, fEnergyDeposit(pset.get<double>("EnergyDeposit"))
28+
, fMaxEnergyDeposit(pset.get<double>("MaxEnergyDeposit", std::numeric_limits<double>::max()))
2729
, fSimEnergyDepModuleName(pset.get<std::string>("SimEnergyDepModuleName"))
2830
{
2931
}
@@ -46,7 +48,7 @@ bool SimEnergyDepFakeTriggerFilter::filter(art::Event& e)
4648
}
4749

4850
// 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);
5052
}
5153

5254
DEFINE_ART_MODULE(SimEnergyDepFakeTriggerFilter)

sbndcode/Filters/fcls/simenergydepfaketriggerfilter.fcl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ sbnd_simenergydepfaketriggerfilter:
77
# Select the beam spill time to match that in sbnd_filtergenintime
88
BeamTimeMin: -0.2 # Minimum time of beam window [us]
99
BeamTimeMax: 1.9 # Maximum time of beam window [us]
10-
EnergyDeposit: 100 # Minimum energy deposit in TPC for trigger [MeV]
10+
EnergyDeposit: 1 # Minimum energy deposit in TPC for trigger [MeV]
1111

1212
# By default, take only the energy deposits within the TPC active volume
1313
SimEnergyDepModuleName: "largeant:LArG4DetectorServicevolTPCActive" # Name of SimEnergyDeposit producer module

sbndcode/JobConfigurations/standard/caf/cafmakerjob_sbnd.fcl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,7 @@ physics.producers.cafmaker.TPCPMTBarycenterMatchLabel: "tpcpmtbarycentermatching
157157

158158
# Overwrite weight_functions label:
159159
physics.producers.fluxweight.weight_functions: @local::physics.producers.fluxweight.weight_functions_flux
160+
physics.producers.geant4weight.weight_functions: @local::physics.producers.geant4weight.weight_functions_reint
160161

161162
# input art file.
162163
physics.producers.cafmaker.SystWeightLabels: []
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#include "cafmakerjob_sbnd_data_base.fcl"
22

3-
physics.producers.cafmaker.BNBPOTDataLabel: "sbndbnbinfo"
3+
physics.producers.cafmaker.BNBPOTDataLabel: "bnbinfo"
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#include "cafmakerjob_sbnd_data_base.fcl"
22

3-
physics.producers.cafmaker.OffbeamBNBCountDataLabel: "sbndbnbextinfo"
3+
physics.producers.cafmaker.OffbeamBNBCountDataLabel: "bnbextinfo"
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#include "cafmakerjob_sbnd_data_sce.fcl"
22

3-
physics.producers.cafmaker.BNBPOTDataLabel: "sbndbnbinfo"
3+
physics.producers.cafmaker.BNBPOTDataLabel: "bnbinfo"
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#include "cafmakerjob_sbnd_data_sce.fcl"
22

3-
physics.producers.cafmaker.OffbeamBNBCountDataLabel: "sbndbnbextinfo"
3+
physics.producers.cafmaker.OffbeamBNBCountDataLabel: "bnbextinfo"
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#include "cafmakerjob_sbnd.fcl"
2+
3+
physics.runprod: [rns, geant4weight , @sequence::physics.runprod]
4+
physics.producers.cafmaker.SystWeightLabels: [ "geant4weight" ]
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#include "cafmakerjob_sbnd_sce.fcl"
2+
3+
physics.runprod: [rns, systtools, fluxweight, geant4weight, @sequence::physics.runprod]
4+
physics.producers.cafmaker.SystWeightLabels: [ "systtools", "fluxweight", "geant4weight" ]
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#include "cafmakerjob_sbnd.fcl"
2+
3+
physics.runprod: [rns, systtools, fluxweight, geant4weight, @sequence::physics.runprod]
4+
physics.producers.cafmaker.SystWeightLabels: [ "systtools", "fluxweight", "geant4weight" ]

0 commit comments

Comments
 (0)