diff --git a/RecoLocalTracker/SiStripZeroSuppression/plugins/SiStripBaselineComparator.cc b/RecoLocalTracker/SiStripZeroSuppression/plugins/SiStripBaselineComparator.cc index a1a8e454864df..ca5d7b01d0f3e 100644 --- a/RecoLocalTracker/SiStripZeroSuppression/plugins/SiStripBaselineComparator.cc +++ b/RecoLocalTracker/SiStripZeroSuppression/plugins/SiStripBaselineComparator.cc @@ -39,36 +39,14 @@ #include "DataFormats/SiStripCluster/interface/SiStripCluster.h" #include "DataFormats/SiStripCluster/interface/SiStripClusterCollection.h" -#include "CondFormats/SiStripObjects/interface/SiStripPedestals.h" -#include "CondFormats/DataRecord/interface/SiStripPedestalsRcd.h" - -#include "RecoLocalTracker/SiStripZeroSuppression/interface/SiStripPedestalsSubtractor.h" -#include "RecoLocalTracker/SiStripZeroSuppression/interface/SiStripCommonModeNoiseSubtractor.h" -#include "RecoLocalTracker/SiStripZeroSuppression/interface/SiStripRawProcessingFactory.h" - #include "FWCore/ServiceRegistry/interface/Service.h" #include "CommonTools/UtilAlgos/interface/TFileService.h" #include "CommonTools/Utils/interface/TFileDirectory.h" -#include "DataFormats/Provenance/interface/RunLumiEventNumber.h" //ROOT inclusion -#include "TROOT.h" -#include "TFile.h" -#include "TNtuple.h" -#include "TMath.h" -#include "TCanvas.h" #include "TH1F.h" -#include "TH1I.h" -#include "TH2F.h" #include "TProfile.h" -#include "TList.h" -#include "TString.h" -#include "TStyle.h" -#include "TGraph.h" -#include "TMultiGraph.h" -#include "THStack.h" -#include // // class decleration diff --git a/RecoLocalTracker/SiStripZeroSuppression/plugins/SiStripHybridFormatAnalyzer.cc b/RecoLocalTracker/SiStripZeroSuppression/plugins/SiStripHybridFormatAnalyzer.cc index 065d10987cdf4..c30a43e6beb3d 100644 --- a/RecoLocalTracker/SiStripZeroSuppression/plugins/SiStripHybridFormatAnalyzer.cc +++ b/RecoLocalTracker/SiStripZeroSuppression/plugins/SiStripHybridFormatAnalyzer.cc @@ -42,10 +42,6 @@ #include "CondFormats/SiStripObjects/interface/SiStripPedestals.h" #include "CondFormats/DataRecord/interface/SiStripPedestalsRcd.h" -#include "RecoLocalTracker/SiStripZeroSuppression/interface/SiStripPedestalsSubtractor.h" -#include "RecoLocalTracker/SiStripZeroSuppression/interface/SiStripCommonModeNoiseSubtractor.h" -#include "RecoLocalTracker/SiStripZeroSuppression/interface/SiStripRawProcessingFactory.h" - #include "FWCore/ServiceRegistry/interface/Service.h" #include "CommonTools/UtilAlgos/interface/TFileService.h" #include "CommonTools/Utils/interface/TFileDirectory.h" @@ -53,20 +49,7 @@ #include "DataFormats/Provenance/interface/RunLumiEventNumber.h" //ROOT inclusion -#include "TROOT.h" -#include "TFile.h" -#include "TNtuple.h" -#include "TMath.h" -#include "TCanvas.h" #include "TH1F.h" -#include "TH2F.h" -#include "TProfile.h" -#include "TList.h" -#include "TString.h" -#include "TStyle.h" -#include "TGraph.h" -#include "TMultiGraph.h" -#include "THStack.h" // diff --git a/RecoLocalTracker/SiStripZeroSuppression/plugins/SiStripMergeZeroSuppression.cc b/RecoLocalTracker/SiStripZeroSuppression/plugins/SiStripMergeZeroSuppression.cc index 5bae8792edaff..736223b2d3595 100644 --- a/RecoLocalTracker/SiStripZeroSuppression/plugins/SiStripMergeZeroSuppression.cc +++ b/RecoLocalTracker/SiStripZeroSuppression/plugins/SiStripMergeZeroSuppression.cc @@ -3,6 +3,7 @@ #include "FWCore/Framework/interface/Event.h" #include "FWCore/Framework/interface/EventSetup.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" +#include "FWCore/MessageLogger/interface/MessageLogger.h" #include "DataFormats/Common/interface/Handle.h" #include "DataFormats/Common/interface/DetSetVector.h" #include "DataFormats/SiStripDigi/interface/SiStripDigi.h" @@ -35,17 +36,17 @@ SiStripMergeZeroSuppression::SiStripMergeZeroSuppression(const edm::ParameterSet void SiStripMergeZeroSuppression::produce(edm::Event& event, const edm::EventSetup& /*eventSetup*/) { - std::cout<< "starting Merging" << std::endl; + LogTrace("SiStripMergeZeroSuppression::produce") << "Starting merging " << "\n"; edm::Handle> inputdigi; edm::Handle> inputraw; event.getByToken(m_rawDigisToMerge, inputdigi); event.getByToken(m_zsDigisToMerge, inputraw); - std::cout << inputdigi->size() << " " << inputraw->size() << std::endl; + LogTrace("SiStripMergeZeroSuppression::produce") << inputdigi->size() << " " << inputraw->size() << "\n"; if ( ! inputraw->empty() ) { std::vector> outputdigi(inputdigi->begin(), inputdigi->end()); - std::cout << "looping over the raw data collection" << std::endl; + LogTrace("SiStripMergeZeroSuppression::produce") << "Looping over the raw data collection " << "\n"; for ( const auto& rawDigis : *inputraw ) { edm::DetSet::const_iterator itRawDigis = rawDigis.begin(); uint16_t nAPV = rawDigis.size()/128; @@ -62,12 +63,12 @@ void SiStripMergeZeroSuppression::produce(edm::Event& event, const edm::EventSet } if ( isModuleRestored ) { - std::cout << "apply the ZS to the raw data collection" << std::endl; + LogTrace("SiStripMergeZeroSuppression::produce") << "Apply the ZS to the raw data collection " << "\n"; edm::DetSet suppressedDigis(rawDetId); m_algorithms->suppressVirginRawData(rawDigis, suppressedDigis); if ( ! suppressedDigis.empty() ) { - std::cout << "looking for the detId with the new ZS in the collection of the zero suppressed data" << std::endl; + LogTrace("SiStripMergeZeroSuppression::produce") << "Looking for the detId with the new ZS in the collection of the zero suppressed data" << "\n"; bool isModuleInZscollection = false; uint32_t zsDetId{0}; auto zsModule = std::lower_bound(std::begin(outputdigi), std::end(outputdigi), rawDetId, @@ -76,8 +77,8 @@ void SiStripMergeZeroSuppression::produce(edm::Event& event, const edm::EventSet isModuleInZscollection = true; zsDetId = zsModule->id; } - std::cout << "after the look " << rawDetId << " ==== " << zsDetId << std::endl; - std::cout << "exiting looking for the detId with the new ZS in the collection of the zero suppressed data" << std::endl; + LogTrace("SiStripMergeZeroSuppression::produce") << "After the look " << rawDetId << " ==== " << zsDetId << "\n"; + LogTrace("SiStripMergeZeroSuppression::produce") << "Exiting looking for the detId with the new ZS in the collection of the zero suppressed data" << "\n"; //creating the map containing the digis (in rawdigi format) merged std::vector mergedRawDigis(size_t(nAPV*128),0); @@ -85,47 +86,47 @@ void SiStripMergeZeroSuppression::produce(edm::Event& event, const edm::EventSet uint32_t count=0; // to be removed... edm::DetSet newDigiToIndert(rawDetId); if ( ! isModuleInZscollection ) { - std::cout << "WE HAVE A PROBLEM, THE MODULE IS NTOT FOUND" << std::endl; + LogTrace("SiStripMergeZeroSuppression::produce") << "WE HAVE A PROBLEM, THE MODULE IS NTOT FOUND" << "\n"; zsModule = outputdigi.insert(zsModule, newDigiToIndert); - std::cout << "new module id -1 " << (zsModule-1)->id << std::endl; - std::cout << "new module id " << zsModule->id << std::endl; - std::cout << "new module id +1 " << (zsModule+1)->id << std::endl; + LogTrace("SiStripMergeZeroSuppression::produce") << "new module id -1 " << (zsModule-1)->id << "\n"; + LogTrace("SiStripMergeZeroSuppression::produce") << "new module id " << zsModule->id << "\n"; + LogTrace("SiStripMergeZeroSuppression::produce") << "new module id +1 " << (zsModule+1)->id << "\n"; } else { - std::cout << "inserting only the digis for not restored APVs" << std::endl; - std::cout << "size : " << zsModule->size() << std::endl; + LogTrace("SiStripMergeZeroSuppression::produce") << "inserting only the digis for not restored APVs" << "\n"; + LogTrace("SiStripMergeZeroSuppression::produce") << "size : " << zsModule->size() << "\n"; for ( const auto itZsMod : *zsModule ) { const uint16_t adc = itZsMod.adc(); const uint16_t strip = itZsMod.strip(); if ( ! restoredAPV[strip/128] ) { mergedRawDigis[strip] = adc; ++count; - std::cout << "original count: "<< count << " strip: " << strip << " adc: " << adc << std::endl; + LogTrace("SiStripMergeZeroSuppression::produce") << "original count: "<< count << " strip: " << strip << " adc: " << adc << "\n"; } } } - std::cout << "size of digis to keep: " << count << std::endl; - std::cout << "inserting only the digis for the restored APVs" << std::endl; - std::cout << "size : " << suppressedDigis.size() << std::endl; + LogTrace("SiStripMergeZeroSuppression::produce") << "size of digis to keep: " << count << "\n"; + LogTrace("SiStripMergeZeroSuppression::produce") << "inserting only the digis for the restored APVs" << "\n"; + LogTrace("SiStripMergeZeroSuppression::produce") << "size : " << suppressedDigis.size() << "\n"; for ( const auto itSuppDigi : suppressedDigis ) { const uint16_t adc = itSuppDigi.adc(); const uint16_t strip = itSuppDigi.strip(); if ( restoredAPV[strip/128] ) { mergedRawDigis[strip] = adc; - std::cout << "new suppressed strip: " << strip << " adc: " << adc << std::endl; + LogTrace("SiStripMergeZeroSuppression::produce") << "new suppressed strip: " << strip << " adc: " << adc << "\n"; } } - std::cout << "suppressing the raw digis" << std::endl; + LogTrace("SiStripMergeZeroSuppression::produce") << "suppressing the raw digis" << "\n"; zsModule->clear(); for ( uint16_t strip=0; strip < mergedRawDigis.size(); ++strip ) { uint16_t adc = mergedRawDigis[strip]; if (adc) zsModule->push_back(SiStripDigi(strip, adc)); } - std::cout << "size zsModule after the merging: " << zsModule->size() << std::endl; + LogTrace("SiStripMergeZeroSuppression::produce") << "size zsModule after the merging: " << zsModule->size() << "\n"; if ( (count + suppressedDigis.size()) != zsModule->size() ) - std::cout << "WE HAVE A PROBLEM!!!! THE NUMBER OF DIGIS IS NOT RIGHT==============" << std::endl; - std::cout << "exiting suppressing the raw digis" << std::endl; + LogTrace("SiStripMergeZeroSuppression::produce") << "WE HAVE A PROBLEM!!!! THE NUMBER OF DIGIS IS NOT RIGHT==============" << "\n"; + LogTrace("SiStripMergeZeroSuppression::produce") << "exiting suppressing the raw digis" << "\n"; }//if new ZS digis size } //if module restored }//loop over raw data collection @@ -134,13 +135,13 @@ void SiStripMergeZeroSuppression::produce(edm::Event& event, const edm::EventSet for ( const auto& dg : outputdigi ) { uint32_t iddg = dg.id; if ( iddg < oldid ) { - std::cout << "NOT IN THE RIGHT ORGER" << std:: endl; - std::cout << "=======================" << std:: endl; + LogTrace("SiStripMergeZeroSuppression::produce") << "NOT IN THE RIGHT ORGER" << "\n"; + LogTrace("SiStripMergeZeroSuppression::produce") << "=======================" << "\n"; } oldid = iddg; } - std::cout << "write the output vector" << std::endl; + LogTrace("SiStripMergeZeroSuppression::produce") << "write the output vector" << "\n"; event.put(std::make_unique>(outputdigi), "ZeroSuppressed" ); } } diff --git a/RecoLocalTracker/SiStripZeroSuppression/src/SiStripAPVRestorer.cc b/RecoLocalTracker/SiStripZeroSuppression/src/SiStripAPVRestorer.cc index 352561e91c6db..0880d60d8ead7 100644 --- a/RecoLocalTracker/SiStripZeroSuppression/src/SiStripAPVRestorer.cc +++ b/RecoLocalTracker/SiStripZeroSuppression/src/SiStripAPVRestorer.cc @@ -1,5 +1,6 @@ #include "RecoLocalTracker/SiStripZeroSuppression/interface/SiStripAPVRestorer.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" +#include "FWCore/MessageLogger/interface/MessageLogger.h" #include #include @@ -196,7 +197,6 @@ inline uint16_t SiStripAPVRestorer::baselineFollowerInspect(uint16_t firstAPV, c std::copy_n(std::begin(digis)+128*(iAPV-firstAPV), 128, std::back_inserter(singleAPVdigi)); const float DeltaCM = median_[iAPV] - MeanAPVCM; - //std::cout << "Delta CM: " << DeltaCM << " CM: " << median_[APV] << " detId " << (uint32_t) detId_ << std::endl; if ( ( DeltaCM < 0 ) && ( std::abs(DeltaCM) > deltaCMThreshold_ ) ) { if ( ! flatRegionsFinder(singleAPVdigi, smoothedmap, iAPV) ) { apvFlags_[iAPV]= restoreAlgo_; //specify any algo to make the restore @@ -326,11 +326,9 @@ inline uint16_t SiStripAPVRestorer::hybridEmulationInspect(uint16_t firstAPV, co MeanAPVCM = itCMMap->second[iAPV]; const float DeltaCM = median_[iAPV] - MeanAPVCM; - //std::cout << "Delta CM: " << DeltaCM << " CM: " << median_[APV] << " detId " << (uint32_t) detId_ << std::endl; if ( ( DeltaCM < 0 ) && ( std::abs(DeltaCM) > deltaCMThreshold_ ) ) { apvFlags_[iAPV] = "HybridEmulation"; ++nAPVflagged; - //std::cout << "and it is APV: " << APV << "Delta CM: " << DeltaCM << " median " << median_[APV] << " Mean APV " << MeanAPVCM << " marked bad " << markedVRAPVs[APV] << std::endl; //to be removed } } } @@ -534,7 +532,6 @@ void inline SiStripAPVRestorer::cleaner_LocalMinimumAdder(const digivector_t& ad const float adc = adcs[strip]; const auto noise = static_cast(noiseHandle->getNoiseFast(strip+apvN*128,detNoiseRange)); if ( adc < (adc1 + m * itStrip - 2 * noise) ) { - //std::cout << "applying correction strip: " << strip + apvN*128 << " adc " << adc << " detId: " << detId_ << std::endl; smoothedpoints.emplace_hint(itNext, strip, adc); ++it; } @@ -991,16 +988,6 @@ void SiStripAPVRestorer::createCMMapCMstored(const edm::DetSetVector