Allow for different thresholds for OpHitFinder

CMakeLists.txt

@@ -11,6 +11,7 @@ cmake_minimum_required(VERSION 3.20 FATAL_ERROR)
 find_package(cetmodules 3.12.00 REQUIRED)
 project(larana VERSION 10.00.06 LANGUAGES CXX)
 
+
 # cetbuildtools contains our cmake modules
 
 include(CetCMakeEnv)

larana/OpticalDetector/OpHitFinder/AlgoCFD.cxx

@@ -31,6 +31,8 @@ namespace pmtana {
     _D = pset.get<int>("Delay");
 
     //_number_presample = pset.get<int>   ("BaselinePreSample");
+    _peak_thresh_by_channel = pset.get<bool>("ThreshByChannel", false);
+    _peak_thresh_vector = pset.get<std::vector<double>>("PeakThreshVector", {});
     _peak_thresh = pset.get<double>("PeakThresh");
     _start_thresh = pset.get<double>("StartThresh");
     _end_thresh = pset.get<double>("EndThresh");
@@ -48,14 +50,22 @@ namespace pmtana {
   }
 
   //***************************************************************
-  bool AlgoCFD::RecoPulse(const pmtana::Waveform_t& wf,
+  bool AlgoCFD::RecoPulse(const raw::OpDetWaveform& wf,
                           const pmtana::PedestalMean_t& mean_v,
                           const pmtana::PedestalSigma_t& sigma_v)
   //***************************************************************
   {
 
     Reset();
 
+    if (_peak_thresh_by_channel) {
+      uint ChannelNumber = wf.ChannelNumber();
+      if (ChannelNumber >= _peak_thresh_vector.size())
+        throw cet::exception("OpHitFinder")
+          << "Threshold not found for channel " << ChannelNumber << "\n";
+      _peak_thresh = _peak_thresh_vector[ChannelNumber];
+    }
+
     std::vector<double> cfd;
     cfd.reserve(wf.size());
 

larana/OpticalDetector/OpHitFinder/AlgoCFD.h

@@ -50,7 +50,7 @@ namespace pmtana {
 
   protected:
     /// Implementation of AlgoCFD::reco() method
-    bool RecoPulse(const pmtana::Waveform_t&,
+    bool RecoPulse(const raw::OpDetWaveform&,
                    const pmtana::PedestalMean_t&,
                    const pmtana::PedestalSigma_t&);
 
@@ -64,6 +64,10 @@ namespace pmtana {
     double _peak_thresh;
     double _start_thresh;
     double _end_thresh;
+    //Whether to apply an individual threshold for each channel
+    bool _peak_thresh_by_channel;
+    //Vector of thresholds for each channel
+    std::vector<double> _peak_thresh_vector;
   };
 
 }

larana/OpticalDetector/OpHitFinder/AlgoFixedWindow.cxx

@@ -49,7 +49,7 @@ namespace pmtana {
   }
 
   //***************************************************************
-  bool AlgoFixedWindow::RecoPulse(const Waveform_t& wf,
+  bool AlgoFixedWindow::RecoPulse(const raw::OpDetWaveform& wf,
                                   const PedestalMean_t& mean_v,
                                   const PedestalSigma_t& sigma_v)
   //***************************************************************

larana/OpticalDetector/OpHitFinder/AlgoFixedWindow.h

@@ -52,7 +52,7 @@ namespace pmtana {
 
   protected:
     /// Implementation of AlgoFixedWindow::reco() method
-    bool RecoPulse(const pmtana::Waveform_t&,
+    bool RecoPulse(const raw::OpDetWaveform&,
                    const pmtana::PedestalMean_t&,
                    const pmtana::PedestalSigma_t&);
 

larana/OpticalDetector/OpHitFinder/AlgoSiPM.cxx

@@ -14,7 +14,8 @@ namespace pmtana {
                      const std::string name)
     : PMTPulseRecoBase(name)
   {
-
+    _adc_thres_by_channel = pset.get<bool>("ADCThresholdByChannel", false);
+    _adc_thres_vector = pset.get<std::vector<float>>("ADCThresVector", {});
     _adc_thres = pset.get<float>("ADCThreshold");
     _min_width = pset.get<float>("MinWidth");
     _2nd_thres = pset.get<float>("SecondThreshold");
@@ -34,7 +35,7 @@ namespace pmtana {
   }
 
   //---------------------------------------------------------------------------
-  bool AlgoSiPM::RecoPulse(const pmtana::Waveform_t& wf,
+  bool AlgoSiPM::RecoPulse(const raw::OpDetWaveform& wf,
                            const pmtana::PedestalMean_t& ped_mean,
                            const pmtana::PedestalSigma_t& ped_rms)
   {
@@ -49,6 +50,14 @@ namespace pmtana {
       ped_mean
         .front(); //Switch pedestal definition to incoroprate pedestal finder - K.S. 04/18/2019
 
+    if (_adc_thres_by_channel) {
+      uint ChannelNumber = wf.ChannelNumber();
+      if (ChannelNumber >= _adc_thres_vector.size())
+        throw cet::exception("OpHitFinder")
+          << "ADC Threshold not found for channel " << ChannelNumber << "\n";
+      _adc_thres = _adc_thres_vector[ChannelNumber];
+    }
+
     double threshold = _adc_thres;
     threshold += pedestal;
     double pre_threshold = _2nd_thres;

larana/OpticalDetector/OpHitFinder/AlgoSiPM.h

@@ -39,10 +39,13 @@ namespace pmtana {
     //      void SetNSigma(double v) {_nsigma = v;};
 
   protected:
-    bool RecoPulse(const pmtana::Waveform_t&,
+    bool RecoPulse(const raw::OpDetWaveform&,
                    const pmtana::PedestalMean_t&,
                    const pmtana::PedestalSigma_t&);
 
+    //Whether to apply an individual threshold for each channel
+    bool _adc_thres_by_channel;
+
     // A variable holder for a user-defined absolute ADC threshold value
     double _adc_thres;
 
@@ -55,6 +58,9 @@ namespace pmtana {
     // Use this pedestal instead of the one given by the pedestal algorithm
     double _pedestal;
 
+    // Vector of ADCThreshold to be used for each channel
+    std::vector<float> _adc_thres_vector;
+
     // A variable holder for a multiplicative factor for the pedestal
     // standard deviation to define the threshold
     //      double _nsigma;

larana/OpticalDetector/OpHitFinder/AlgoSlidingWindow.cxx

@@ -26,6 +26,10 @@ namespace pmtana {
   {
     _positive = pset.get<bool>("PositivePolarity", true);
 
+    _adc_thres_by_channel = pset.get<bool>("ADCThresholdByChannel", false);
+
+    _adc_thres_vector = pset.get<std::vector<float>>("ADCThresVector", {});
+
     _adc_thres = pset.get<float>("ADCThreshold");
 
     _tail_adc_thres = pset.get<float>("TailADCThreshold", _adc_thres);
@@ -59,7 +63,7 @@ namespace pmtana {
   }
 
   //***************************************************************
-  bool AlgoSlidingWindow::RecoPulse(const pmtana::Waveform_t& wf,
+  bool AlgoSlidingWindow::RecoPulse(const raw::OpDetWaveform& wf,
                                     const pmtana::PedestalMean_t& mean_v,
                                     const pmtana::PedestalSigma_t& sigma_v)
   //***************************************************************
@@ -87,6 +91,17 @@ namespace pmtana {
 
     Reset();
 
+    if (_adc_thres_by_channel) {
+      uint ChannelNumber = wf.ChannelNumber();
+      if (ChannelNumber >= _adc_thres_vector.size())
+        throw cet::exception("OpHitFinder")
+          << "ADC Threshold not found for channel " << ChannelNumber << "\n";
+      _adc_thres = _adc_thres_vector[ChannelNumber];
+    }
+
+    std::cout << " The channel number is " << wf.ChannelNumber() << " and the adc threshold is "
+              << _adc_thres << std::endl;
+
     for (size_t i = 0; i < wf.size(); ++i) {
 
       double value = 0.;
@@ -298,4 +313,4 @@ namespace pmtana {
     return true;
   }
 
-}
+}

larana/OpticalDetector/OpHitFinder/AlgoSlidingWindow.h

@@ -21,6 +21,7 @@ namespace fhicl {
 }
 
 #include "larana/OpticalDetector/OpHitFinder/OpticalRecoTypes.h"
+#include "lardataobj/RawData/OpDetWaveform.h"
 
 #include <string>
 
@@ -47,13 +48,16 @@ namespace pmtana {
 
   protected:
     /// Implementation of AlgoSlidingWindow::reco() method
-    bool RecoPulse(const pmtana::Waveform_t&,
+    bool RecoPulse(const raw::OpDetWaveform&,
                    const pmtana::PedestalMean_t&,
                    const pmtana::PedestalSigma_t&);
 
     /// A boolean to set waveform positive/negative polarity
     bool _positive;
 
+    //Whether to apply an individual threshold for each channel
+    bool _adc_thres_by_channel;
+
     /// A variable holder for a user-defined absolute ADC threshold value
     float _adc_thres, _tail_adc_thres, _end_adc_thres;
 
@@ -64,9 +68,12 @@ namespace pmtana {
     float _nsigma, _tail_nsigma, _end_nsigma;
     bool _verbose;
     size_t _num_presample, _num_postsample;
+
+    // Vector of ADCThreshold to be used for each channel
+    std::vector<float> _adc_thres_vector;
   };
 
 }
 #endif
 
-/** @} */ // end of doxygen group
+/** @} */ // end of doxygen group

larana/OpticalDetector/OpHitFinder/AlgoThreshold.cxx

@@ -49,7 +49,7 @@ namespace pmtana {
   }
 
   //***************************************************************
-  bool AlgoThreshold::RecoPulse(const Waveform_t& wf,
+  bool AlgoThreshold::RecoPulse(const raw::OpDetWaveform& wf,
                                 const PedestalMean_t& mean_v,
                                 const PedestalSigma_t& sigma_v)
   //***************************************************************

larana/OpticalDetector/OpHitFinder/AlgoThreshold.h

@@ -50,7 +50,7 @@ namespace pmtana {
 
   protected:
     /// Implementation of AlgoThreshold::reco() method
-    bool RecoPulse(const pmtana::Waveform_t& wf,
+    bool RecoPulse(const raw::OpDetWaveform& wf,
                    const pmtana::PedestalMean_t& mean_v,
                    const pmtana::PedestalSigma_t& sigma_v);
 

larana/OpticalDetector/OpHitFinder/PMTPulseRecoBase.cxx

@@ -33,7 +33,7 @@ namespace pmtana {
   }
 
   //******************************************************************
-  bool PMTPulseRecoBase::Reconstruct(const Waveform_t& wf,
+  bool PMTPulseRecoBase::Reconstruct(const raw::OpDetWaveform& wf,
                                      const PedestalMean_t& mean_v,
                                      const PedestalSigma_t& sigma_v)
   //******************************************************************

larana/OpticalDetector/OpHitFinder/PMTPulseRecoBase.h

@@ -21,6 +21,7 @@
 
 #include "OpticalRecoTypes.h"
 #include "larana/OpticalDetector/OpHitFinder/RiseTimeTools/RiseTimeCalculatorBase.h"
+#include "lardataobj/RawData/OpDetWaveform.h"
 
 #include <memory>
 
@@ -84,7 +85,7 @@ namespace pmtana {
     /** A core method: this executes the algorithm and stores reconstructed parameters
       in the pulse_param struct object.
     */
-    bool Reconstruct(const pmtana::Waveform_t&,
+    bool Reconstruct(const raw::OpDetWaveform&,
                      const pmtana::PedestalMean_t&,
                      const pmtana::PedestalSigma_t&);
 
@@ -108,7 +109,7 @@ namespace pmtana {
     bool _status;
 
   protected:
-    virtual bool RecoPulse(const pmtana::Waveform_t&,
+    virtual bool RecoPulse(const raw::OpDetWaveform&,
                            const pmtana::PedestalMean_t&,
                            const pmtana::PedestalSigma_t&) = 0;
 

larana/OpticalDetector/OpHitFinder/PulseRecoManager.cxx

@@ -38,7 +38,7 @@ namespace pmtana {
   }
 
   //**********************************************************************
-  bool PulseRecoManager::Reconstruct(const pmtana::Waveform_t& wf) const
+  bool PulseRecoManager::Reconstruct(const raw::OpDetWaveform& wf) const
   //**********************************************************************
   {
     if (_reco_algo_v.empty() && !_ped_algo)

larana/OpticalDetector/OpHitFinder/PulseRecoManager.h

@@ -16,6 +16,7 @@
 #define PULSERECOMANAGER_H
 
 #include "larana/OpticalDetector/OpHitFinder/OpticalRecoTypes.h"
+#include "lardataobj/RawData/OpDetWaveform.h"
 
 #include <vector>
 
@@ -37,7 +38,7 @@ namespace pmtana {
     PulseRecoManager();
 
     /// Implementation of ana_base::analyze method
-    bool Reconstruct(const pmtana::Waveform_t&) const;
+    bool Reconstruct(const raw::OpDetWaveform&) const;
 
     /// A method to set pulse reconstruction algorithm
     void AddRecoAlgo(pmtana::PMTPulseRecoBase* algo, PMTPedestalBase* ped_algo = nullptr);