Merge branch 'feature/hlay_crt_offline_pr' into feature/hlay_crt_offline_ana

Author: henrylay97

sbndcode/CRT/CRTAna/CRTAnalysis_module.cc

@@ -315,7 +315,8 @@ class sbnd::crt::CRTAnalysis : public art::EDAnalyzer {
 
 sbnd::crt::CRTAnalysis::CRTAnalysis(fhicl::ParameterSet const& p)
   : EDAnalyzer{p}
-  , fCRTGeoAlg(p.get<fhicl::ParameterSet>("CRTGeoAlg", fhicl::ParameterSet()))
+  , fCRTGeoAlg(p.get<fhicl::ParameterSet>("CRTGeoAlg"))
+  , fCRTBackTrackerAlg(p.get<fhicl::ParameterSet>("CRTBackTrackerAlg", fhicl::ParameterSet()))
 {
   fMCParticleModuleLabel            = p.get<std::string>("MCParticleModuleLabel", "largeant");
   fSimDepositModuleLabel            = p.get<std::string>("SimDepositModuleLabel", "genericcrt");

sbndcode/CRT/CRTAna/run_crtana.fcl

@@ -1,5 +1,6 @@
-#include "simulationservices_sbnd.fcl"
+#include "crtgeoalg_sbnd.fcl"
 #include "crtbacktrackeralg_sbnd.fcl"
+#include "simulationservices_sbnd.fcl"
 
 process_name: CRTAnalyzer
 
@@ -24,6 +25,7 @@ physics:
     crtana: 
     { 
       module_type:       "CRTAnalysis"
+      CRTGeoAlg:         @local::crtgeoalg_sbnd
       CRTBackTrackerAlg: @local::crtbacktrackeralg_sbnd
     }
   }

sbndcode/CRT/CRTBackTracker/CRTBackTrackerAlg.cc

@@ -3,6 +3,7 @@
 namespace sbnd::crt {
 
   CRTBackTrackerAlg::CRTBackTrackerAlg(const Config& config)
+    : fCRTGeoAlg(config.GeoAlgConfig())
   {
     this->reconfigure(config);
   }

sbndcode/CRT/CRTBackTracker/CRTBackTrackerAlg.h

@@ -53,6 +53,10 @@ namespace sbnd::crt {
       using Name = fhicl::Name;
       using Comment = fhicl::Comment;
 
+      fhicl::Table<fhicl::ParameterSet> GeoAlgConfig {
+        Name("CRTGeoAlg"),
+	  };
+
       fhicl::Atom<art::InputTag> SimModuleLabel {
         Name("SimModuleLabel"),
           };

sbndcode/CRT/CRTEventDisplay/crteventdisplayalg_sbnd.fcl

@@ -1,10 +1,12 @@
-#include "crtsimmodules_sbnd.fcl"
+#include "crtgeoalg_sbnd.fcl"
 #include "crtbacktrackeralg_sbnd.fcl"
+#include "crtsimmodules_sbnd.fcl"
 
 BEGIN_PROLOG
 
 crteventdisplayalg_sbnd:
 {
+   CRTGeoAlg:         @local::crtgeoalg_sbnd
    CRTBackTrackerAlg: @local::crtbacktrackeralg_sbnd
 
    SimLabel:         "largeant"

sbndcode/CRT/CRTReco/CRTClusterCharacterisationAlg.cc

@@ -3,7 +3,7 @@
 namespace sbnd::crt {
 
   CRTClusterCharacterisationAlg::CRTClusterCharacterisationAlg(const fhicl::ParameterSet& pset)
-    : fCRTGeoAlg(pset.get<fhicl::ParameterSet>("GeoAlg", fhicl::ParameterSet()))
+    : fCRTGeoAlg(pset.get<fhicl::ParameterSet>("CRTGeoAlg"))
     , fUseT1(pset.get<bool>("UseT1"))
     , fTimeOffset(pset.get<double>("TimeOffset"))
     , fOverlapBuffer(pset.get<double>("OverlapBuffer"))

sbndcode/CRT/CRTReco/CRTClusterProducer_module.cc

@@ -62,7 +62,7 @@ class sbnd::crt::CRTClusterProducer : public art::EDProducer {
 
 sbnd::crt::CRTClusterProducer::CRTClusterProducer(fhicl::ParameterSet const& p)
   : EDProducer{p}
-  , fCRTGeoAlg(p.get<fhicl::ParameterSet>("CRTGeoAlg", fhicl::ParameterSet()))
+  , fCRTGeoAlg(p.get<fhicl::ParameterSet>("CRTGeoAlg"))
   , fCRTStripHitModuleLabel(p.get<std::string>("CRTStripHitModuleLabel"))
   , fCoincidenceTimeRequirement(p.get<uint32_t>("CoincidenceTimeRequirement"))
   , fOverlapBuffer(p.get<double>("OverlapBuffer"))

sbndcode/CRT/CRTReco/CRTStripHitProducer_module.cc

@@ -55,7 +55,7 @@ class sbnd::crt::CRTStripHitProducer : public art::EDProducer {
 
 sbnd::crt::CRTStripHitProducer::CRTStripHitProducer(fhicl::ParameterSet const& p)
   : EDProducer{p}
-  , fCRTGeoAlg(p.get<fhicl::ParameterSet>("CRTGeoAlg", fhicl::ParameterSet()))
+  , fCRTGeoAlg(p.get<fhicl::ParameterSet>("CRTGeoAlg"))
   , fFEBDataModuleLabel(p.get<std::string>("FEBDataModuleLabel"))
   , fADCThreshold(p.get<uint16_t>("ADCThreshold"))
   , fErrorCoeff(p.get<std::vector<double>>("ErrorCoeff"))

sbndcode/CRT/CRTReco/CRTTrackProducer_module.cc

@@ -102,7 +102,7 @@ class sbnd::crt::CRTTrackProducer : public art::EDProducer {
 
 sbnd::crt::CRTTrackProducer::CRTTrackProducer(fhicl::ParameterSet const& p)
   : EDProducer{p}
-  , fCRTGeoAlg(p.get<fhicl::ParameterSet>("CRTGeoAlg", fhicl::ParameterSet()))
+  , fCRTGeoAlg(p.get<fhicl::ParameterSet>("CRTGeoAlg"))
   , fCRTSpacePointModuleLabel(p.get<std::string>("CRTSpacePointModuleLabel"))
   , fCoincidenceTimeRequirement(p.get<double>("CoincidenceTimeRequirement"))
   , fThirdSpacePointMaximumDCA(p.get<double>("ThirdSpacePointMaximumDCA"))

sbndcode/CRT/CRTReco/crtrecoproducers_sbnd.fcl

@@ -1,9 +1,11 @@
+#include "crtgeoalg_sbnd.fcl"
 #include "crtsimmodules_sbnd.fcl"
 
 BEGIN_PROLOG
 
 crtstriphitproducer_sbnd:
 {
+   CRTGeoAlg:          @local::crtgeoalg_sbnd
    FEBDataModuleLabel: "crtsim"
    ADCThreshold:       60
    ErrorCoeff:         [ 0.26, -0.27, 0.025 ]
@@ -12,6 +14,7 @@ crtstriphitproducer_sbnd:
 
 crtclusterproducer_sbnd:
 {
+   CRTGeoAlg:                  @local::crtgeoalg_sbnd
    CRTStripHitModuleLabel:     "crtstrips"
    CoincidenceTimeRequirement: 50
    OverlapBuffer:              1.
@@ -20,6 +23,7 @@ crtclusterproducer_sbnd:
 
 crtclustercharacterisationalg_sbnd:
 {
+   CRTGeoAlg:      @local::crtgeoalg_sbnd
    UseT1:          true
    TimeOffset:     -1.7e6 # Sim parameter
    OverlapBuffer:  1.
@@ -38,6 +42,7 @@ crtspacepointproducer_sbnd:
 
 crttrackproducer_sbnd:
 {
+   CRTGeoAlg:                  @local::crtgeoalg_sbnd
    CRTSpacePointModuleLabel:   "crtspacepoints"
    CoincidenceTimeRequirement: 100.
    ThirdSpacePointMaximumDCA:  50.