Updates from Mattia to allow only one definition of MaxMultiHitPerPlane and Chi2PerPlane

Author: Michael Carrigan

sbncode/HitFinder/GaussHitFinderSBN_module.cc

@@ -69,21 +69,33 @@ namespace hit {
     void beginJob(art::ProcessingFrame const&) override;
 
     std::vector<double> FillOutHitParameterVector(const std::vector<double>& input);
+    
+    template<class T>
+    inline std::vector<T> getValueOrListOf(fhicl::ParameterSet const& pset, std::string const& key) {
+
+      auto const& wireReadoutGeom = art::ServiceHandle<geo::WireReadout const>()->Get();
+      const unsigned int N_PLANES = wireReadoutGeom.Nplanes();
+
+      if (pset.is_key_to_sequence(key))
+        return pset.get<std::vector<T>>(key);
+      else
+        return std::vector<T>(N_PLANES, pset.get<T>(key));
+    } // getValueOrListOf()
 
     const bool fFilterHits;
     const bool fFillHists;
 
     const std::string fCalDataModuleLabel;
     const std::string fAllHitsInstanceName;
 
-    const std::vector<int> fLongMaxHitsVec;    ///<Maximum number hits on a really long pulse train
-    const std::vector<int> fLongPulseWidthVec; ///<Sets width of hits used to describe long pulses
+    const std::vector<int> fLongMaxHitsVec;     ///< Maximum number hits on a really long pulse train
+    const std::vector<int> fLongPulseWidthVec;  ///< Sets width of hits used to describe long pulses
 
-    const std::vector<size_t> fMaxMultiHit; ///<maximum hits for multi fit
-    const int fAreaMethod;     ///<Type of area calculation
+    const std::vector<size_t> fMaxMultiHit;     ///< Maximum hits for multi fit
+    const int fAreaMethod;                      ///< Type of area calculation
     const std::vector<double>
-      fAreaNormsVec;       ///<factors for converting area to same units as peak height
-    const std::vector<double> fChi2NDF; ///maximum Chisquared / NDF allowed for a hit to be saved
+      fAreaNormsVec;                            ///< Factors for converting area to same units as peak height
+    const std::vector<double> fChi2NDF;         ///< Maximum Chisquared / NDF allowed for a hit to be saved
 
     const std::vector<float> fPulseHeightCuts;
     const std::vector<float> fPulseWidthCuts;
@@ -116,17 +128,18 @@ namespace hit {
     , fLongMaxHitsVec(pset.get<std::vector<int>>("LongMaxHits", std::vector<int>() = {25, 25, 25}))
     , fLongPulseWidthVec(
         pset.get<std::vector<int>>("LongPulseWidth", std::vector<int>() = {16, 16, 16}))
-    , fMaxMultiHit(pset.get<std::vector<size_t>>("MaxMultiHitPerPlane", std::vector<size_t>() = {5, 5, 5}))
+    , fMaxMultiHit(getValueOrListOf<size_t>(pset, "MaxMultiHit"))
     , fAreaMethod(pset.get<int>("AreaMethod"))
     , fAreaNormsVec(FillOutHitParameterVector(pset.get<std::vector<double>>("AreaNorms")))
-    , fChi2NDF(pset.get<std::vector<double>>("Chi2NDFPerPlane", std::vector<double>() = {500.0, 500.0, 500.0}))
+    , fChi2NDF(getValueOrListOf<double>(pset, "Chi2NDF"))
     , fPulseHeightCuts(
         pset.get<std::vector<float>>("PulseHeightCuts", std::vector<float>() = {3.0, 3.0, 3.0}))
     , fPulseWidthCuts(
         pset.get<std::vector<float>>("PulseWidthCuts", std::vector<float>() = {2.0, 1.5, 1.0}))
     , fPulseRatioCuts(
         pset.get<std::vector<float>>("PulseRatioCuts", std::vector<float>() = {0.35, 0.40, 0.20}))
   {
+
     if (fFillHists && art::Globals::instance()->nthreads() > 1u) {
       throw art::Exception(art::errors::Configuration)
         << "Cannot fill histograms when multiple threads configured, please set fFillHists to "

sbncode/HitFinder/hitfindermodules_sbn.fcl

@@ -12,15 +12,13 @@ gauss_hitfinder:
     module_type:          "GaussHitFinderSBN"
     CalDataModuleLabel:   "caldata"
     MaxMultiHit:          5                       # maximum hits for multi gaussian fit attempt
-    MaxMultiHitPerPlane:  [ 10, 10, 8 ]           # maximum hits per plane for multi gaussia fit attempt
     AreaMethod:           0                       # 0 = area by integral, 1 = area by gaussian area formula
     AreaNorms:            [ 1.0, 1.0, 1.0 ]       # normalizations that put signal area in
                                                   # same scale as peak height.
     TryNplus1Fits:        false                   # Don't try to refit with extra peak if bad chisq
     LongMaxHits:          [ 25, 25, 25]           # max number hits in long pulse trains
     LongPulseWidth:       [ 5, 5, 5]              # max widths for hits in long pulse trains
     Chi2NDF:              500.                    # maximum Chisquared / NDF allowed to store fit
-    Chi2NDFPerPlane:      [ 2500., 1750., 2500.]  # maximum Chisquared / NDF allowed per plane to store, if fail
                                                   # will use "long" pulse method to return hit
     AllHitsInstanceName:  ""                      # If non-null then this will be the instance name of all hits output to event
                                                   # in this case there will be two hit collections, one filtered and one containing all hits