diff --git a/[refs] b/[refs] index 75676a072a114..4513c7bfb904b 100644 --- a/[refs] +++ b/[refs] @@ -85,4 +85,4 @@ refs/heads/revert-13320-fastsim-tracking-refactor: ae94ef559884611d9e8ad87fef432 "refs/heads/revert-7108-TriggerResultFilter_update_74x": d2f4e7b7d82930631c635e1c318c0eaed0721e33 refs/heads/revert-7113-fixFillDescriptionInESRawToDigi: 8015d61c18e91ae37841e710b9262ab93b246774 "refs/heads/revert-7613-revert_to_conddb1": eff5796e6111d19271d96476dbc31f117e1e447b -"refs/heads/revert-7710-hcal_infinte_loop": 6fa40d35005988570214371144b4a50b6d3ded0d +"refs/heads/revert-7710-hcal_infinte_loop": b7c6703862f88d8112595a20befe6ecb2781e132 diff --git a/branches/revert-7710-hcal_infinte_loop/DQM/SiStripMonitorClient/src/SiStripCertificationInfo.cc b/branches/revert-7710-hcal_infinte_loop/DQM/SiStripMonitorClient/src/SiStripCertificationInfo.cc index d0947e6163ed7..b74dec7304b8d 100644 --- a/branches/revert-7710-hcal_infinte_loop/DQM/SiStripMonitorClient/src/SiStripCertificationInfo.cc +++ b/branches/revert-7710-hcal_infinte_loop/DQM/SiStripMonitorClient/src/SiStripCertificationInfo.cc @@ -173,7 +173,6 @@ void SiStripCertificationInfo::analyze(edm::Event const& event, edm::EventSetup // -- End Luminosity Block // void SiStripCertificationInfo::endLuminosityBlock(edm::LuminosityBlock const& lumiSeg, edm::EventSetup const& iSetup) { - std::cout << "[SiStripCertificationInfo::endLuminosityBlock] " << std::endl; edm::LogInfo( "SiStripDaqInfo") << "SiStripDaqInfo::endLuminosityBlock"; if (nFEDConnected_ > 0) { diff --git a/branches/revert-7710-hcal_infinte_loop/DQM/TrackingMonitorClient/plugins/TrackingOfflineDQM.cc b/branches/revert-7710-hcal_infinte_loop/DQM/TrackingMonitorClient/plugins/TrackingOfflineDQM.cc index 840039cf3d8d3..fdad25ea3c069 100644 --- a/branches/revert-7710-hcal_infinte_loop/DQM/TrackingMonitorClient/plugins/TrackingOfflineDQM.cc +++ b/branches/revert-7710-hcal_infinte_loop/DQM/TrackingMonitorClient/plugins/TrackingOfflineDQM.cc @@ -102,7 +102,6 @@ void TrackingOfflineDQM::beginJob() { * Event Setup object with Geometry, Magnetic Field, etc. */ void TrackingOfflineDQM::beginRun(edm::Run const& run, edm::EventSetup const& eSetup) { - // std::cout << "[TrackingOfflineDQM::beginRun] .. starting" << std::endl; edm::LogInfo ("BeginRun") <<"TrackingOfflineDQM:: Begining of Run"; int nFEDs = 0; @@ -133,15 +132,10 @@ void TrackingOfflineDQM::beginRun(edm::Run const& run, edm::EventSetup const& eS const int siPixelFedN = (FEDNumbering::MAXSiPixelFEDID-FEDNumbering::MINSiPixelFEDID+1); allpixelFEDsFound_ = (nPixelFEDs == siPixelFedN); trackerFEDsFound_ = (nFEDs > 0); - std::cout << "[TrackingOfflineDQM::beginRun] nPixelFEDs: " << nPixelFEDs << " ==> " << allpixelFEDsFound_ << std::endl; - std::cout << "[TrackingOfflineDQM::beginRun] nFEDs: " << nFEDs << " ==> " << trackerFEDsFound_ << std::endl; if (globalStatusFilling_ > 0) { actionExecutor_->createGlobalStatus(dqmStore_); - // std::cout << "[TrackingOfflineDQM::beginRun] done actionExecutor_->createStatus" << std::endl; } - - // std::cout << "[TrackingOfflineDQM::beginRun] DONE" << std::endl; } /** * @brief @@ -164,7 +158,6 @@ void TrackingOfflineDQM::analyze(edm::Event const& e, edm::EventSetup const& eSe */ void TrackingOfflineDQM::endLuminosityBlock(edm::LuminosityBlock const& lumiSeg, edm::EventSetup const& iSetup) { - // std::cout << "[TrackingOfflineDQM::endLuminosityBlock] .. starting" << std::endl; edm::LogInfo("TrackingOfflineDQM") << "TrackingOfflineDQM::endLuminosityBlock"; @@ -183,8 +176,6 @@ void TrackingOfflineDQM::endLuminosityBlock(edm::LuminosityBlock const& lumiSeg, */ void TrackingOfflineDQM::endRun(edm::Run const& run, edm::EventSetup const& eSetup){ - // std::cout << "[TrackingOfflineDQM::endRun] .. starting" << std::endl; - edm::LogInfo("TrackingOfflineDQM") << "TrackingOfflineDQM::endRun"; if (globalStatusFilling_ > 0) { @@ -197,9 +188,6 @@ void TrackingOfflineDQM::endRun(edm::Run const& run, edm::EventSetup const& eSet actionExecutor_->fillGlobalStatus(dqmStore_); } } - - // std::cout << "[TrackingOfflineDQM::endRun] DONE" << std::endl; - } /** * @brief @@ -209,8 +197,6 @@ void TrackingOfflineDQM::endRun(edm::Run const& run, edm::EventSetup const& eSet */ void TrackingOfflineDQM::endJob() { - // std::cout << "[TrackingOfflineDQM::endJob] .. starting" << std::endl; - edm::LogInfo("TrackingOfflineDQM") << "TrackingOfflineDQM::endJob"; if (!usedWithEDMtoMEConverter_) { @@ -218,9 +204,6 @@ void TrackingOfflineDQM::endJob() { dqmStore_->cd(); dqmStore_->save(outputFileName_, "","",""); } - - // std::cout << "[TrackingOfflineDQM::endJob] DONE" << std::endl; - } /** * @brief diff --git a/branches/revert-7710-hcal_infinte_loop/DQMOffline/EGamma/python/electronAnalyzer_cfi.py b/branches/revert-7710-hcal_infinte_loop/DQMOffline/EGamma/python/electronAnalyzer_cfi.py index d70a3af4e8785..e30815d55daa1 100644 --- a/branches/revert-7710-hcal_infinte_loop/DQMOffline/EGamma/python/electronAnalyzer_cfi.py +++ b/branches/revert-7710-hcal_infinte_loop/DQMOffline/EGamma/python/electronAnalyzer_cfi.py @@ -7,7 +7,7 @@ dqmElectronAnalysis = cms.EDAnalyzer("ElectronAnalyzer", Verbosity = cms.untracked.int32(0), - FinalStep = cms.string("AtRunEnd"), + FinalStep = cms.string("AtJobEnd"), InputFile = cms.string(""), OutputFile = cms.string(""), InputFolderName = cms.string("Egamma/Electrons"), diff --git a/branches/revert-7710-hcal_infinte_loop/DQMOffline/EGamma/python/electronGeneralAnalyzer_cfi.py b/branches/revert-7710-hcal_infinte_loop/DQMOffline/EGamma/python/electronGeneralAnalyzer_cfi.py index 0c36c5a551d06..8a30513de4d81 100644 --- a/branches/revert-7710-hcal_infinte_loop/DQMOffline/EGamma/python/electronGeneralAnalyzer_cfi.py +++ b/branches/revert-7710-hcal_infinte_loop/DQMOffline/EGamma/python/electronGeneralAnalyzer_cfi.py @@ -4,7 +4,7 @@ dqmElectronGeneralAnalysis = cms.EDAnalyzer("ElectronGeneralAnalyzer", Verbosity = cms.untracked.int32(0), - FinalStep = cms.string("AtRunEnd"), + FinalStep = cms.string("AtJobEnd"), InputFile = cms.string(""), OutputFile = cms.string(""), InputFolderName = cms.string("Egamma/Electrons/General"), diff --git a/branches/revert-7710-hcal_infinte_loop/DQMOffline/EGamma/python/electronOfflineClient_cfi.py b/branches/revert-7710-hcal_infinte_loop/DQMOffline/EGamma/python/electronOfflineClient_cfi.py index 3eb1ff42efac6..02ae575f767ac 100644 --- a/branches/revert-7710-hcal_infinte_loop/DQMOffline/EGamma/python/electronOfflineClient_cfi.py +++ b/branches/revert-7710-hcal_infinte_loop/DQMOffline/EGamma/python/electronOfflineClient_cfi.py @@ -6,7 +6,7 @@ dqmElectronOfflineClient = cms.EDAnalyzer("ElectronOfflineClient", Verbosity = cms.untracked.int32(0), - FinalStep = cms.string("AtRunEnd"), + FinalStep = cms.string("AtJobEnd"), InputFile = cms.string(""), OutputFile = cms.string(""), InputFolderName = cms.string("Egamma/Electrons"), diff --git a/branches/revert-7710-hcal_infinte_loop/DQMOffline/EGamma/python/electronTagProbeAnalyzer_cfi.py b/branches/revert-7710-hcal_infinte_loop/DQMOffline/EGamma/python/electronTagProbeAnalyzer_cfi.py index 7629ad157a1d5..80e60b95f9a35 100644 --- a/branches/revert-7710-hcal_infinte_loop/DQMOffline/EGamma/python/electronTagProbeAnalyzer_cfi.py +++ b/branches/revert-7710-hcal_infinte_loop/DQMOffline/EGamma/python/electronTagProbeAnalyzer_cfi.py @@ -7,7 +7,7 @@ dqmElectronTagProbeAnalysis = cms.EDAnalyzer("ElectronTagProbeAnalyzer", Verbosity = cms.untracked.int32(0), - FinalStep = cms.string("AtRunEnd"), + FinalStep = cms.string("AtJobEnd"), InputFile = cms.string(""), OutputFile = cms.string(""), InputFolderName = cms.string("Egamma/Electrons/TagAndProbe"), diff --git a/branches/revert-7710-hcal_infinte_loop/DQMServices/Core/interface/DQMStore.h b/branches/revert-7710-hcal_infinte_loop/DQMServices/Core/interface/DQMStore.h index 8793e0b210c49..6254f118a1ebf 100644 --- a/branches/revert-7710-hcal_infinte_loop/DQMServices/Core/interface/DQMStore.h +++ b/branches/revert-7710-hcal_infinte_loop/DQMServices/Core/interface/DQMStore.h @@ -19,6 +19,7 @@ # include # include # include +# include namespace edm { class DQMHttpSource; class ParameterSet; class ActivityRegistry;} namespace lat { class Regexp; } @@ -42,6 +43,7 @@ class TProfile; class TProfile2D; class TNamed; + /** Implements RegEx patterns which occur often in a high-performant mattern. For all other expressions, the full RegEx engine is used. Note: this class can only be used for lat::Regexp::Wildcard-like @@ -654,17 +656,17 @@ class DQMStore MonitorElement * bookProfile(const std::string &dir, const std::string &name, TProfile *h); MonitorElement * bookProfile2D(const std::string &folder, const std::string &name, TProfile2D *h); - static bool checkBinningMatches(MonitorElement *me, TH1 *h); + static bool checkBinningMatches(MonitorElement *me, TH1 *h, unsigned verbose); - static void collate1D(MonitorElement *me, TH1F *h); - static void collate1S(MonitorElement *me, TH1S *h); - static void collate1DD(MonitorElement *me, TH1D *h); - static void collate2D(MonitorElement *me, TH2F *h); - static void collate2S(MonitorElement *me, TH2S *h); - static void collate2DD(MonitorElement *me, TH2D *h); - static void collate3D(MonitorElement *me, TH3F *h); - static void collateProfile(MonitorElement *me, TProfile *h); - static void collateProfile2D(MonitorElement *me, TProfile2D *h); + static void collate1D(MonitorElement *me, TH1F *h, unsigned verbose); + static void collate1S(MonitorElement *me, TH1S *h, unsigned verbose); + static void collate1DD(MonitorElement *me, TH1D *h, unsigned verbose); + static void collate2D(MonitorElement *me, TH2F *h, unsigned verbose); + static void collate2S(MonitorElement *me, TH2S *h, unsigned verbose); + static void collate2DD(MonitorElement *me, TH2D *h, unsigned verbose); + static void collate3D(MonitorElement *me, TH3F *h, unsigned verbose); + static void collateProfile(MonitorElement *me, TProfile *h, unsigned verbose); + static void collateProfile2D(MonitorElement *me, TProfile2D *h, unsigned verbose); // --- Operations on MEs that are normally reset at end of monitoring cycle --- void setAccumulate(MonitorElement *me, bool flag); @@ -695,6 +697,7 @@ class DQMStore uint32_t run_; uint32_t streamId_; uint32_t moduleId_; + std::ofstream * stream_; std::string pwd_; MEMap data_; diff --git a/branches/revert-7710-hcal_infinte_loop/DQMServices/Core/interface/MonitorElement.h b/branches/revert-7710-hcal_infinte_loop/DQMServices/Core/interface/MonitorElement.h index 74b96ac718f96..5b3effc677992 100755 --- a/branches/revert-7710-hcal_infinte_loop/DQMServices/Core/interface/MonitorElement.h +++ b/branches/revert-7710-hcal_infinte_loop/DQMServices/Core/interface/MonitorElement.h @@ -378,8 +378,3 @@ class MonitorElement }; #endif // DQMSERVICES_CORE_MONITOR_ELEMENT_H - -/* Local Variables: */ -/* show-trailing-whitespace: t */ -/* truncate-lines: t */ -/* End: */ diff --git a/branches/revert-7710-hcal_infinte_loop/DQMServices/Core/src/DQMStore.cc b/branches/revert-7710-hcal_infinte_loop/DQMServices/Core/src/DQMStore.cc index 0bd21ae160a6d..0f3f8a803a70f 100644 --- a/branches/revert-7710-hcal_infinte_loop/DQMServices/Core/src/DQMStore.cc +++ b/branches/revert-7710-hcal_infinte_loop/DQMServices/Core/src/DQMStore.cc @@ -449,6 +449,7 @@ DQMStore::DQMStore(const edm::ParameterSet &pset, edm::ActivityRegistry& ar) run_(0), streamId_(0), moduleId_(0), + stream_(nullptr), pwd_ (""), ibooker_(0), igetter_(0) @@ -483,6 +484,7 @@ DQMStore::DQMStore(const edm::ParameterSet &pset) run_(0), streamId_(0), moduleId_(0), + stream_(nullptr), pwd_ (""), ibooker_(0), igetter_(0) @@ -502,6 +504,9 @@ DQMStore::~DQMStore(void) for (QTestSpecs::iterator i = qtestspecs_.begin(), e = qtestspecs_.end(); i != e; ++i) delete i->first; + if (stream_) + stream_->close(); + delete stream_; } void @@ -567,7 +572,12 @@ DQMStore::initializeFrom(const edm::ParameterSet& pset) { void DQMStore::print_trace (const std::string &dir, const std::string &name) { - static std::ofstream stream("histogramBookingBT.log"); + // the access to the member stream_ is implicitely protected against + // concurrency problems because the print_trace method is always called behind + // a lock (see bookTransaction). + if (!stream_) + stream_ = new ofstream("histogramBookingBT.log"); + void *array[10]; size_t size; char **strings; @@ -582,14 +592,14 @@ DQMStore::print_trace (const std::string &dir, const std::string &name) &&s_rxtrace.match(strings[4], 0, 0, &m)) { char * demangled = abi::__cxa_demangle(m.matchString(strings[4], 2).c_str(), 0, 0, &r); - stream << "\"" << dir << "/" + *stream_ << "\"" << dir << "/" << name << "\" " << (r ? m.matchString(strings[4], 2) : demangled) << " " << m.matchString(strings[4], 1) << "\n"; free(demangled); } else - stream << "Skipping "<< dir << "/" << name + *stream_ << "Skipping "<< dir << "/" << name << " with stack size " << size << "\n"; /* In this case print the full stack trace, up to main or to the * maximum stack size, i.e. 10. */ @@ -602,7 +612,7 @@ DQMStore::print_trace (const std::string &dir, const std::string &name) if (s_rxtrace.match(strings[i], 0, 0, &m)) { char * demangled = abi::__cxa_demangle(m.matchString(strings[i], 2).c_str(), 0, 0, &r); - stream << "\t\t" << i << "/" << size << " " + *stream_ << "\t\t" << i << "/" << size << " " << (r ? m.matchString(strings[i], 2) : demangled) << " " << m.matchString(strings[i], 1) << std::endl; free (demangled); @@ -744,7 +754,7 @@ DQMStore::book(const std::string &dir, const std::string &name, { if (collateHistograms_) { - collate(me, h); + collate(me, h, verbose_); delete h; return me; } @@ -755,7 +765,7 @@ DQMStore::book(const std::string &dir, const std::string &name, << context << ": monitor element '" << path << "' already exists, collating" << std::endl; me->Reset(); - collate(me, h); + collate(me, h, verbose_); delete h; return me; } @@ -1479,7 +1489,7 @@ DQMStore::bookProfile2D(const std::string &name, TProfile2D *source) ////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////// bool -DQMStore::checkBinningMatches(MonitorElement *me, TH1 *h) +DQMStore::checkBinningMatches(MonitorElement *me, TH1 *h, unsigned verbose) { if (me->getTH1()->GetNbinsX() != h->GetNbinsX() || me->getTH1()->GetNbinsY() != h->GetNbinsY() @@ -1494,70 +1504,70 @@ DQMStore::checkBinningMatches(MonitorElement *me, TH1 *h) || !MonitorElement::CheckBinLabels((TAxis*)me->getTH1()->GetYaxis(),(TAxis*)h->GetYaxis()) || !MonitorElement::CheckBinLabels((TAxis*)me->getTH1()->GetZaxis(),(TAxis*)h->GetZaxis()) ) { - // edm::LogWarning ("DQMStore") - std::cout << "*** DQMStore: WARNING:" - << "checkBinningMatches: different binning - cannot add object '" - << h->GetName() << "' of type " - << h->IsA()->GetName() << " to existing ME: '" - << me->getFullname() << "'\n"; + if(verbose > 0) + std::cout << "*** DQMStore: WARNING:" + << "checkBinningMatches: different binning - cannot add object '" + << h->GetName() << "' of type " + << h->IsA()->GetName() << " to existing ME: '" + << me->getFullname() << "'\n"; return false; } return true; } void -DQMStore::collate1D(MonitorElement *me, TH1F *h) +DQMStore::collate1D(MonitorElement *me, TH1F *h, unsigned verbose) { - if (checkBinningMatches(me,h)) + if (checkBinningMatches(me,h,verbose)) me->getTH1F()->Add(h); } void -DQMStore::collate1S(MonitorElement *me, TH1S *h) +DQMStore::collate1S(MonitorElement *me, TH1S *h, unsigned verbose) { - if (checkBinningMatches(me,h)) + if (checkBinningMatches(me,h,verbose)) me->getTH1S()->Add(h); } void -DQMStore::collate1DD(MonitorElement *me, TH1D *h) +DQMStore::collate1DD(MonitorElement *me, TH1D *h, unsigned verbose) { - if (checkBinningMatches(me,h)) + if (checkBinningMatches(me,h,verbose)) me->getTH1D()->Add(h); } void -DQMStore::collate2D(MonitorElement *me, TH2F *h) +DQMStore::collate2D(MonitorElement *me, TH2F *h, unsigned verbose) { - if (checkBinningMatches(me,h)) + if (checkBinningMatches(me,h,verbose)) me->getTH2F()->Add(h); } void -DQMStore::collate2S(MonitorElement *me, TH2S *h) +DQMStore::collate2S(MonitorElement *me, TH2S *h, unsigned verbose) { - if (checkBinningMatches(me,h)) + if (checkBinningMatches(me,h,verbose)) me->getTH2S()->Add(h); } void -DQMStore::collate2DD(MonitorElement *me, TH2D *h) +DQMStore::collate2DD(MonitorElement *me, TH2D *h, unsigned verbose) { - if (checkBinningMatches(me,h)) + if (checkBinningMatches(me,h,verbose)) me->getTH2D()->Add(h); } void -DQMStore::collate3D(MonitorElement *me, TH3F *h) +DQMStore::collate3D(MonitorElement *me, TH3F *h, unsigned verbose) { - if (checkBinningMatches(me,h)) + if (checkBinningMatches(me,h,verbose)) me->getTH3F()->Add(h); } void -DQMStore::collateProfile(MonitorElement *me, TProfile *h) +DQMStore::collateProfile(MonitorElement *me, TProfile *h, unsigned verbose) { - if (checkBinningMatches(me,h)) + if (checkBinningMatches(me,h,verbose)) { TProfile *meh = me->getTProfile(); me->addProfiles(h, meh, meh, 1, 1); @@ -1565,9 +1575,9 @@ DQMStore::collateProfile(MonitorElement *me, TProfile *h) } void -DQMStore::collateProfile2D(MonitorElement *me, TProfile2D *h) +DQMStore::collateProfile2D(MonitorElement *me, TProfile2D *h, unsigned verbose) { - if (checkBinningMatches(me,h)) + if (checkBinningMatches(me,h,verbose)) { TProfile2D *meh = me->getTProfile2D(); me->addProfiles(h, meh, meh, 1, 1); @@ -2039,7 +2049,7 @@ DQMStore::extract(TObject *obj, const std::string &dir, else if (overwrite) me->copyFrom(h); else if (isCollateME(me) || collateHistograms) - collateProfile(me, h); + collateProfile(me, h, verbose_); refcheck = me; } else if (TProfile2D *h = dynamic_cast(obj)) @@ -2050,7 +2060,7 @@ DQMStore::extract(TObject *obj, const std::string &dir, else if (overwrite) me->copyFrom(h); else if (isCollateME(me) || collateHistograms) - collateProfile2D(me, h); + collateProfile2D(me, h, verbose_); refcheck = me; } else if (TH1F *h = dynamic_cast(obj)) @@ -2061,7 +2071,7 @@ DQMStore::extract(TObject *obj, const std::string &dir, else if (overwrite) me->copyFrom(h); else if (isCollateME(me) || collateHistograms) - collate1D(me, h); + collate1D(me, h, verbose_); refcheck = me; } else if (TH1S *h = dynamic_cast(obj)) @@ -2072,7 +2082,7 @@ DQMStore::extract(TObject *obj, const std::string &dir, else if (overwrite) me->copyFrom(h); else if (isCollateME(me) || collateHistograms) - collate1S(me, h); + collate1S(me, h, verbose_); refcheck = me; } else if (TH1D *h = dynamic_cast(obj)) @@ -2083,7 +2093,7 @@ DQMStore::extract(TObject *obj, const std::string &dir, else if (overwrite) me->copyFrom(h); else if (isCollateME(me) || collateHistograms) - collate1DD(me, h); + collate1DD(me, h, verbose_); refcheck = me; } else if (TH2F *h = dynamic_cast(obj)) @@ -2094,7 +2104,7 @@ DQMStore::extract(TObject *obj, const std::string &dir, else if (overwrite) me->copyFrom(h); else if (isCollateME(me) || collateHistograms) - collate2D(me, h); + collate2D(me, h, verbose_); refcheck = me; } else if (TH2S *h = dynamic_cast(obj)) @@ -2105,7 +2115,7 @@ DQMStore::extract(TObject *obj, const std::string &dir, else if (overwrite) me->copyFrom(h); else if (isCollateME(me) || collateHistograms) - collate2S(me, h); + collate2S(me, h, verbose_); refcheck = me; } else if (TH2D *h = dynamic_cast(obj)) @@ -2116,7 +2126,7 @@ DQMStore::extract(TObject *obj, const std::string &dir, else if (overwrite) me->copyFrom(h); else if (isCollateME(me) || collateHistograms) - collate2DD(me, h); + collate2DD(me, h, verbose_); refcheck = me; } else if (TH3F *h = dynamic_cast(obj)) @@ -2127,7 +2137,7 @@ DQMStore::extract(TObject *obj, const std::string &dir, else if (overwrite) me->copyFrom(h); else if (isCollateME(me) || collateHistograms) - collate3D(me, h); + collate3D(me, h, verbose_); refcheck = me; } else if (dynamic_cast(obj)) diff --git a/branches/revert-7710-hcal_infinte_loop/DQMServices/Core/src/MonitorElement.cc b/branches/revert-7710-hcal_infinte_loop/DQMServices/Core/src/MonitorElement.cc index a9712018a490e..b1455ef76df2c 100755 --- a/branches/revert-7710-hcal_infinte_loop/DQMServices/Core/src/MonitorElement.cc +++ b/branches/revert-7710-hcal_infinte_loop/DQMServices/Core/src/MonitorElement.cc @@ -939,7 +939,7 @@ MonitorElement::setBinLabel(int bin, const std::string &label, int axis /* = 1 * { // edm::LogWarning ("MonitorElement") std::cout << "*** MonitorElement: WARNING:" - <<"setBinLabel: attempting to set label of non-existent bin number \n"; + <<"setBinLabel: attempting to set label of non-existent bin number for ME: "<< getFullname() << " \n"; } } @@ -1690,8 +1690,3 @@ MonitorElement::getRefTProfile2D(void) const return static_cast (checkRootObject(data_.objname, reference_, __PRETTY_FUNCTION__, 2)); } - -// Local Variables: -// show-trailing-whitespace: t -// truncate-lines: t -// End: