Merge branch 'feature/hlay_crt_taggers' into master625+632

Author: hgreenlee

sbncode/CAFMaker/CAFMaker_module.cc

@@ -1308,20 +1308,7 @@ template <class T, class U>
 art::FindOneP<T> CAFMaker::FindOnePStrictSingle(const U& from,
                                                 const art::Event& evt,
                                                 const art::InputTag& tag) const {
-  std::vector<U> vec = { from };
-
-  art::FindOneP<T> ret(vec, evt, tag);
-
-  if (!tag.label().empty() && !ret.isValid() && fParams.StrictMode()) {
-    std::cout << "CAFMaker: No Assn from '"
-              << cet::demangle_symbol(typeid(from).name()) << "' to '"
-              << cet::demangle_symbol(typeid(T).name())
-              << "' found under label '" << tag << "'. "
-              << "Set 'StrictMode: false' to continue anyway." << std::endl;
-    abort();
-  }
-
-  return ret;
+  return FindOnePStrict<T>(std::vector{ from }, evt, tag);
 }
 
 //......................................................................
@@ -1824,7 +1811,7 @@ void CAFMaker::produce(art::Event& evt) noexcept {
         for (unsigned i = 0; i < crtspacepoints.size(); i++) {
           srcrtspacepoints.emplace_back();
           const art::Ptr<sbnd::crt::CRTCluster> crtcluster = foCRTCluster.at(i);
-          FillCRTSpacePoint(crtspacepoints[i], crtcluster, srcrtspacepoints.back());
+          FillCRTSpacePoint(crtspacepoints[i], *crtcluster, srcrtspacepoints.back());
         }
       }
 
@@ -2548,10 +2535,10 @@ void CAFMaker::produce(art::Event& evt) noexcept {
 
             art::FindOneP<sbnd::crt::CRTCluster> foCRTCluster =
               FindOnePStrictSingle<sbnd::crt::CRTCluster>(crtspacepoint, evt, fParams.CRTSpacePointLabel());
-            const art::Ptr<sbnd::crt::CRTCluster> crtcluster = foCRTCluster.at(0);
+            const art::Ptr<sbnd::crt::CRTCluster>& crtcluster = foCRTCluster.at(0);
 
             if(crtspacepoint.isNonnull())
-              FillTrackCRTSpacePoint(foCRTSpacePointMatch.data(iPart).ref(), crtspacepoint, crtcluster, trk);
+              FillTrackCRTSpacePoint(foCRTSpacePointMatch.data(iPart).ref(), *crtspacepoint, *crtcluster, trk);
           }
         if(foSBNDCRTTrackMatch.isValid() && fDet == kSBND)
           {

sbncode/CAFMaker/FillReco.cxx

@@ -164,7 +164,7 @@ namespace caf
   }
 
   void FillCRTSpacePoint(const sbnd::crt::CRTSpacePoint &spacepoint,
-                         const art::Ptr<sbnd::crt::CRTCluster> &cluster,
+                         const sbnd::crt::CRTCluster &cluster,
                          caf::SRCRTSpacePoint &srspacepoint,
                          bool allowEmpty)
   {
@@ -174,8 +174,8 @@ namespace caf
     srspacepoint.time         = spacepoint.Ts0();
     srspacepoint.time_err     = spacepoint.Ts0Err();
     srspacepoint.complete     = spacepoint.Complete();
-    srspacepoint.nhits        = cluster->NHits();
-    srspacepoint.tagger       = cluster->Tagger();
+    srspacepoint.nhits        = cluster.NHits();
+    srspacepoint.tagger       = cluster.Tagger();
   }
 
   void FillSBNDCRTTrack(const sbnd::crt::CRTTrack &track,
@@ -816,15 +816,15 @@ namespace caf
   }
 
   void FillTrackCRTSpacePoint(const anab::T0 &t0match,
-                              const art::Ptr<sbnd::crt::CRTSpacePoint> &spacepointmatch,
-                              const art::Ptr<sbnd::crt::CRTCluster> &cluster,
+                              const sbnd::crt::CRTSpacePoint &spacepointmatch,
+                              const sbnd::crt::CRTCluster &cluster,
                               caf::SRTrack &srtrack,
                               bool allowEmpty)
   {
     srtrack.crtspacepoint.matched = true;
     srtrack.crtspacepoint.score   = t0match.fTriggerConfidence;
 
-    FillCRTSpacePoint(*spacepointmatch, cluster, srtrack.crtspacepoint.spacepoint);
+    FillCRTSpacePoint(spacepointmatch, cluster, srtrack.crtspacepoint.spacepoint);
   }
 
   void FillTrackSBNDCRTTrack(const anab::T0 &t0match,

sbncode/CAFMaker/FillReco.h

@@ -206,8 +206,8 @@ namespace caf
                        bool allowEmpty = false);
 
   void FillTrackCRTSpacePoint(const anab::T0 &t0match,
-                              const art::Ptr<sbnd::crt::CRTSpacePoint> &spacepointmatch,
-                              const art::Ptr<sbnd::crt::CRTCluster> &cluster,
+                              const sbnd::crt::CRTSpacePoint &spacepointmatch,
+                              const sbnd::crt::CRTCluster &cluster,
                               caf::SRTrack &srtrack,
                               bool allowEmpty = false);
 
@@ -279,7 +279,7 @@ namespace caf
                   bool allowEmpty = false);
 
   void FillCRTSpacePoint(const sbnd::crt::CRTSpacePoint &spacepoint,
-                         const art::Ptr<sbnd::crt::CRTCluster> &cluster,
+                         const sbnd::crt::CRTCluster &cluster,
                          caf::SRCRTSpacePoint &srspacepoint,
                          bool allowEmpty = false);