move HIP tagging params to fcl

Author: rtriozzi

sbncode/CAFMaker/CAFMakerParams.h

@@ -373,6 +373,18 @@ namespace caf
       Comment("Whether to use the second pass Pandora outputs for NuGraph reco."),
       false
     };
+    
+    Atom<float> NuGraphHIPTagWireDist {
+      Name("NuGraphHIPTagWireDist"),
+      Comment("TPC wire distance from the vertex used to count NuGraph2–tagged HIP hits."),
+      10
+    };
+
+    Atom<float> NuGraphHIPTagTickDist {
+      Name("NuGraphHIPTagTickDist"),
+      Comment("TPC tick distance from the vertex used to count NuGraph-2–tagged HIP hits."),
+      50
+    };
 
     Atom<string> OpFlashLabel {
       Name("OpFlashLabel"),

sbncode/CAFMaker/CAFMaker_module.cc

@@ -2127,7 +2127,9 @@ 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, fmPFPartHits, vtx_wire, vtx_tick, recslc);
+        FillSliceNuGraph(slcHits, ng2_filter_vec, ng2_semantic_vec, fmPFPartHits, 
+                         vtx_wire, vtx_tick, fParams.NuGraphHIPTagWireDist(), fParams.NuGraphHIPTagTickDist(), 
+                         recslc);
       }
     }
 

sbncode/CAFMaker/FillReco.cxx

@@ -586,6 +586,8 @@ namespace caf
       const std::vector<std::vector<art::Ptr<recob::Hit>>> &fmPFPartHits,
       const float vtx_wire[3], 
       const float vtx_tick[3],
+      const float vtx_wire_dist, 
+      const float vtx_tick_dist,
 			caf::SRSlice &slice)
   {
 
@@ -628,7 +630,7 @@ namespace caf
         // HIP tagging
         float dwire = std::abs(float(hit.WireID().Wire) - vtx_wire[plane]);
         float dtick = std::abs(hit.PeakTime() - vtx_tick[plane]);
-        if ((highestScoreIdx == 1) && (dwire <= 10) && (dtick <= 50))
+        if ((highestScoreIdx == 1) && (dwire <= vtx_wire_dist) && (dtick <= vtx_tick_dist))
           nHIPHits += 1;
 
         // shower hits

sbncode/CAFMaker/FillReco.h

@@ -114,17 +114,21 @@ namespace caf
    * @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 vtx_wire_dist TPC wire distance from the vertex used to count NuGraph2–tagged HIP hits
+   * @param vtx_tick_dist TPC tick distance from the vertex used to count NuGraph2–tagged HIP hits
    * @param[out] slice the destination slice object
    *
    * Hits with filter value (`ngFilterResult`) lower than `ng_filter_cut` are counted as background.
    */
   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);
+                        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],
+                        const float vtx_wire_dist, 
+                        const float vtx_tick_dist,
+                        caf::SRSlice &slice);
 
   bool SelectSlice(const caf::SRSlice &slice, bool cut_clear_cosmic);