Merge pull request #500 from SBNSoftware/feature/hlay_crt_offline_misc

CRT Offline - Misc

Author: bear-is-asleep

sbndcode/CRT/CRTBackTracker/CRTBackTrackerAlg.cc

@@ -9,7 +9,7 @@ namespace sbnd::crt {
   }
 
   CRTBackTrackerAlg::CRTBackTrackerAlg(){}
-  
+
   CRTBackTrackerAlg::~CRTBackTrackerAlg(){}
 
   void CRTBackTrackerAlg::reconfigure(const Config& config)
@@ -21,6 +21,7 @@ namespace sbnd::crt {
     fClusterModuleLabel = config.ClusterModuleLabel();
     fSpacePointModuleLabel = config.SpacePointModuleLabel();
     fTrackModuleLabel = config.TrackModuleLabel();
+    fCRTGeoAlgConfig = config.GeoAlgConfig();
 
     return;
   }
@@ -38,6 +39,8 @@ namespace sbnd::crt {
     fTrackIDMotherMap.clear();
     fStripHitMCPMap.clear();
 
+    CRTGeoAlg geoAlg = CRTGeoAlg(fCRTGeoAlgConfig);
+
     art::Handle<std::vector<sim::ParticleAncestryMap>> droppedTrackIDMapVecHandle;
     event.getByLabel(fSimModuleLabel, droppedTrackIDMapVecHandle);
 
@@ -92,7 +95,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);
 
@@ -245,7 +248,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);
@@ -261,7 +264,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;
@@ -338,6 +341,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);
 
@@ -346,7 +351,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());
@@ -541,8 +546,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)
@@ -571,14 +578,15 @@ 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};
   }
 
   void CRTBackTrackerAlg::TrueParticlePDGEnergyTime(const int trackID, int &pdg, double &energy, double &time)
   {
+    art::ServiceHandle<cheat::ParticleInventoryService> particleInv;
     const simb::MCParticle* particle = particleInv->TrackIdToParticle_P(trackID);
 
     pdg    = particle == NULL ? -std::numeric_limits<int>::max()    : particle->PdgCode();

sbndcode/CRT/CRTBackTracker/CRTBackTrackerAlg.h

@@ -53,7 +53,7 @@ namespace sbnd::crt {
       using Name = fhicl::Name;
       using Comment = fhicl::Comment;
 
-      fhicl::Table<fhicl::ParameterSet> GeoAlgConfig {
+      fhicl::Table<CRTGeoAlg::Config> GeoAlgConfig {
         Name("CRTGeoAlg"),
 	  };
 
@@ -192,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);
@@ -232,8 +232,7 @@ namespace sbnd::crt {
 
   private:
 
-    CRTGeoAlg fCRTGeoAlg;
-    art::ServiceHandle<cheat::ParticleInventoryService> particleInv;
+    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