Merge pull request #653 from SBNSoftware/develop

v10_04_01_01 sync

Author: bear-is-asleep

sbndcode/Decoders/TPC/SBNDTPCDecoder.h

@@ -94,9 +94,6 @@ class daq::SBNDTPCDecoder : public art::EDProducer {
   Config _config;
 
   void getMedianSigma(const std::vector<int16_t> &v_adc, float &median, float &sigma);
-  float getEvenFraction(const std::vector<int16_t> &v_adc) const;
-  float getxBADFraction(const std::vector<int16_t> &v_adc) const;
-
 
 };
 

sbndcode/Decoders/TPC/SBNDTPCDecoder_module.cc

@@ -34,7 +34,6 @@
 #include "sbndaq-artdaq-core/Overlays/SBND/NevisTPCFragment.hh"
 #include "sbndaq-artdaq-core/Overlays/SBND/NevisTPC/NevisTPCTypes.hh"
 #include "sbndaq-artdaq-core/Overlays/SBND/NevisTPC/NevisTPCUtilities.hh"
-#include "sbnobj/Common/Analysis/TPCChannelInfo.hh"
 
 
 DEFINE_ART_MODULE(daq::SBNDTPCDecoder)
@@ -78,7 +77,6 @@ daq::SBNDTPCDecoder::SBNDTPCDecoder(fhicl::ParameterSet const & param):
   produces<RawDigits>();
   produces<RDTimeStamps>();
   produces<RDTsAssocs>();
-  produces<std::vector<anab::TPCChannelInfo>>();
   if (_config.produce_header) {
     produces<std::vector<tpcAnalysis::TPCDecodeAna>>();
   }
@@ -115,7 +113,6 @@ void daq::SBNDTPCDecoder::produce(art::Event & event)
   std::unique_ptr<RawDigits> rawdigit_collection(new RawDigits);
   std::unique_ptr<RDTimeStamps> rdts_collection(new RDTimeStamps);
   std::unique_ptr<RDTsAssocs> rdtsassoc_collection(new RDTsAssocs);
-  std::unique_ptr<std::vector<anab::TPCChannelInfo>> channeldata_collection(new std::vector<anab::TPCChannelInfo>);
   std::unique_ptr<std::vector<tpcAnalysis::TPCDecodeAna>> header_collection(new std::vector<tpcAnalysis::TPCDecodeAna>);
 
   if ( daq_handle.isValid() ) {
@@ -128,16 +125,10 @@ void daq::SBNDTPCDecoder::produce(art::Event & event)
       mf::LogWarning("SBNDTPCDecoder_module") <<  " Invalid fragment handle: Skipping TPC digit decoding";
     }
 
-  for (const raw::RawDigit &r: *rawdigit_collection) {
-    anab::TPCChannelInfo i {r.Channel(), r.GetPedestal(), r.GetSigma(), getEvenFraction(r.ADCs()), getxBADFraction(r.ADCs())};
-    channeldata_collection->push_back(i);
-  }
-
 
   event.put(std::move(rawdigit_collection));
   event.put(std::move(rdts_collection));
   event.put(std::move(rdtsassoc_collection));
-  event.put(std::move(channeldata_collection));
 
   if (_config.produce_header) {
     event.put(std::move(header_collection));
@@ -228,23 +219,6 @@ uint32_t daq::SBNDTPCDecoder::compute_checksum(sbndaq::NevisTPCFragment &fragmen
 
 }
 
-float daq::SBNDTPCDecoder::getxBADFraction(const std::vector<int16_t> &v_adc) const {
-  int n_bad = 0;
-  for (int16_t s: v_adc) {
-    if (s == 0xBAD) n_bad += 1;
-  }
-  return ((float)n_bad) / v_adc.size();
-  
-}
-
-float daq::SBNDTPCDecoder::getEvenFraction(const std::vector<int16_t> &v_adc) const {
-  int n_even = 0;
-  for (int16_t s: v_adc) {
-    if (s % 2 == 0) n_even += 1;
-  }
-  return ((float)n_even) / v_adc.size();
-  
-}
 
 
 void daq::SBNDTPCDecoder::getMedianSigma(const std::vector<int16_t> &v_adc, float &median,