more shower vars

Author: rtriozzi

sbncode/CAFMaker/CAFMaker_module.cc

@@ -2127,7 +2127,7 @@ void CAFMaker::produce(art::Event& evt) noexcept {
       }
 
       if (ng2_filter_vec.size() > 0 || ng2_semantic_vec.size() > 0) {
-        FillSliceNuGraph(slcHits, ng2_filter_vec, ng2_semantic_vec, vtx_wire, vtx_tick, recslc);
+        FillSliceNuGraph(slcHits, ng2_filter_vec, ng2_semantic_vec, fmPFPartHits, vtx_wire, vtx_tick, recslc);
       }
     }
 

sbncode/CAFMaker/FillReco.cxx

@@ -583,12 +583,13 @@ namespace caf
   void FillSliceNuGraph(const std::vector<art::Ptr<recob::Hit>> &inputHits,
 			const std::vector<art::Ptr<anab::FeatureVector<1>>> &ngFilterResult,
 			const std::vector<art::Ptr<anab::FeatureVector<5>>> &ngSemanticResult,
+      const std::vector<std::vector<art::Ptr<recob::Hit>>> &fmPFPartHits,
       const float vtx_wire[3], 
       const float vtx_tick[3],
 			caf::SRSlice &slice)
   {
 
-    // nugraph filter fraction
+    // NuGraph2 filter fraction
     unsigned int nHits = inputHits.size();
     unsigned int npass = 0;
 
@@ -597,10 +598,20 @@ namespace caf
     }
     slice.ng_filt_pass_frac = float(npass)/nHits;
 
-    // nugraph HIP vertex tagging
+    // look-up between hits and PFPs
+    std::set<art::Ptr<recob::Hit>> pfpHitSet;
+    for (const auto& pfpHits : fmPFPartHits) {
+      for (const auto& hit : pfpHits) {
+        if (hit) pfpHitSet.insert(hit);
+      }
+    }
+
+    // NuGraph2 plane-by-plane slice variables
     for (unsigned int plane = 0; plane < 3; ++plane) {
 
-      int nHIPHits = 0;
+      int nHIPHits = 0;             ///< HIP tagging at interaction vertex
+      int nShrHits = 0;             ///< shower hits in the slice
+      int nUnclusteredShrHits = 0;  ///< shower hits in the slice not belonging to a PFP
 
       for ( unsigned int i = 0; i < nHits; i++ ) {
         const recob::Hit& hit = *inputHits.at(i);
@@ -613,18 +624,30 @@ namespace caf
           semVec.begin(), 
           std::max_element(semVec.begin(), semVec.end())
         );
-        if (highestScoreIdx != 1) continue; // look for HIP hits
 
+        // HIP tagging
         float dwire = std::abs(float(hit.WireID().Wire) - vtx_wire[plane]);
-        if (dwire > 10) continue; 
-
         float dtick = std::abs(hit.PeakTime() - vtx_tick[plane]);
-        if (dtick > 50) continue;
+        if ((highestScoreIdx == 1) && (dwire <= 10) && (dtick <= 50))
+          nHIPHits += 1;
 
-        nHIPHits += 1;
+        // shower hits
+        if (highestScoreIdx == 2) {
+
+          // all shower hits
+          nShrHits += 1;
+
+          // unclustered shower hits
+          art::Ptr<recob::Hit> hitPtr = inputHits.at(i);
+          if (pfpHitSet.find(hitPtr) == pfpHitSet.end()) {
+            nUnclusteredShrHits += 1;
+          }
+        }
       }
 
       slice.ng_plane[plane].ng_vtx_hip_hits = nHIPHits;
+      slice.ng_plane[plane].shr_hits = nShrHits;
+      slice.ng_plane[plane].unclustered_shr_hits = nUnclusteredShrHits;
     }
   }
 

sbncode/CAFMaker/FillReco.h

@@ -110,7 +110,8 @@ namespace caf
    * @brief Fills the results from NuGraph at slice level
    * @param inputHits (pointers to) the hits associated to the slice
    * @param ngFilterResult NuGraph filter result, for each hit
-   * @param ngSemanticResult NuGraph semnatic result, for each hit (MIP track, HIP, shower, Michel electron, diffuse activity)
+   * @param ngSemanticResult NuGraph semantic result, for each hit (MIP track, HIP, shower, Michel electron, diffuse activity)
+   * @param fmPFPartHits vector of pointers-to-hits lists, for each PFP
    * @param vtx_wire vertex coordinates projected onto wires, per plane
    * @param vtx_tick vertex coordinates projected onto ticks, per plane
    * @param[out] slice the destination slice object
@@ -120,6 +121,7 @@ namespace caf
   void FillSliceNuGraph(const std::vector<art::Ptr<recob::Hit>> &inputHits,
 			const std::vector<art::Ptr<anab::FeatureVector<1>>> &ngFilterResult,
 			const std::vector<art::Ptr<anab::FeatureVector<5>>> &ngSemanticResult,
+      const std::vector<std::vector<art::Ptr<recob::Hit>>> &fmPFPartHits,
       const float vtx_wire[3], 
       const float vtx_tick[3],
 			caf::SRSlice &slice);