Skip to content

Commit 0c4c952

Browse files
henrylay97henrylay97
authored
Merge branch 'feature/hlay_crt_offline_pr' into feature/hlay_crt_offline_reco
2 parents 802eb72 + a46a522 commit 0c4c952

30 files changed

Lines changed: 3330 additions & 86 deletions

‎sbndcode/CRT/CRTAna/CRTAnalysis_module.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ class sbnd::crt::CRTAnalysis : public art::EDAnalyzer {
281281

282282
sbnd::crt::CRTAnalysis::CRTAnalysis(fhicl::ParameterSet const& p)
283283
: EDAnalyzer{p}
284-
, fCRTGeoAlg(p.get<fhicl::ParameterSet>("CRTGeoAlg", fhicl::ParameterSet()))
284+
, fCRTGeoAlg(p.get<fhicl::ParameterSet>("CRTGeoAlg"))
285285
, fCRTBackTrackerAlg(p.get<fhicl::ParameterSet>("CRTBackTrackerAlg", fhicl::ParameterSet()))
286286
{
287287
fMCParticleModuleLabel = p.get<std::string>("MCParticleModuleLabel", "largeant");

‎sbndcode/CRT/CRTAna/CRTCalibAna_module.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ class sbnd::crt::CRTCalibAna : public art::EDAnalyzer {
277277

278278
sbnd::crt::CRTCalibAna::CRTCalibAna(fhicl::ParameterSet const& p)
279279
: EDAnalyzer{p}
280-
, fCRTGeoAlg(p.get<fhicl::ParameterSet>("CRTGeoAlg", fhicl::ParameterSet()))
280+
, fCRTGeoAlg(p.get<fhicl::ParameterSet>("CRTGeoAlg"))
281281
, fCRTBackTrackerAlg(p.get<fhicl::ParameterSet>("CRTBackTrackerAlg", fhicl::ParameterSet()))
282282
{
283283
fMCParticleModuleLabel = p.get<std::string>("MCParticleModuleLabel", "largeant");

‎sbndcode/CRT/CRTAna/run_crtana.fcl‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
#include "simulationservices_sbnd.fcl"
1+
#include "crtgeoalg_sbnd.fcl"
22
#include "crtbacktrackeralg_sbnd.fcl"
3+
#include "simulationservices_sbnd.fcl"
34

45
process_name: CRTAnalyzer
56

@@ -24,6 +25,7 @@ physics:
2425
crtana:
2526
{
2627
module_type: "CRTAnalysis"
28+
CRTGeoAlg: @local::crtgeoalg_sbnd
2729
CRTBackTrackerAlg: @local::crtbacktrackeralg_sbnd
2830
}
2931
}

‎sbndcode/CRT/CRTBackTracker/CRTBackTrackerAlg.cc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
namespace sbnd::crt {
44

55
CRTBackTrackerAlg::CRTBackTrackerAlg(const Config& config)
6+
: fCRTGeoAlg(config.GeoAlgConfig())
67
{
78
this->reconfigure(config);
89
}

‎sbndcode/CRT/CRTBackTracker/CRTBackTrackerAlg.h‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,10 @@ namespace sbnd::crt {
5353
using Name = fhicl::Name;
5454
using Comment = fhicl::Comment;
5555

56+
fhicl::Table<fhicl::ParameterSet> GeoAlgConfig {
57+
Name("CRTGeoAlg"),
58+
};
59+
5660
fhicl::Atom<art::InputTag> SimModuleLabel {
5761
Name("SimModuleLabel"),
5862
};

‎sbndcode/CRT/CRTEventDisplay/crteventdisplayalg_sbnd.fcl‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
1-
#include "crtsimmodules_sbnd.fcl"
1+
#include "crtgeoalg_sbnd.fcl"
22
#include "crtbacktrackeralg_sbnd.fcl"
3+
#include "crtsimmodules_sbnd.fcl"
34

45
BEGIN_PROLOG
56

67
crteventdisplayalg_sbnd:
78
{
9+
CRTGeoAlg: @local::crtgeoalg_sbnd
810
CRTBackTrackerAlg: @local::crtbacktrackeralg_sbnd
911

1012
SimLabel: "largeant"

‎sbndcode/CRT/CRTReco/CRTClusterCharacterisationAlg.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
namespace sbnd::crt {
44

55
CRTClusterCharacterisationAlg::CRTClusterCharacterisationAlg(const fhicl::ParameterSet& pset)
6-
: fCRTGeoAlg(pset.get<fhicl::ParameterSet>("GeoAlg", fhicl::ParameterSet()))
6+
: fCRTGeoAlg(pset.get<fhicl::ParameterSet>("CRTGeoAlg"))
77
, fTimeOffset(pset.get<double>("TimeOffset"))
88
, fOverlapBuffer(pset.get<double>("OverlapBuffer"))
99
, fPEAttenuation(pset.get<double>("PEAttenuation"))

‎sbndcode/CRT/CRTReco/CRTClusterProducer_module.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ class sbnd::crt::CRTClusterProducer : public art::EDProducer {
6363

6464
sbnd::crt::CRTClusterProducer::CRTClusterProducer(fhicl::ParameterSet const& p)
6565
: EDProducer{p}
66-
, fCRTGeoAlg(p.get<fhicl::ParameterSet>("CRTGeoAlg", fhicl::ParameterSet()))
66+
, fCRTGeoAlg(p.get<fhicl::ParameterSet>("CRTGeoAlg"))
6767
, fCRTStripHitModuleLabel(p.get<std::string>("CRTStripHitModuleLabel"))
6868
, fCoincidenceTimeRequirement(p.get<uint32_t>("CoincidenceTimeRequirement"))
6969
, fOverlapBuffer(p.get<double>("OverlapBuffer"))

‎sbndcode/CRT/CRTReco/CRTStripHitProducer_module.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ class sbnd::crt::CRTStripHitProducer : public art::EDProducer {
6666

6767
sbnd::crt::CRTStripHitProducer::CRTStripHitProducer(fhicl::ParameterSet const& p)
6868
: EDProducer{p}
69-
, fCRTGeoAlg(p.get<fhicl::ParameterSet>("CRTGeoAlg", fhicl::ParameterSet()))
69+
, fCRTGeoAlg(p.get<fhicl::ParameterSet>("CRTGeoAlg"))
7070
, fFEBDataModuleLabel(p.get<std::string>("FEBDataModuleLabel"))
7171
, fADCThreshold(p.get<uint16_t>("ADCThreshold"))
7272
, fErrorCoeff(p.get<std::vector<double>>("ErrorCoeff"))

‎sbndcode/CRT/CRTReco/CRTTrackProducer_module.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ class sbnd::crt::CRTTrackProducer : public art::EDProducer {
108108

109109
sbnd::crt::CRTTrackProducer::CRTTrackProducer(fhicl::ParameterSet const& p)
110110
: EDProducer{p}
111-
, fCRTGeoAlg(p.get<fhicl::ParameterSet>("CRTGeoAlg", fhicl::ParameterSet()))
111+
, fCRTGeoAlg(p.get<fhicl::ParameterSet>("CRTGeoAlg"))
112112
, fCRTSpacePointModuleLabel(p.get<std::string>("CRTSpacePointModuleLabel"))
113113
, fCoincidenceTimeRequirement(p.get<double>("CoincidenceTimeRequirement"))
114114
, fThirdSpacePointMaximumDCA(p.get<double>("ThirdSpacePointMaximumDCA"))

0 commit comments

Comments
 (0)