Make necessary changes to cope with always needing a fcl configuration

Author: henrylay97

sbndcode/CRT/CRTBackTracker/CRTBackTrackerAlg.cc

@@ -8,7 +8,7 @@ namespace sbnd::crt {
   }
 
   CRTBackTrackerAlg::CRTBackTrackerAlg(){}
-  
+
   CRTBackTrackerAlg::~CRTBackTrackerAlg(){}
 
   void CRTBackTrackerAlg::reconfigure(const Config& config)
@@ -20,6 +20,7 @@ namespace sbnd::crt {
     fClusterModuleLabel = config.ClusterModuleLabel();
     fSpacePointModuleLabel = config.SpacePointModuleLabel();
     fTrackModuleLabel = config.TrackModuleLabel();
+    fCRTGeoAlgConfig = config.GeoAlgConfig();
 
     return;
   }
@@ -37,6 +38,8 @@ namespace sbnd::crt {
     fTrackIDMotherMap.clear();
     fStripHitMCPMap.clear();
 
+    CRTGeoAlg geoAlg = CRTGeoAlg(fCRTGeoAlgConfig);
+
     art::Handle<std::vector<sim::ParticleAncestryMap>> droppedTrackIDMapVecHandle;
     event.getByLabel(fSimModuleLabel, droppedTrackIDMapVecHandle);
 
@@ -91,7 +94,7 @@ namespace sbnd::crt {
         const double x = (ide->entryX + ide->exitX) / 2.;
         const double y = (ide->entryY + ide->exitY) / 2.;
         const double z = (ide->entryZ + ide->exitZ) / 2.;
-        const CRTTagger tagger = fCRTGeoAlg.WhichTagger(x, y, z);
+        const CRTTagger tagger = geoAlg.WhichTagger(x, y, z);
 
         const int rollUpID = RollUpID(ide->trackID);
 
@@ -244,7 +247,7 @@ namespace sbnd::crt {
         const double x = (ide->entryX + ide->exitX) / 2.;
         const double y = (ide->entryY + ide->exitY) / 2.;
         const double z = (ide->entryZ + ide->exitZ) / 2.;
-        const CRTTagger tagger = fCRTGeoAlg.WhichTagger(x, y, z);
+        const CRTTagger tagger = geoAlg.WhichTagger(x, y, z);
 
         const int rollUpID = RollUpID(ide->trackID);
         Category category(rollUpID, tagger);
@@ -260,7 +263,7 @@ namespace sbnd::crt {
 
     for(auto const stripHit : stripHitVec)
       {
-        const CRTTagger tagger = fCRTGeoAlg.ChannelToTaggerEnum(stripHit->Channel());
+        const CRTTagger tagger = geoAlg.ChannelToTaggerEnum(stripHit->Channel());
         TruthMatchMetrics truthMatch = TruthMatching(event, stripHit);
 
         fStripHitMCPMap[stripHit.key()] = truthMatch.trackid;
@@ -337,6 +340,8 @@ namespace sbnd::crt {
 
   CRTBackTrackerAlg::TruthMatchMetrics CRTBackTrackerAlg::TruthMatching(const art::Event &event, const art::Ptr<CRTStripHit> &stripHit)
   {  
+    CRTGeoAlg geoAlg = CRTGeoAlg(fCRTGeoAlgConfig);
+
     art::Handle<std::vector<FEBData>> febDataHandle;
     event.getByLabel(fFEBDataModuleLabel, febDataHandle);
 
@@ -345,7 +350,7 @@ namespace sbnd::crt {
 
     art::FindManyP<sim::AuxDetIDE, FEBTruthInfo> febDataToIDEs(febDataHandle, event, fFEBDataModuleLabel);
     art::FindOneP<FEBData> stripHitToFEBData(stripHitHandle, event, fStripHitModuleLabel);
-    const CRTTagger tagger = fCRTGeoAlg.ChannelToTaggerEnum(stripHit->Channel());
+    const CRTTagger tagger = geoAlg.ChannelToTaggerEnum(stripHit->Channel());
 
     auto const febData = stripHitToFEBData.at(stripHit.key());
     auto const assnIDEVec = febDataToIDEs.at(febData.key());
@@ -540,8 +545,10 @@ namespace sbnd::crt {
                                                                                  const geo::Vector_t &dir, 
                                                                                  const CRTTagger &tagger)
   {
+    CRTGeoAlg geoAlg = CRTGeoAlg(fCRTGeoAlgConfig);
+
     const CoordSet constrainedPlane = CRTCommonUtils::GetTaggerDefinedCoordinate(tagger);
-    const CRTTaggerGeo taggerGeo    = fCRTGeoAlg.GetTagger(CRTCommonUtils::GetTaggerName(tagger));
+    const CRTTaggerGeo taggerGeo    = geoAlg.GetTagger(CRTCommonUtils::GetTaggerName(tagger));
     double k;
 
     switch(constrainedPlane)
@@ -570,7 +577,7 @@ namespace sbnd::crt {
         break;
       }
 
-    if(!fCRTGeoAlg.IsPointInsideCRTLimits(start + k * dir))
+    if(!geoAlg.IsPointInsideCRTLimits(start + k * dir))
       return {999999., {999999., 999999., 999999.}};
 
     return {k, start + k * dir};

sbndcode/CRT/CRTBackTracker/CRTBackTrackerAlg.h

@@ -53,6 +53,10 @@ namespace sbnd::crt {
       using Name = fhicl::Name;
       using Comment = fhicl::Comment;
 
+      fhicl::Table<CRTGeoAlg::Config> GeoAlgConfig {
+        Name("CRTGeoAlg"),
+	  };
+
       fhicl::Atom<art::InputTag> SimModuleLabel {
         Name("SimModuleLabel"),
           };
@@ -188,12 +192,12 @@ namespace sbnd::crt {
     };
 
     CRTBackTrackerAlg(const Config& config);
-    
+
+    CRTBackTrackerAlg();
+
     CRTBackTrackerAlg(const fhicl::ParameterSet& pset) :
     CRTBackTrackerAlg(fhicl::Table<Config>(pset, {})()) {}
 
-    CRTBackTrackerAlg();
-
     ~CRTBackTrackerAlg();
 
     void reconfigure(const Config& config);
@@ -228,7 +232,7 @@ namespace sbnd::crt {
 
   private:
 
-    CRTGeoAlg fCRTGeoAlg;
+    CRTGeoAlg::Config fCRTGeoAlgConfig;
 
     art::InputTag fSimModuleLabel;
     art::InputTag fSimDepositModuleLabel;

sbndcode/CRT/CRTBackTracker/crtbacktrackeralg_sbnd.fcl

@@ -1,3 +1,5 @@
+#include "crtgeoalg_sbnd.fcl"
+
 BEGIN_PROLOG
 
 crtbacktrackeralg_sbnd:
@@ -9,6 +11,7 @@ crtbacktrackeralg_sbnd:
    ClusterModuleLabel:     "crtclustering"
    SpacePointModuleLabel:  "crtspacepoints"
    TrackModuleLabel:       "crttracks"
+   CRTGeoAlg:              @local::crtgeoalg_sbnd
 }
 
 END_PROLOG

sbndcode/CRT/CRTEventDisplay/CRTEventDisplayAlg.cc

@@ -11,8 +11,6 @@ namespace sbnd::crt {
       fCRTBackTrackerAlg = CRTBackTrackerAlg(config.BackTrackerAlgConfig());
   }
 
-  CRTEventDisplayAlg::CRTEventDisplayAlg(){}
-  
   CRTEventDisplayAlg::~CRTEventDisplayAlg(){}
 
   void CRTEventDisplayAlg::reconfigure(const Config& config)

sbndcode/CRT/CRTEventDisplay/CRTEventDisplayAlg.h

@@ -55,10 +55,9 @@ namespace sbnd::crt {
       using Name = fhicl::Name;
       using Comment = fhicl::Comment;
 
-      fhicl::Table<fhicl::ParameterSet> GeoAlgConfig {
+      fhicl::Table<CRTGeoAlg::Config> GeoAlgConfig {
         Name("CRTGeoAlg"),
         Comment("Configuration parameters for the CRT geometry algorithm"),
-        fhicl::ParameterSet()
       };
 
       fhicl::Table<CRTBackTrackerAlg::Config> BackTrackerAlgConfig {
@@ -212,8 +211,6 @@ namespace sbnd::crt {
     CRTEventDisplayAlg(const fhicl::ParameterSet& pset) :
       CRTEventDisplayAlg(fhicl::Table<Config>(pset, {})()) {}
 
-    CRTEventDisplayAlg();
-
     ~CRTEventDisplayAlg();
 
     void reconfigure(const Config& config);

sbndcode/CRT/CRTEventDisplay/run_crteventdisplay.fcl

@@ -1,11 +1,12 @@
-#include "services_sbnd.fcl"
+#include "simulationservices_sbnd.fcl"
 #include "crteventdisplay_sbnd.fcl"
 
 process_name: CRTEventDisplay
 
 services:
 {
   @table::sbnd_services
+  ParticleInventoryService: @local::sbnd_particleinventoryservice
 }
 
 source:

sbndcode/CRT/CRTSimulation/CRTDetSimAlg.cxx

@@ -10,6 +10,7 @@ namespace crt {
     : fParams(params())
     , fEngine(engine)
     , fG4RefTime(g4RefTime)
+    , fCRTGeoAlg(params().GeoAlgConfig())
     {
         ConfigureWaveform();
         ConfigureTimeOffset();

sbndcode/CRT/CRTSimulation/CRTDetSimAlg.h

@@ -51,8 +51,6 @@
 #include "sbnobj/SBND/CRT/CRTData.hh"
 #include "CRTDetSimParams.h"
 
-#include "sbndcode/Geometry/GeometryWrappers/CRTGeoAlg.h"
-
 using std::vector;
 using std::pair;
 using std::map;

sbndcode/CRT/CRTSimulation/CRTDetSimParams.h

@@ -12,6 +12,8 @@
 #ifndef SBND_CRTDETSIMPARAMS_H
 #define SBND_CRTDETSIMPARAMS_H
 
+#include "sbndcode/Geometry/GeometryWrappers/CRTGeoAlg.h"
+
 #include "fhiclcpp/types/Table.h"
 #include "fhiclcpp/types/OptionalTable.h"
 #include "fhiclcpp/types/Sequence.h"
@@ -24,6 +26,10 @@ namespace crt
   struct CRTDetSimParams
   {
 
+    fhicl::Table<CRTGeoAlg::Config> GeoAlgConfig {
+      fhicl::Name("CRTGeoAlg"),
+    };
+
     fhicl::Atom<double> GlobalT0Offset {
       fhicl::Name("GlobalT0Offset"),
       fhicl::Comment("The global time offset to use for the CRT times"),
@@ -170,4 +176,4 @@ namespace crt
 }
 }
 
-#endif
+#endif