Merge branch 'develop' into dbrailsf_reco2fclorg_rebased

Author: bear-is-asleep

sbndcode/TPC1DSignalProcessing/tools/TrackHitEfficiencyAnalysis_tool.cc

@@ -735,7 +735,7 @@ void TrackHitEfficiencyAnalysis::fillHistograms(const art::Event& event) const
 			    nElectronsTotalBest = 0.;
                             hitPeakTimeBest     = bestHit->PeakTime();
                             hitIntegralBest     = bestHit->Integral();
-                            hitSummedADCBest    = bestHit->SummedADC();
+                            hitSummedADCBest    = bestHit->ROISummedADC();
                             hitRMSBest          = bestHit->RMS();
                             hitMultiplicityBest = bestHit->Multiplicity();
                             hitLocalIndexBest   = bestHit->LocalIndex();
@@ -785,7 +785,7 @@ void TrackHitEfficiencyAnalysis::fillHistograms(const art::Event& event) const
                             unsigned short hitStopTick  = rejectedHit->PeakTime() + fSigmaVec[plane] * rejectedHit->RMS();
 
                             mf::LogDebug("TrackHitEfficiencyAnalysis") << "**> TPC: " << rejectedHit->WireID().TPC << ", Plane " << rejectedHit->WireID().Plane << ", wire: " << rejectedHit->WireID().Wire << ", hit startstop            tick: " << hitStartTick << "/" << hitStopTick << ", start/stop ticks: " << startTick << "/" << stopTick << std::endl;
-                            mf::LogDebug("TrackHitEfficiencyAnalysis") << "    TPC/Plane/Wire: " << wids[0].TPC << "/" << plane << "/" << wids[0].Wire << ", Track # hits: " << partToChanInfo.second.size() << ", # hits: "<<         hitIter->second.size() << ", # electrons: " << totalElectrons << ", pulse Height: " << rejectedHit->PeakAmplitude() << ", charge: " << rejectedHit->Integral()      << ", " <<rejectedHit->SummedADC() << std::endl;
+                            mf::LogDebug("TrackHitEfficiencyAnalysis") << "    TPC/Plane/Wire: " << wids[0].TPC << "/" << plane << "/" << wids[0].Wire << ", Track # hits: " << partToChanInfo.second.size() << ", # hits: "<<         hitIter->second.size() << ", # electrons: " << totalElectrons << ", pulse Height: " << rejectedHit->PeakAmplitude() << ", charge: " << rejectedHit->Integral()      << ", " <<rejectedHit->ROISummedADC() << std::endl;
                         }
                         else
                         {

sbndcode/gallery/galleryAnalysis/HitAnalysisAlg.cpp

@@ -247,7 +247,7 @@ void HitAnalysisAlg::fillHistograms(const HitVec& hitVec) const
         int                hitMult  = hit.Multiplicity();
         float              peakTime = hit.PeakTime();
         float              charge   = hit.Integral();
-        float              sumADC   = hit.SummedADC();
+        float              sumADC   = hit.ROISummedADC();
         float              hitPH    = std::min(hit.PeakAmplitude(),float(249.8));
         float              hitSigma = hit.RMS();