diff --git a/CalibCalorimetry/EBPhase2TPGTools/plugins/EcalEBPhase2TPParamProducer.cc b/CalibCalorimetry/EBPhase2TPGTools/plugins/EcalEBPhase2TPParamProducer.cc index 9e07cc27a87ca..fee2d6b50f29e 100644 --- a/CalibCalorimetry/EBPhase2TPGTools/plugins/EcalEBPhase2TPParamProducer.cc +++ b/CalibCalorimetry/EBPhase2TPGTools/plugins/EcalEBPhase2TPParamProducer.cc @@ -130,7 +130,7 @@ void EcalEBPhase2TPParamProducer::fillDescriptions(edm::ConfigurationDescription desc.add("Et_sat", 1998.36); desc.add("xtal_LSB", 0.0488); desc.add("binOfMaximum", 6); - descriptions.add("ecalEBPhase2TPParamProducerDefault",desc); + descriptions.add("ecalEBPhase2TPParamProducerDefault", desc); } void EcalEBPhase2TPParamProducer::analyze(const edm::Event& evt, const edm::EventSetup& evtSetup) { diff --git a/SimCalorimetry/EcalEBTrigPrimAlgos/interface/EcalEBPhase2AmplitudeReconstructor.h b/SimCalorimetry/EcalEBTrigPrimAlgos/interface/EcalEBPhase2AmplitudeReconstructor.h index d8c3e16b11441..a7098e6c62c76 100644 --- a/SimCalorimetry/EcalEBTrigPrimAlgos/interface/EcalEBPhase2AmplitudeReconstructor.h +++ b/SimCalorimetry/EcalEBTrigPrimAlgos/interface/EcalEBPhase2AmplitudeReconstructor.h @@ -16,7 +16,7 @@ class EcalTPGWeightGroup; class EcalEBPhase2AmplitudeReconstructor { private: - static const int maxSamplesUsed_=12; + static const int maxSamplesUsed_ = 12; bool debug_; int inputsAlreadyIn_; int buffer_[maxSamplesUsed_]; @@ -25,7 +25,6 @@ class EcalEBPhase2AmplitudeReconstructor { int setInput(int input); void process(); int processedOutput_; - public: EcalEBPhase2AmplitudeReconstructor(bool debug); diff --git a/SimCalorimetry/EcalEBTrigPrimAlgos/src/EcalEBPhase2AmplitudeReconstructor.cc b/SimCalorimetry/EcalEBTrigPrimAlgos/src/EcalEBPhase2AmplitudeReconstructor.cc index 22a31bceba274..2ac137f06f712 100644 --- a/SimCalorimetry/EcalEBTrigPrimAlgos/src/EcalEBPhase2AmplitudeReconstructor.cc +++ b/SimCalorimetry/EcalEBTrigPrimAlgos/src/EcalEBPhase2AmplitudeReconstructor.cc @@ -7,7 +7,6 @@ #include - EcalEBPhase2AmplitudeReconstructor::EcalEBPhase2AmplitudeReconstructor(bool debug) : debug_(debug), inputsAlreadyIn_(0), shift_(13) {} diff --git a/SimCalorimetry/EcalEBTrigPrimAlgos/src/EcalEBPhase2TimeReconstructor.cc b/SimCalorimetry/EcalEBTrigPrimAlgos/src/EcalEBPhase2TimeReconstructor.cc index 22683dc75729b..6349a2ec60950 100644 --- a/SimCalorimetry/EcalEBTrigPrimAlgos/src/EcalEBPhase2TimeReconstructor.cc +++ b/SimCalorimetry/EcalEBTrigPrimAlgos/src/EcalEBPhase2TimeReconstructor.cc @@ -6,7 +6,6 @@ #include "FWCore/MessageLogger/interface/MessageLogger.h" #include - EcalEBPhase2TimeReconstructor::EcalEBPhase2TimeReconstructor(bool debug) : debug_(debug), inputsAlreadyIn_(0), shift_(maxSamplesUsed_) {} diff --git a/SimCalorimetry/EcalEBTrigPrimProducers/plugins/EcalEBTrigPrimPhase2Producer.cc b/SimCalorimetry/EcalEBTrigPrimProducers/plugins/EcalEBTrigPrimPhase2Producer.cc index 41d0d5c84cfc2..3db2b7efd790a 100644 --- a/SimCalorimetry/EcalEBTrigPrimProducers/plugins/EcalEBTrigPrimPhase2Producer.cc +++ b/SimCalorimetry/EcalEBTrigPrimProducers/plugins/EcalEBTrigPrimPhase2Producer.cc @@ -214,30 +214,29 @@ void EcalEBTrigPrimPhase2Producer::produce(edm::Event& e, const edm::EventSetup& << " For Barrel " << pOut->size() << " TP Digis were produced" << std::endl; } - // debug prints if TP > 0. The number of TP with Et>0 is also used later for a LogInfo + // debug prints if TP > 0. The number of TP with Et>0 is also used later for a LogInfo int nonZeroTP = 0; int nXstal = 0; for (unsigned int i = 0; i < pOut->size(); ++i) { nXstal++; for (int isam = 0; isam < (*pOut)[i].size(); ++isam) { if ((*pOut)[i][isam].encodedEt() > 0) { - nonZeroTP++; - if (debug_) { - LogDebug("EcalEBTrigPrimPhase2Producer") - << " For xStal n " << nXstal << " xTsal Id " << (((*pOut)[i])).id() << ", TP is " << (*pOut)[i] - << " (*pOut)[i][isam].raw() " << (*pOut)[i][isam].raw() << " (*pOut)[i][isam].encodedEt() " - << (*pOut)[i][isam].encodedEt() << " (*pOut)[i][isam].time() " << (*pOut)[i][isam].time() << std::endl; - } + nonZeroTP++; + if (debug_) { + LogDebug("EcalEBTrigPrimPhase2Producer") + << " For xStal n " << nXstal << " xTsal Id " << (((*pOut)[i])).id() << ", TP is " << (*pOut)[i] + << " (*pOut)[i][isam].raw() " << (*pOut)[i][isam].raw() << " (*pOut)[i][isam].encodedEt() " + << (*pOut)[i][isam].encodedEt() << " (*pOut)[i][isam].time() " << (*pOut)[i][isam].time() << std::endl; + } } } } - edm::LogInfo("EcalEBTrigPrimPhase2Producer") - << "EcalTPG" - << "\n =================> For Barrel , " << pOut->size() << " TP Digis were produced (including zero ones)" - << " Non zero primitives were " << nonZeroTP << std::endl; - + << "EcalTPG" + << "\n =================> For Barrel , " << pOut->size() << " TP Digis were produced (including zero ones)" + << " Non zero primitives were " << nonZeroTP << std::endl; + // put result into the Event e.put(std::move(pOut)); }