diff --git a/DQM/EcalCommon/interface/DQWorker.h b/DQM/EcalCommon/interface/DQWorker.h index 66d7b9154deba..9e8d359113021 100644 --- a/DQM/EcalCommon/interface/DQWorker.h +++ b/DQM/EcalCommon/interface/DQWorker.h @@ -57,9 +57,6 @@ namespace ecaldqm { virtual void beginRun(edm::Run const &, edm::EventSetup const &) {} virtual void endRun(edm::Run const &, edm::EventSetup const &) {} - virtual void beginLuminosityBlock(edm::LuminosityBlock const &, edm::EventSetup const &) {} - virtual void endLuminosityBlock(edm::LuminosityBlock const &, edm::EventSetup const &) {} - virtual void bookMEs(DQMStore::IBooker &); virtual void releaseMEs(); diff --git a/DQM/EcalCommon/interface/EcalDQMonitor.h b/DQM/EcalCommon/interface/EcalDQMonitor.h index c434cc314a2a6..6a0252e33cead 100644 --- a/DQM/EcalCommon/interface/EcalDQMonitor.h +++ b/DQM/EcalCommon/interface/EcalDQMonitor.h @@ -28,8 +28,6 @@ namespace ecaldqm { void ecaldqmGetSetupObjects(edm::EventSetup const &); void ecaldqmBeginRun(edm::Run const &, edm::EventSetup const &); void ecaldqmEndRun(edm::Run const &, edm::EventSetup const &); - void ecaldqmBeginLuminosityBlock(edm::LuminosityBlock const &, edm::EventSetup const &); - void ecaldqmEndLuminosityBlock(edm::LuminosityBlock const &, edm::EventSetup const &); template void executeOnWorkers_(FuncOnWorker, diff --git a/DQM/EcalCommon/src/EcalDQMonitor.cc b/DQM/EcalCommon/src/EcalDQMonitor.cc index 86f19334cd83d..01f325eb63a32 100644 --- a/DQM/EcalCommon/src/EcalDQMonitor.cc +++ b/DQM/EcalCommon/src/EcalDQMonitor.cc @@ -112,31 +112,4 @@ namespace ecaldqm { edm::LogInfo("EcalDQM") << moduleName_ << "::ecaldqmEndRun"; } - void EcalDQMonitor::ecaldqmBeginLuminosityBlock(edm::LuminosityBlock const &_lumi, edm::EventSetup const &_es) { - executeOnWorkers_( - [&_lumi, &_es](DQWorker *worker) { - if (worker->onlineMode()) - worker->setTime(time(nullptr)); - worker->setLumiNumber(_lumi.luminosityBlock()); - worker->beginLuminosityBlock(_lumi, _es); - }, - "beginLumi"); - - if (verbosity_ > 1) - edm::LogInfo("EcalDQM") << moduleName_ << "::ecaldqmBeginLuminosityBlock"; - } - - void EcalDQMonitor::ecaldqmEndLuminosityBlock(edm::LuminosityBlock const &_lumi, edm::EventSetup const &_es) { - executeOnWorkers_( - [&_lumi, &_es](DQWorker *worker) { - if (worker->onlineMode()) - worker->setTime(time(nullptr)); - worker->setLumiNumber(_lumi.luminosityBlock()); - worker->endLuminosityBlock(_lumi, _es); - }, - "endLumi"); - - if (verbosity_ > 2) - edm::LogInfo("EcalDQM") << moduleName_ << "::ecaldqmEndLuminosityBlock"; - } } // namespace ecaldqm diff --git a/DQM/EcalMonitorClient/interface/DQWorkerClient.h b/DQM/EcalMonitorClient/interface/DQWorkerClient.h index 0a1fcef17b49d..2842deecaba3e 100644 --- a/DQM/EcalMonitorClient/interface/DQWorkerClient.h +++ b/DQM/EcalMonitorClient/interface/DQWorkerClient.h @@ -19,7 +19,6 @@ namespace ecaldqm { static void fillDescriptions(edm::ParameterSetDescription&); - void endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override; void resetPerLumi(); void bookMEs(DQMStore::IBooker&) override; diff --git a/DQM/EcalMonitorClient/interface/EcalDQMonitorClient.h b/DQM/EcalMonitorClient/interface/EcalDQMonitorClient.h index 5b6082d5e68f9..e330aff816a3e 100644 --- a/DQM/EcalMonitorClient/interface/EcalDQMonitorClient.h +++ b/DQM/EcalMonitorClient/interface/EcalDQMonitorClient.h @@ -17,10 +17,6 @@ class EcalDQMonitorClient : public DQMEDHarvester, public ecaldqm::EcalDQMonitor private: void beginRun(edm::Run const&, edm::EventSetup const&) override; void endRun(edm::Run const&, edm::EventSetup const&) override; - void dqmEndLuminosityBlock(DQMStore::IBooker&, - DQMStore::IGetter&, - edm::LuminosityBlock const&, - edm::EventSetup const&) override; void dqmEndJob(DQMStore::IBooker&, DQMStore::IGetter&) override; void runWorkers(DQMStore::IGetter&, ecaldqm::DQWorkerClient::ProcessType); diff --git a/DQM/EcalMonitorClient/interface/IntegrityClient.h b/DQM/EcalMonitorClient/interface/IntegrityClient.h index eb328f91a0ace..d37d299845ebf 100644 --- a/DQM/EcalMonitorClient/interface/IntegrityClient.h +++ b/DQM/EcalMonitorClient/interface/IntegrityClient.h @@ -14,11 +14,9 @@ namespace ecaldqm { ~IntegrityClient() override {} void producePlots(ProcessType) override; - void endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override; private: void setParams(edm::ParameterSet const&) override; - edm::ESHandle chStatus; float errFractionThreshold_; }; diff --git a/DQM/EcalMonitorClient/interface/TowerStatusTask.h b/DQM/EcalMonitorClient/interface/TowerStatusTask.h index b6d9cd60e625f..ad190e56c0822 100644 --- a/DQM/EcalMonitorClient/interface/TowerStatusTask.h +++ b/DQM/EcalMonitorClient/interface/TowerStatusTask.h @@ -12,8 +12,6 @@ namespace ecaldqm { TowerStatusTask(); ~TowerStatusTask() override {} - void endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override; - void producePlots(ProcessType) override; private: diff --git a/DQM/EcalMonitorClient/plugins/EcalDQMonitorClient.cc b/DQM/EcalMonitorClient/plugins/EcalDQMonitorClient.cc index 81f4dabfcc5d1..1ea4dc8b81eda 100644 --- a/DQM/EcalMonitorClient/plugins/EcalDQMonitorClient.cc +++ b/DQM/EcalMonitorClient/plugins/EcalDQMonitorClient.cc @@ -80,33 +80,6 @@ void EcalDQMonitorClient::beginRun(edm::Run const& _run, edm::EventSetup const& void EcalDQMonitorClient::endRun(edm::Run const& _run, edm::EventSetup const& _es) { ecaldqmEndRun(_run, _es); } -void EcalDQMonitorClient::dqmEndLuminosityBlock(DQMStore::IBooker& _ibooker, - DQMStore::IGetter& _igetter, - edm::LuminosityBlock const& _lumi, - edm::EventSetup const& _es) { - executeOnWorkers_( - [&_ibooker](ecaldqm::DQWorker* worker) { - ecaldqm::DQWorkerClient* client(static_cast(worker)); - if (!client->onlineMode() && !client->runsOn(ecaldqm::DQWorkerClient::kLumi)) - return; - client->bookMEs(_ibooker); - }, - "bookMEs", - "Booking MEs"); - - ecaldqmEndLuminosityBlock(_lumi, _es); - - runWorkers(_igetter, ecaldqm::DQWorkerClient::kLumi); - - executeOnWorkers_( - [](ecaldqm::DQWorker* worker) { - ecaldqm::DQWorkerClient* client(static_cast(worker)); - client->resetPerLumi(); - }, - "dqmEndLuminosityBlock", - "Reset per-lumi MEs"); -} - void EcalDQMonitorClient::dqmEndJob(DQMStore::IBooker& _ibooker, DQMStore::IGetter& _igetter) { executeOnWorkers_( [&_ibooker](ecaldqm::DQWorker* worker) { diff --git a/DQM/EcalMonitorClient/python/IntegrityClient_cfi.py b/DQM/EcalMonitorClient/python/IntegrityClient_cfi.py index d91cfb18521c9..e001549777259 100644 --- a/DQM/EcalMonitorClient/python/IntegrityClient_cfi.py +++ b/DQM/EcalMonitorClient/python/IntegrityClient_cfi.py @@ -34,13 +34,6 @@ otype = cms.untracked.string('SM'), btype = cms.untracked.string('Crystal'), description = cms.untracked.string('Summary of the data integrity. A channel is red if more than ' + str(errFractionThreshold) + ' of its entries have integrity errors.') - ), - ChStatus = cms.untracked.PSet( - path = cms.untracked.string('%(subdet)s/%(prefix)sIntegrityClient/%(prefix)sIT%(suffix)s channel status map'), - kind = cms.untracked.string('TH2F'), - otype = cms.untracked.string('Ecal3P'), - btype = cms.untracked.string('Crystal'), - description = cms.untracked.string('Map of channel status as given by the Ecal Channel Status Record. LEGEND:
0: Channel ok,
1: DAC settings problem, pedestal not in the design range,
2: Channel with no laser, ok elsewhere,
3: Noisy,
4: Very noisy,
5-7: Reserved for more categories of noisy channels,
8: Channel at fixed gain 6 (or 6 and 1),
9: Channel at fixed gain 1,
10: Channel at fixed gain 0 (dead of type this),
11: Non-responding isolated channel (dead of type other),
12: Channel and one or more neigbors not responding (e.g.: in a dead VFE 5x1 channel),
13: Channel in TT with no data link, TP data ok,
14: Channel in TT with no data link and no TP data.') ) ) ) diff --git a/DQM/EcalMonitorClient/python/PresampleClient_cfi.py b/DQM/EcalMonitorClient/python/PresampleClient_cfi.py index 356351f652cb6..ceec978a04f34 100644 --- a/DQM/EcalMonitorClient/python/PresampleClient_cfi.py +++ b/DQM/EcalMonitorClient/python/PresampleClient_cfi.py @@ -20,9 +20,7 @@ toleranceRMSFwd = cms.untracked.double(toleranceRMSFwd) ), sources = cms.untracked.PSet( - Pedestal = ecalPresampleTask.MEs.Pedestal, - PedestalByLS = ecalPresampleTask.MEs.PedestalByLS, - ChStatus = ecalIntegrityClient.MEs.ChStatus + Pedestal = ecalPresampleTask.MEs.Pedestal ), MEs = cms.untracked.PSet( RMS = cms.untracked.PSet( @@ -64,16 +62,6 @@ btype = cms.untracked.string('SuperCrystal'), description = cms.untracked.string('2D distribution of the presample RMS. Channels with entries less than ' + str(minChannelEntries) + ' are not considered.') ), - RMSMapAllByLumi = cms.untracked.PSet( - path = cms.untracked.string('%(subdet)s/%(prefix)sSummaryClient/%(prefix)sPOT%(suffix)s pedestal G12 RMS map by lumi'), - kind = cms.untracked.string('TH2F'), - zaxis = cms.untracked.PSet( - title = cms.untracked.string('RMS') - ), - otype = cms.untracked.string('Ecal3P'), - btype = cms.untracked.string('Crystal'), - description = cms.untracked.string('2D distribution of the presample RMS in this lumisection. Channels with entries less than ' + str(minChannelEntries) + ' are not considered.') - ), TrendMean = cms.untracked.PSet( path = cms.untracked.string('Ecal/Trends/PresampleClient %(prefix)s pedestal mean max - min'), kind = cms.untracked.string('TProfile'), diff --git a/DQM/EcalMonitorClient/python/SummaryClient_cfi.py b/DQM/EcalMonitorClient/python/SummaryClient_cfi.py index 953c550b709ea..a6314503b30dc 100644 --- a/DQM/EcalMonitorClient/python/SummaryClient_cfi.py +++ b/DQM/EcalMonitorClient/python/SummaryClient_cfi.py @@ -21,13 +21,9 @@ ), sources = cms.untracked.PSet( Integrity = ecalIntegrityClient.MEs.QualitySummary, - IntegrityByLumi = ecalIntegrityTask.MEs.ByLumi, Presample = ecalPresampleClient.MEs.QualitySummary, Timing = ecalTimingClient.MEs.QualitySummary, RawData = ecalRawDataClient.MEs.QualitySummary, - DesyncByLumi = ecalRawDataTask.MEs.DesyncByLumi, - FEByLumi = ecalRawDataTask.MEs.FEByLumi, - FEStatusErrMapByLumi = ecalRawDataTask.MEs.FEStatusErrMapByLumi, TriggerPrimitives = ecalTrigPrimClient.MEs.EmulQualitySummary, HotCell = ecalOccupancyClient.MEs.QualitySummary, BXSRP = ecalRawDataTask.MEs.BXSRP, diff --git a/DQM/EcalMonitorClient/python/TimingClient_cfi.py b/DQM/EcalMonitorClient/python/TimingClient_cfi.py index 62285dfb085f3..f6729b1402ca0 100644 --- a/DQM/EcalMonitorClient/python/TimingClient_cfi.py +++ b/DQM/EcalMonitorClient/python/TimingClient_cfi.py @@ -29,8 +29,6 @@ sources = cms.untracked.PSet( TimeAllMap = ecalTimingTask.MEs.TimeAllMap, TimeMap = ecalTimingTask.MEs.TimeMap, - TimeMapByLS = ecalTimingTask.MEs.TimeMapByLS, - ChStatus = ecalIntegrityClient.MEs.ChStatus ), MEs = cms.untracked.PSet( RMSAll = cms.untracked.PSet( diff --git a/DQM/EcalMonitorClient/python/TrigPrimClient_cfi.py b/DQM/EcalMonitorClient/python/TrigPrimClient_cfi.py index 77ee17ca15aa4..b7c8363f638dd 100644 --- a/DQM/EcalMonitorClient/python/TrigPrimClient_cfi.py +++ b/DQM/EcalMonitorClient/python/TrigPrimClient_cfi.py @@ -18,10 +18,8 @@ EtEmulError = ecalTrigPrimTask.MEs.EtEmulError, MatchedIndex = ecalTrigPrimTask.MEs.MatchedIndex, TTFlags4 = ecalTrigPrimTask.MEs.TTFlags4, - TTFlags4ByLumi = ecalTrigPrimTask.MEs.TTFlags4ByLumi, TTMaskMapAll = ecalTrigPrimTask.MEs.TTMaskMapAll, TTFMismatch = ecalTrigPrimTask.MEs.TTFMismatch, - LHCStatusByLumi = ecalTrigPrimTask.MEs.LHCStatusByLumi, TPDigiThrAll = ecalOccupancyTask.MEs.TPDigiThrAll ), MEs = cms.untracked.PSet( @@ -59,13 +57,6 @@ btype = cms.untracked.string('TriggerTower'), description = cms.untracked.string('Summarizes whether a TT was masked in the TPGRecords, or had an instance of TT Flag=4.
GRAY: Masked, no TTF4,
BLACK: Masked, with TTF4,
BLUE: Not Masked, with TTF4.') ), - TTF4vMaskByLumi = cms.untracked.PSet( - path = cms.untracked.string('%(subdet)s/%(prefix)sTriggerTowerTask/%(prefix)sTTT TTF4 vs Masking Status%(suffix)s by lumi'), - kind = cms.untracked.string('TH2F'), - otype = cms.untracked.string('Ecal3P'), - btype = cms.untracked.string('TriggerTower'), - description = cms.untracked.string('Summarizes whether a TT was masked in this lumisection in the TPGRecords, or had an instance of TT Flag=4.
GRAY: Masked, no TTF4,
BLACK: Masked, with TTF4,
BLUE: Not Masked, with TTF4.') - ), TrendTTF4Flags = cms.untracked.PSet( path = cms.untracked.string('Ecal/Trends/TrigPrimClient %(prefix)s number of TTs with TTF4 set'), kind = cms.untracked.string('TProfile'), diff --git a/DQM/EcalMonitorClient/src/DQWorkerClient.cc b/DQM/EcalMonitorClient/src/DQWorkerClient.cc index ef8c5c5a13bdf..9e93922fa78b1 100644 --- a/DQM/EcalMonitorClient/src/DQWorkerClient.cc +++ b/DQM/EcalMonitorClient/src/DQWorkerClient.cc @@ -67,17 +67,6 @@ namespace ecaldqm { } } - void DQWorkerClient::endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) { -// MESetChannel class removed until concurrency issue is finalized -#if 0 - for(MESetCollection::iterator sItr(sources_.begin()); sItr != sources_.end(); ++sItr){ - if(!sItr->second->getLumiFlag()) continue; - MESetChannel const* channel(dynamic_cast(sItr->second)); - if(channel) channel->checkDirectory(); - } -#endif - } - void DQWorkerClient::bookMEs(DQMStore::IBooker& _ibooker) { DQWorker::bookMEs(_ibooker); resetMEs(); diff --git a/DQM/EcalMonitorClient/src/IntegrityClient.cc b/DQM/EcalMonitorClient/src/IntegrityClient.cc index 90af212519a03..c227625bc64bd 100644 --- a/DQM/EcalMonitorClient/src/IntegrityClient.cc +++ b/DQM/EcalMonitorClient/src/IntegrityClient.cc @@ -20,12 +20,6 @@ namespace ecaldqm { errFractionThreshold_ = _params.getUntrackedParameter("errFractionThreshold"); } - // Check Channel Status Record at every endLumi - // Used to fill Channel Status Map MEs - void IntegrityClient::endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const& _es) { - _es.get().get(chStatus); - } - void IntegrityClient::producePlots(ProcessType) { uint32_t mask(1 << EcalDQMStatusHelper::CH_ID_ERROR | 1 << EcalDQMStatusHelper::CH_GAIN_ZERO_ERROR | 1 << EcalDQMStatusHelper::CH_GAIN_SWITCH_ERROR | 1 << EcalDQMStatusHelper::TT_ID_ERROR | @@ -33,7 +27,6 @@ namespace ecaldqm { MESet& meQuality(MEs_.at("Quality")); MESet& meQualitySummary(MEs_.at("QualitySummary")); - MESet& meChStatus(MEs_.at("ChStatus")); MESet const& sOccupancy(sources_.at("Occupancy")); MESet const& sGain(sources_.at("Gain")); @@ -42,31 +35,6 @@ namespace ecaldqm { MESet const& sTowerId(sources_.at("TowerId")); MESet const& sBlockSize(sources_.at("BlockSize")); - // Fill Channel Status Map MEs - // Record is checked for updates at every endLumi and filled here - MESet::iterator chSEnd(meChStatus.end()); - for (MESet::iterator chSItr(meChStatus.beginChannel()); chSItr != chSEnd; chSItr.toNextChannel()) { - DetId id(chSItr->getId()); - - EcalChannelStatusMap::const_iterator chIt(nullptr); - - // Set appropriate channel map (EB or EE) - if (id.subdetId() == EcalBarrel) { - EBDetId ebid(id); - chIt = chStatus->find(ebid); - } else { - EEDetId eeid(id); - chIt = chStatus->find(eeid); - } - - // Get status code and fill ME - if (chIt != chStatus->end()) { - uint16_t code(chIt->getEncodedStatusCode()); - chSItr->setBinContent(code); - } - - } // Channel Status Map - MESet::iterator qEnd(meQuality.end()); MESet::const_iterator occItr(sOccupancy); for (MESet::iterator qItr(meQuality.beginChannel()); qItr != qEnd; qItr.toNextChannel()) { diff --git a/DQM/EcalMonitorClient/src/PresampleClient.cc b/DQM/EcalMonitorClient/src/PresampleClient.cc index 28250146e6887..dda7db1df28dc 100644 --- a/DQM/EcalMonitorClient/src/PresampleClient.cc +++ b/DQM/EcalMonitorClient/src/PresampleClient.cc @@ -39,11 +39,8 @@ namespace ecaldqm { MESet& meRMS(MEs_.at("RMS")); MESet& meRMSMap(MEs_.at("RMSMap")); MESet& meRMSMapAll(MEs_.at("RMSMapAll")); - MESet& meRMSMapAllByLumi(MEs_.at("RMSMapAllByLumi")); MESet const& sPedestal(sources_.at("Pedestal")); - MESet const& sPedestalByLS(sources_.at("PedestalByLS")); - MESet const& sChStatus(sources_.at("ChStatus")); uint32_t mask(1 << EcalDQMStatusHelper::PEDESTAL_ONLINE_HIGH_GAIN_MEAN_ERROR | 1 << EcalDQMStatusHelper::PEDESTAL_ONLINE_HIGH_GAIN_RMS_ERROR); @@ -51,12 +48,10 @@ namespace ecaldqm { MESet::iterator qEnd(meQuality.end()); MESet::const_iterator pItr(sPedestal); - MESet::const_iterator pLSItr(sPedestalByLS); double maxEB(0.), minEB(0.), maxEE(0.), minEE(0.); double rmsMaxEB(0.), rmsMaxEE(0.); for (MESet::iterator qItr(meQuality.beginChannel()); qItr != qEnd; qItr.toNextChannel()) { pItr = qItr; - pLSItr = qItr; DetId id(qItr->getId()); @@ -68,7 +63,6 @@ namespace ecaldqm { rmsThresh = toleranceRMSFwd_; double entries(pItr->getBinEntries()); - double entriesLS(pLSItr->getBinEntries()); if (entries < minChannelEntries_) { qItr->setBinContent(doMask ? kMUnknown : kUnknown); @@ -78,16 +72,13 @@ namespace ecaldqm { } double mean(pItr->getBinContent()); - double meanLS(pLSItr->getBinContent()); double rms(pItr->getBinError() * std::sqrt(entries)); - double rmsLS(pLSItr->getBinError() * std::sqrt(entriesLS)); int dccid(dccId(id)); meMean.fill(dccid, mean); meRMS.fill(dccid, rms); meRMSMap.setBinContent(id, rms); - meRMSMapAllByLumi.setBinContent(id, rmsLS); if (((mean > expectedMean_ + toleranceHigh_) || (mean < expectedMean_ - toleranceLow_)) || rms > rmsThresh) { qItr->setBinContent(doMask ? kMBad : kBad); @@ -99,32 +90,6 @@ namespace ecaldqm { meQualitySummary.setBinContent(id, doMask ? kMGood : kGood); } - // Fill Presample Trend plots: - // Use PedestalByLS which only contains digis from "current" LS - float chStatus(sChStatus.getBinContent(id)); - if (entriesLS < minChannelEntries_) - continue; - if (chStatus != EcalChannelStatusCode::kOk) - continue; // exclude problematic channels - - // Get max/min - // Min is effectively just 0 - if (id.subdetId() == EcalBarrel) { - if (meanLS > maxEB) - maxEB = meanLS; - if (meanLS < minEB) - minEB = meanLS; - if (rmsLS > rmsMaxEB) - rmsMaxEB = rmsLS; - } else { - if (meanLS > maxEE) - maxEE = meanLS; - if (meanLS < minEE) - minEE = meanLS; - if (rmsLS > rmsMaxEE) - rmsMaxEE = rmsLS; - } - } // qItr towerAverage_(meRMSMapAll, meRMSMap, -1.); diff --git a/DQM/EcalMonitorClient/src/SummaryClient.cc b/DQM/EcalMonitorClient/src/SummaryClient.cc index 747cb599c1a72..1786cb60a858d 100644 --- a/DQM/EcalMonitorClient/src/SummaryClient.cc +++ b/DQM/EcalMonitorClient/src/SummaryClient.cc @@ -58,18 +58,6 @@ namespace ecaldqm { } meReportSummary.fill(-1.); - MESet const& sIntegrityByLumi(sources_.at("IntegrityByLumi")); - MESet const& sDesyncByLumi(sources_.at("DesyncByLumi")); - MESet const& sFEByLumi(sources_.at("FEByLumi")); // Does NOT include FE=Disabled - MESet const& sFEStatusErrMapByLumi(sources_.at("FEStatusErrMapByLumi")); // Includes FE=Disabled - - double integrityByLumi[nDCC]; - double rawDataByLumi[nDCC]; - for (unsigned iDCC(0); iDCC < nDCC; ++iDCC) { - integrityByLumi[iDCC] = sIntegrityByLumi.getBinContent(iDCC + 1); - rawDataByLumi[iDCC] = sDesyncByLumi.getBinContent(iDCC + 1) + sFEByLumi.getBinContent(iDCC + 1); - } - MESet& meQualitySummary(MEs_.at("QualitySummary")); MESet& meReportSummaryMap(MEs_.at("ReportSummaryMap")); @@ -118,14 +106,12 @@ namespace ecaldqm { int trigprim(sTriggerPrimitives ? (int)sTriggerPrimitives->getBinContent(id) : kUnknown); int rawdata(sRawData.getBinContent(id)); - double rawdataLS(sFEStatusErrMapByLumi.getBinContent(id)); // Includes FE=Disabled - // If there are no RawData or Integrity errors in this LS, set them back to GOOD //if(integrity == kBad && integrityByLumi[iDCC] == 0.) integrity = kGood; - if (integrity == kBad && integrityByLumi[iDCC] == 0. && !hasMismatchDCC[iDCC]) + if (integrity == kBad && !hasMismatchDCC[iDCC]) integrity = kGood; //if(rawdata == kBad && rawDataByLumi[iDCC] == 0.) rawdata = kGood; - if (rawdata == kBad && rawDataByLumi[iDCC] == 0. && rawdataLS == 0.) + if (rawdata == kBad) rawdata = kGood; // Fill Global Quality Summary @@ -162,7 +148,7 @@ namespace ecaldqm { // Keep running count of good channels in RawData only: Uses LS stats only. // LS-based reports only use RawData as input to save on having to run other workers bool isMasked(meQualitySummary.maskMatches(id, mask, statusManager_)); - if (rawdataLS == 0. || isMasked) { // channel != kBad in rawdata + if (isMasked) { // channel != kBad in rawdata dccGoodRaw[iDCC] += 1.; totalGoodRaw += 1.; } diff --git a/DQM/EcalMonitorClient/src/TimingClient.cc b/DQM/EcalMonitorClient/src/TimingClient.cc index f26a80d1ed033..4e1fe48e34df9 100644 --- a/DQM/EcalMonitorClient/src/TimingClient.cc +++ b/DQM/EcalMonitorClient/src/TimingClient.cc @@ -51,8 +51,6 @@ namespace ecaldqm { MESet const& sTimeAllMap(sources_.at("TimeAllMap")); MESet const& sTimeMap(sources_.at("TimeMap")); - MESet const& sTimeMapByLS(sources_.at("TimeMapByLS")); - MESet const& sChStatus(sources_.at("ChStatus")); uint32_t mask(1 << EcalDQMStatusHelper::PHYSICS_BAD_CHANNEL_WARNING); @@ -60,7 +58,6 @@ namespace ecaldqm { MESet::iterator rItr(meRMSMap); MESet::const_iterator tItr(sTimeMap); - MESet::const_iterator tLSItr(sTimeMapByLS); float EBentries(0.), EEentries(0.); float EBmean(0.), EEmean(0.); @@ -129,29 +126,6 @@ namespace ecaldqm { else qItr->setBinContent(doMask ? kMGood : kGood); - // For Trend plots: - tLSItr = qItr; - float entriesLS(tLSItr->getBinEntries()); - float meanLS(tLSItr->getBinContent()); - float rmsLS(tLSItr->getBinError() * sqrt(entriesLS)); - float chStatus(sChStatus.getBinContent(id)); - - if (entriesLS < minChannelEntries) - continue; - if (chStatus != EcalChannelStatusCode::kOk) - continue; // exclude problematic channels - - // Keep running count of timing mean, rms, and N_hits - if (id.subdetId() == EcalBarrel) { - EBmean += meanLS; - EBrms += rmsLS; - EBentries += entriesLS; - } else { - EEmean += meanLS; - EErms += rmsLS; - EEentries += entriesLS; - } - } // channel loop // Fill Timing Trend plots at each LS diff --git a/DQM/EcalMonitorClient/src/TowerStatusTask.cc b/DQM/EcalMonitorClient/src/TowerStatusTask.cc index 76148ae071c53..a12cc7bf18f4d 100644 --- a/DQM/EcalMonitorClient/src/TowerStatusTask.cc +++ b/DQM/EcalMonitorClient/src/TowerStatusTask.cc @@ -40,54 +40,6 @@ namespace ecaldqm { throw cms::Exception("InvalidConfiguration") << "Nothing to do in TowerStatusTask"; } - void TowerStatusTask::endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const& _es) { - if (doDAQInfo_) { - std::fill_n(daqStatus_, nDCC, 1.); - - edm::ESHandle daqHndl; - _es.get().get(daqHndl); - if (daqHndl.isValid()) { - for (unsigned id(0); id < EcalTrigTowerDetId::kEBTotalTowers; id++) { - if (daqHndl->barrel(id).getStatusCode() != 0) { - EcalTrigTowerDetId ttid(EcalTrigTowerDetId::detIdFromDenseIndex(id)); - daqStatus_[dccId(ttid) - 1] -= 25. / 1700.; - } - } - for (unsigned id(0); id < EcalScDetId::kSizeForDenseIndexing; id++) { - if (daqHndl->endcap(id).getStatusCode() != 0) { - EcalScDetId scid(EcalScDetId::unhashIndex(id)); - unsigned dccid(dccId(scid)); - daqStatus_[dccid - 1] -= double(scConstituents(scid).size()) / nCrystals(dccid); - } - } - } else - edm::LogWarning("EventSetup") << "EcalDAQTowerStatus record not valid"; - } - - if (doDCSInfo_) { - std::fill_n(dcsStatus_, nDCC, 1.); - - edm::ESHandle dcsHndl; - _es.get().get(dcsHndl); - if (dcsHndl.isValid()) { - for (unsigned id(0); id < EcalTrigTowerDetId::kEBTotalTowers; id++) { - if (dcsHndl->barrel(id).getStatusCode() != 0) { - EcalTrigTowerDetId ttid(EcalTrigTowerDetId::detIdFromDenseIndex(id)); - dcsStatus_[dccId(ttid) - 1] -= 25. / 1700.; - } - } - for (unsigned id(0); id < EcalScDetId::kSizeForDenseIndexing; id++) { - if (dcsHndl->endcap(id).getStatusCode() != 0) { - EcalScDetId scid(EcalScDetId::unhashIndex(id)); - unsigned dccid(dccId(scid)); - dcsStatus_[dccid - 1] -= double(scConstituents(scid).size()) / nCrystals(dccid); - } - } - } else - edm::LogWarning("EventSetup") << "EcalDCSTowerStatus record not valid"; - } - } - void TowerStatusTask::producePlots(ProcessType) { if (doDAQInfo_) producePlotsTask_(daqStatus_, "DAQ"); diff --git a/DQM/EcalMonitorClient/src/TrigPrimClient.cc b/DQM/EcalMonitorClient/src/TrigPrimClient.cc index 406ec472baaaf..53b6d73044513 100644 --- a/DQM/EcalMonitorClient/src/TrigPrimClient.cc +++ b/DQM/EcalMonitorClient/src/TrigPrimClient.cc @@ -38,17 +38,13 @@ namespace ecaldqm { MESet& meTrendTTF4Flags(MEs_.at("TrendTTF4Flags")); MESet const& sTPDigiThrAll(sources_.at("TPDigiThrAll")); - MESetNonObject const& sLHCStatusByLumi(static_cast(sources_.at("LHCStatusByLumi"))); uint32_t mask(1 << EcalDQMStatusHelper::PHYSICS_BAD_CHANNEL_WARNING); // Store # of entries for Occupancy analysis std::vector Nentries(nDCC, 0.); - double currentLHCStatus = sLHCStatusByLumi.getFloatValue(); - bool statsCheckEnabled = - ((currentLHCStatus > 10.5 && currentLHCStatus < 11.5) || - currentLHCStatus < 0); // currentLHCStatus = -1 is the default when no beam info is available + bool statsCheckEnabled = true; for (unsigned iTT(0); iTT < EcalTrigTowerDetId::kSizeForDenseIndexing; iTT++) { EcalTrigTowerDetId ttid(EcalTrigTowerDetId::detIdFromDenseIndex(iTT)); @@ -100,9 +96,7 @@ namespace ecaldqm { // NOT an occupancy plot: only tells you if non-zero TTF4 occupancy was seen // without giving info about how many were seen MESet& meTTF4vMask(MEs_.at("TTF4vMask")); - MESet& meTTF4vMaskByLumi(MEs_.at("TTF4vMaskByLumi")); MESet const& sTTFlags4(sources_.at("TTFlags4")); - MESet const& sTTFlags4ByLumi(sources_.at("TTFlags4ByLumi")); MESet const& sTTMaskMapAll(sources_.at("TTMaskMapAll")); std::vector nWithTTF4(nDCC, @@ -112,33 +106,17 @@ namespace ecaldqm { // Loop over all TTs for (unsigned iTT(0); iTT < EcalTrigTowerDetId::kSizeForDenseIndexing; iTT++) { EcalTrigTowerDetId ttid(EcalTrigTowerDetId::detIdFromDenseIndex(iTT)); - unsigned iDCC(dccId(ttid) - 1); bool isMasked(sTTMaskMapAll.getBinContent(ttid) > 0.); bool hasTTF4(sTTFlags4.getBinContent(ttid) > 0.); - bool hasTTF4InThisLumiSection(sTTFlags4ByLumi.getBinContent(ttid) > 0.); - if (hasTTF4InThisLumiSection) { - nWithTTF4[iDCC]++; - if (ttid.subDet() == EcalBarrel) - nWithTTF4_EB++; - else if (ttid.subDet() == EcalEndcap) - nWithTTF4_EE++; - } if (isMasked) { if (hasTTF4) { meTTF4vMask.setBinContent(ttid, 12); // Masked, has TTF4 } else { meTTF4vMask.setBinContent(ttid, 11); // Masked, no TTF4 } - if (hasTTF4InThisLumiSection) { - meTTF4vMaskByLumi.setBinContent(ttid, 12); // Masked, has TTF4 - } else { - meTTF4vMaskByLumi.setBinContent(ttid, 11); // Masked, no TTF4 - } } else { if (hasTTF4) meTTF4vMask.setBinContent(ttid, 13); // not Masked, has TTF4 - if (hasTTF4InThisLumiSection) - meTTF4vMaskByLumi.setBinContent(ttid, 13); // not Masked, has TTF4 } } // TT loop diff --git a/DQM/EcalMonitorTasks/interface/EcalDQMonitorTask.h b/DQM/EcalMonitorTasks/interface/EcalDQMonitorTask.h index 88e8e0d9e71e0..97a3f322a33d8 100644 --- a/DQM/EcalMonitorTasks/interface/EcalDQMonitorTask.h +++ b/DQM/EcalMonitorTasks/interface/EcalDQMonitorTask.h @@ -15,7 +15,7 @@ namespace edm { class ParameterSetDescription; } // namespace edm -class EcalDQMonitorTask : public DQMOneLumiEDAnalyzer<>, public ecaldqm::EcalDQMonitor { +class EcalDQMonitorTask : public DQMOneEDAnalyzer<>, public ecaldqm::EcalDQMonitor { public: EcalDQMonitorTask(edm::ParameterSet const&); ~EcalDQMonitorTask() override {} @@ -27,8 +27,6 @@ class EcalDQMonitorTask : public DQMOneLumiEDAnalyzer<>, public ecaldqm::EcalDQM private: void dqmEndRun(edm::Run const&, edm::EventSetup const&) override; - void dqmBeginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override; - void dqmEndLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override; void analyze(edm::Event const&, edm::EventSetup const&) override; typedef void (EcalDQMonitorTask::*Processor)(edm::Event const&, @@ -46,10 +44,6 @@ class EcalDQMonitorTask : public DQMOneLumiEDAnalyzer<>, public ecaldqm::EcalDQM std::vector > schedule_; // schedule of collections to run bool allowMissingCollections_; // when true, skip missing collections silently int processedEvents_; - - /* TASK TIME PROFILING */ - time_t lastResetTime_; - float resetInterval_; }; #endif diff --git a/DQM/EcalMonitorTasks/interface/EnergyTask.h b/DQM/EcalMonitorTasks/interface/EnergyTask.h index 65db3519a0fe1..8c3eee45a403d 100644 --- a/DQM/EcalMonitorTasks/interface/EnergyTask.h +++ b/DQM/EcalMonitorTasks/interface/EnergyTask.h @@ -14,8 +14,6 @@ namespace ecaldqm { bool filterRunType(short const*) override; - void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override; - bool analyze(void const*, Collections) override; void runOnRecHits(EcalRecHitCollection const&); diff --git a/DQM/EcalMonitorTasks/interface/IntegrityTask.h b/DQM/EcalMonitorTasks/interface/IntegrityTask.h index 12ea52085dff8..9e1672abe0c1b 100644 --- a/DQM/EcalMonitorTasks/interface/IntegrityTask.h +++ b/DQM/EcalMonitorTasks/interface/IntegrityTask.h @@ -15,8 +15,6 @@ namespace ecaldqm { IntegrityTask(); ~IntegrityTask() override {} - void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override; - bool analyze(void const*, Collections) override; template diff --git a/DQM/EcalMonitorTasks/interface/LaserTask.h b/DQM/EcalMonitorTasks/interface/LaserTask.h index cc92ad773ae1c..a62b9647f607d 100644 --- a/DQM/EcalMonitorTasks/interface/LaserTask.h +++ b/DQM/EcalMonitorTasks/interface/LaserTask.h @@ -21,7 +21,6 @@ namespace ecaldqm { bool filterRunType(short const*) override; void beginRun(edm::Run const&, edm::EventSetup const&) override; - void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override; void beginEvent(edm::Event const&, edm::EventSetup const&) override; bool analyze(void const*, Collections) override; diff --git a/DQM/EcalMonitorTasks/interface/LedTask.h b/DQM/EcalMonitorTasks/interface/LedTask.h index 6b7a33b5b7e6c..7db1bd6b96452 100644 --- a/DQM/EcalMonitorTasks/interface/LedTask.h +++ b/DQM/EcalMonitorTasks/interface/LedTask.h @@ -21,7 +21,6 @@ namespace ecaldqm { bool filterRunType(short const*) override; void beginRun(edm::Run const&, edm::EventSetup const&) override; - void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override; void beginEvent(edm::Event const&, edm::EventSetup const&) override; bool analyze(void const*, Collections) override; @@ -31,8 +30,6 @@ namespace ecaldqm { void runOnPnDigis(EcalPnDiodeDigiCollection const&); void runOnUncalibRecHits(EcalUncalibratedRecHitCollection const&); - void endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override; - private: void setParams(edm::ParameterSet const&) override; diff --git a/DQM/EcalMonitorTasks/interface/OccupancyTask.h b/DQM/EcalMonitorTasks/interface/OccupancyTask.h index 2ab22d558bd44..56350bb2325f1 100644 --- a/DQM/EcalMonitorTasks/interface/OccupancyTask.h +++ b/DQM/EcalMonitorTasks/interface/OccupancyTask.h @@ -15,8 +15,6 @@ namespace ecaldqm { bool filterRunType(short const*) override; - void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override; - bool analyze(void const*, Collections) override; void runOnRawData(EcalRawDataCollection const&); diff --git a/DQM/EcalMonitorTasks/interface/PresampleTask.h b/DQM/EcalMonitorTasks/interface/PresampleTask.h index e4bce5d61b7d3..3af282a24666e 100644 --- a/DQM/EcalMonitorTasks/interface/PresampleTask.h +++ b/DQM/EcalMonitorTasks/interface/PresampleTask.h @@ -20,13 +20,11 @@ namespace ecaldqm { void runOnDigis(DigiCollection const&); private: - void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override; void setParams(edm::ParameterSet const&) override; bool doPulseMaxCheck_; int pulseMaxPosition_; int nSamples_; - MESet* mePedestalByLS; }; inline bool PresampleTask::analyze(void const* _p, Collections _collection) { diff --git a/DQM/EcalMonitorTasks/interface/RawDataTask.h b/DQM/EcalMonitorTasks/interface/RawDataTask.h index 5892550bd2d39..5b3b8dff2c571 100644 --- a/DQM/EcalMonitorTasks/interface/RawDataTask.h +++ b/DQM/EcalMonitorTasks/interface/RawDataTask.h @@ -17,7 +17,6 @@ namespace ecaldqm { void addDependencies(DependencySet&) override; void beginRun(edm::Run const&, edm::EventSetup const&) override; - void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override; void beginEvent(edm::Event const&, edm::EventSetup const&) override; bool analyze(void const*, Collections) override; diff --git a/DQM/EcalMonitorTasks/interface/TimingTask.h b/DQM/EcalMonitorTasks/interface/TimingTask.h index fd3d73e6f9f4b..af0e46a06e16b 100644 --- a/DQM/EcalMonitorTasks/interface/TimingTask.h +++ b/DQM/EcalMonitorTasks/interface/TimingTask.h @@ -20,7 +20,6 @@ namespace ecaldqm { void runOnUncalibRecHits(EcalUncalibratedRecHitCollection const&); private: - void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override; void beginEvent(edm::Event const&, edm::EventSetup const&) override; void setParams(edm::ParameterSet const&) override; @@ -34,8 +33,6 @@ namespace ecaldqm { float energyThresholdEEFwd_; float timingVsBXThreshold_; float timeErrorThreshold_; - - MESet* meTimeMapByLS; }; inline bool TimingTask::analyze(void const* _p, Collections _collection) { diff --git a/DQM/EcalMonitorTasks/interface/TrigPrimTask.h b/DQM/EcalMonitorTasks/interface/TrigPrimTask.h index e546b08d774c5..35716c4ad6e50 100644 --- a/DQM/EcalMonitorTasks/interface/TrigPrimTask.h +++ b/DQM/EcalMonitorTasks/interface/TrigPrimTask.h @@ -24,7 +24,6 @@ namespace ecaldqm { void addDependencies(DependencySet&) override; void beginRun(edm::Run const&, edm::EventSetup const&) override; - void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override; void beginEvent(edm::Event const&, edm::EventSetup const&) override; bool analyze(void const*, Collections) override; diff --git a/DQM/EcalMonitorTasks/plugins/EcalDQMonitorTask.cc b/DQM/EcalMonitorTasks/plugins/EcalDQMonitorTask.cc index 1ec17dbfd5cd6..6c803730d8736 100644 --- a/DQM/EcalMonitorTasks/plugins/EcalDQMonitorTask.cc +++ b/DQM/EcalMonitorTasks/plugins/EcalDQMonitorTask.cc @@ -25,13 +25,11 @@ #include EcalDQMonitorTask::EcalDQMonitorTask(edm::ParameterSet const& _ps) - : DQMOneLumiEDAnalyzer(), + : DQMOneEDAnalyzer(), ecaldqm::EcalDQMonitor(_ps), schedule_(), allowMissingCollections_(_ps.getUntrackedParameter("allowMissingCollections")), - processedEvents_(0), - lastResetTime_(0), - resetInterval_(_ps.getUntrackedParameter("resetInterval")) { + processedEvents_(0) { ecaldqm::DependencySet dependencies; std::bitset hasTaskToRun; edm::ConsumesCollector collector(consumesCollector()); @@ -70,10 +68,6 @@ EcalDQMonitorTask::EcalDQMonitorTask(edm::ParameterSet const& _ps) ss << ecaldqm::collectionName[schedule_[iCol].second] << std::endl; edm::LogInfo("EcalDQM") << ss.str(); } - - edm::ParameterSet const& commonParams(_ps.getUntrackedParameterSet("commonParameters")); - if (commonParams.getUntrackedParameter("onlineMode")) - lastResetTime_ = time(nullptr); } /*static*/ @@ -108,9 +102,6 @@ void EcalDQMonitorTask::dqmBeginRun(edm::Run const& _run, edm::EventSetup const& ecaldqmBeginRun(_run, _es); processedEvents_ = 0; - - if (lastResetTime_ != 0) - lastResetTime_ = time(nullptr); } void EcalDQMonitorTask::dqmEndRun(edm::Run const& _run, edm::EventSetup const& _es) { @@ -119,21 +110,6 @@ void EcalDQMonitorTask::dqmEndRun(edm::Run const& _run, edm::EventSetup const& _ executeOnWorkers_([](ecaldqm::DQWorker* worker) { worker->releaseMEs(); }, "releaseMEs", "releasing histograms"); } -void EcalDQMonitorTask::dqmBeginLuminosityBlock(edm::LuminosityBlock const& _lumi, edm::EventSetup const& _es) { - ecaldqmBeginLuminosityBlock(_lumi, _es); -} - -void EcalDQMonitorTask::dqmEndLuminosityBlock(edm::LuminosityBlock const& _lumi, edm::EventSetup const& _es) { - ecaldqmEndLuminosityBlock(_lumi, _es); - - if (lastResetTime_ != 0 && (time(nullptr) - lastResetTime_) / 3600. > resetInterval_) { - if (verbosity_ > 0) - edm::LogInfo("EcalDQM") << moduleName_ << ": Soft-resetting the histograms"; - // TODO: soft-reset is no longer supported. - lastResetTime_ = time(nullptr); - } -} - void EcalDQMonitorTask::analyze(edm::Event const& _evt, edm::EventSetup const& _es) { if (verbosity_ > 2) edm::LogInfo("EcalDQM") << moduleName_ << "::analyze: Run " << _evt.id().run() << " Lumisection " diff --git a/DQM/EcalMonitorTasks/python/EnergyTask_cfi.py b/DQM/EcalMonitorTasks/python/EnergyTask_cfi.py index c90802c5c81d2..e48df427b0ee7 100644 --- a/DQM/EcalMonitorTasks/python/EnergyTask_cfi.py +++ b/DQM/EcalMonitorTasks/python/EnergyTask_cfi.py @@ -18,16 +18,6 @@ btype = cms.untracked.string('SuperCrystal'), description = cms.untracked.string('2D distribution of the mean rec hit energy.') ), - HitMapAllByLumi = cms.untracked.PSet( - path = cms.untracked.string('%(subdet)s/%(prefix)sSummaryClient/%(prefix)sOT%(suffix)s energy summary by lumi'), # In SummaryClient for historical reasons - kind = cms.untracked.string('TProfile2D'), - zaxis = cms.untracked.PSet( - title = cms.untracked.string('energy (GeV)') - ), - otype = cms.untracked.string('Ecal3P'), - btype = cms.untracked.string('SuperCrystal'), - description = cms.untracked.string('2D distribution of the mean tower rec hit energy for this lumisection. The mean is the total tower rechit energy over the number of rechits in the tower.') - ), HitAll = cms.untracked.PSet( path = cms.untracked.string('%(subdet)s/%(prefix)sOccupancyTask/%(prefix)sOT rec hit spectrum%(suffix)s'), kind = cms.untracked.string('TH1F'), diff --git a/DQM/EcalMonitorTasks/python/IntegrityTask_cfi.py b/DQM/EcalMonitorTasks/python/IntegrityTask_cfi.py index 42387f2bd0323..52499c762f405 100644 --- a/DQM/EcalMonitorTasks/python/IntegrityTask_cfi.py +++ b/DQM/EcalMonitorTasks/python/IntegrityTask_cfi.py @@ -18,21 +18,6 @@ btype = cms.untracked.string('SuperCrystal'), description = cms.untracked.string('') ), - MapByLumi = cms.untracked.PSet( - path = cms.untracked.string('%(subdet)s/%(prefix)sIntegrityTask/%(prefix)sIT%(suffix)s integrity errors map by lumi'), - kind = cms.untracked.string('TH2F'), - otype = cms.untracked.string('Ecal3P'), - btype = cms.untracked.string('Crystal'), - description = cms.untracked.string('Integrity error occupancy map for this lumisection. Includes Gain, ChId, GainSwitch, TowerId, and BlockSize errors.') - ), - ByLumi = cms.untracked.PSet( - path = cms.untracked.string('%(subdet)s/%(prefix)sIntegrityTask/%(prefix)sIT weighted integrity errors by lumi'), - kind = cms.untracked.string('TH1F'), - otype = cms.untracked.string('Ecal2P'), - btype = cms.untracked.string('DCC'), - perLumi = cms.untracked.bool(True), - description = cms.untracked.string('Total number of integrity errors for each FED in this lumi section.') - ), Gain = cms.untracked.PSet( # path = cms.untracked.string('Ecal/Errors/Integrity/Gain/'), path = cms.untracked.string('%(subdet)s/%(prefix)sIntegrityTask/Gain/%(prefix)sIT gain %(sm)s'), diff --git a/DQM/EcalMonitorTasks/python/OccupancyTask_cfi.py b/DQM/EcalMonitorTasks/python/OccupancyTask_cfi.py index 60329e73875ec..157df6e64e0a2 100644 --- a/DQM/EcalMonitorTasks/python/OccupancyTask_cfi.py +++ b/DQM/EcalMonitorTasks/python/OccupancyTask_cfi.py @@ -124,13 +124,6 @@ btype = cms.untracked.string('SuperCrystal'), description = cms.untracked.string('Digi occupancy.') ), - DigiAllByLumi = cms.untracked.PSet( - path = cms.untracked.string('%(subdet)s/%(prefix)sOccupancyTask/%(prefix)sOT digi occupancy%(suffix)s by lumi'), - kind = cms.untracked.string('TH2F'), - otype = cms.untracked.string('Ecal3P'), - btype = cms.untracked.string('SuperCrystal'), - description = cms.untracked.string('Digi occupancy for this lumisection.') - ), RecHitThrProjEta = cms.untracked.PSet( path = cms.untracked.string('%(subdet)s/%(prefix)sOccupancyTask/%(prefix)sOT rec hit thr occupancy%(suffix)s projection eta'), kind = cms.untracked.string('TH1F'), @@ -152,13 +145,6 @@ btype = cms.untracked.string('TriggerTower'), description = cms.untracked.string('Occupancy for TP digis with Et > ' + str(tpThreshold) + ' GeV.') ), - TPDigiThrAllByLumi = cms.untracked.PSet( - path = cms.untracked.string('%(subdet)s/%(prefix)sOccupancyTask/%(prefix)sOT TP digi thr occupancy%(suffix)s by lumi'), - kind = cms.untracked.string('TH2F'), - otype = cms.untracked.string('Ecal3P'), - btype = cms.untracked.string('TriggerTower'), - description = cms.untracked.string('TP digi occupancy for this lumisection. Only includes TP digis with Et > ' + str(tpThreshold) + ' GeV.') - ), TPDigiRCT = cms.untracked.PSet( path = cms.untracked.string('EcalBarrel/EBOccupancyTask/TP digi thr occupancy in RCT coordinates'), kind = cms.untracked.string('TH2F'), @@ -173,13 +159,6 @@ btype = cms.untracked.string('SuperCrystal'), description = cms.untracked.string('Occupancy for rec hits with GOOD reconstruction flag and E > ' + str(recHitThreshold) + ' GeV.') ), - RecHitThrAllByLumi = cms.untracked.PSet( - path = cms.untracked.string('%(subdet)s/%(prefix)sOccupancyTask/%(prefix)sOT rec hit thr occupancy%(suffix)s by lumi'), - kind = cms.untracked.string('TH2F'), - otype = cms.untracked.string('Ecal3P'), - btype = cms.untracked.string('SuperCrystal'), - description = cms.untracked.string('Filtered rechit cccupancy for this lumisection. Only includes rechits with GOOD reconstruction flag and E > ' + str(recHitThreshold) + ' GeV.') - ), RecHitAll = cms.untracked.PSet( path = cms.untracked.string('%(subdet)s/%(prefix)sOccupancyTask/%(prefix)sOT rec hit occupancy%(suffix)s'), kind = cms.untracked.string('TH2F'), diff --git a/DQM/EcalMonitorTasks/python/PresampleTask_cfi.py b/DQM/EcalMonitorTasks/python/PresampleTask_cfi.py index 44658da12ba10..938ded3dd6cc6 100644 --- a/DQM/EcalMonitorTasks/python/PresampleTask_cfi.py +++ b/DQM/EcalMonitorTasks/python/PresampleTask_cfi.py @@ -13,13 +13,6 @@ otype = cms.untracked.string('SM'), btype = cms.untracked.string('Crystal'), description = cms.untracked.string('2D distribution of mean presample value.') - ), - PedestalByLS = cms.untracked.PSet( - path = cms.untracked.string('%(subdet)s/%(prefix)sPedestalOnlineTask/Gain12/%(prefix)sPOT pedestal by LS %(sm)s G12'), - kind = cms.untracked.string('TProfile2D'), - otype = cms.untracked.string('SM'), - btype = cms.untracked.string('Crystal'), - description = cms.untracked.string('2D distribution of mean presample value for "current" LS.') ) ) ) diff --git a/DQM/EcalMonitorTasks/python/RawDataTask_cfi.py b/DQM/EcalMonitorTasks/python/RawDataTask_cfi.py index 2955f4802c611..da4aa88e364ef 100644 --- a/DQM/EcalMonitorTasks/python/RawDataTask_cfi.py +++ b/DQM/EcalMonitorTasks/python/RawDataTask_cfi.py @@ -167,14 +167,6 @@ btype = cms.untracked.string('DCC'), description = cms.untracked.string('Number of discrepancies between bunch crossing numbers recorded in the DCC and that in CMS Event.') ), - DesyncByLumi = cms.untracked.PSet( - path = cms.untracked.string('%(subdet)s/%(prefix)sRawDataTask/%(prefix)sRDT FE synchronization errors by lumi'), - kind = cms.untracked.string('TH1F'), - otype = cms.untracked.string('Ecal2P'), - btype = cms.untracked.string('DCC'), - perLumi = cms.untracked.bool(True), - description = cms.untracked.string('Total number of synchronization errors (L1A & BX mismatches) between DCC and FE in this lumi section.') - ), L1ATCC = cms.untracked.PSet( path = cms.untracked.string('%(subdet)s/%(prefix)sRawDataTask/%(prefix)sRDT L1A TCC errors'), kind = cms.untracked.string('TH1F'), @@ -182,14 +174,6 @@ btype = cms.untracked.string('DCC'), description = cms.untracked.string('Number of L1A value mismatches between DCC and TCC.') ), - FEByLumi = cms.untracked.PSet( - path = cms.untracked.string('%(subdet)s/%(prefix)sStatusFlagsTask/FEStatus/%(prefix)sSFT weighted frontend errors by lumi'), - kind = cms.untracked.string('TH1F'), - otype = cms.untracked.string('Ecal2P'), - btype = cms.untracked.string('DCC'), - perLumi = cms.untracked.bool(True), - description = cms.untracked.string('Total number of front-ends in error status in this lumi section.') - ), TrendNSyncErrors = cms.untracked.PSet( path = cms.untracked.string('Ecal/Trends/RawDataTask accumulated number of sync errors'), kind = cms.untracked.string('TH1F'), @@ -277,14 +261,6 @@ otype = cms.untracked.string('SM'), btype = cms.untracked.string('SuperCrystal'), description = cms.untracked.string('FE status counter.') - ), - FEStatusErrMapByLumi = cms.untracked.PSet( - path = cms.untracked.string('%(subdet)s/%(prefix)sStatusFlagsTask/FEStatus/%(prefix)sSFT%(suffix)s front-end status error map by lumi'), - kind = cms.untracked.string('TH2F'), - otype = cms.untracked.string('Ecal3P'), - btype = cms.untracked.string('SuperCrystal'), - perLumi = cms.untracked.bool(True), - description = cms.untracked.string('FE status error occupancy map for this lumisection. Nominal FE status flags such as ENABLED, SUPPRESSED, FIFOFILL, FIFOFULLL1ADESYNC, and FORCEDZS are NOT included.') ) ) ) diff --git a/DQM/EcalMonitorTasks/python/TimingTask_cfi.py b/DQM/EcalMonitorTasks/python/TimingTask_cfi.py index 91b3585bd5e66..a55d3283fac91 100644 --- a/DQM/EcalMonitorTasks/python/TimingTask_cfi.py +++ b/DQM/EcalMonitorTasks/python/TimingTask_cfi.py @@ -61,18 +61,6 @@ btype = cms.untracked.string('Crystal'), description = cms.untracked.string('2D distribution of the mean rec hit timing. Only hits with GOOD or OUT_OF_TIME reconstruction flags and energy above threshold are used. Hits with |t| > ' + str(timeWindow) + ' ns are discarded. The energy thresholds are ' + ('%f and %f' % (energyThresholdEB, energyThresholdEE)) + ' for EB and EE respectively.') ), - TimeMapByLS = cms.untracked.PSet( - path = cms.untracked.string('%(subdet)s/%(prefix)sTimingTask/%(prefix)sTMT timing by LS %(sm)s'), - kind = cms.untracked.string('TProfile2D'), - zaxis = cms.untracked.PSet( - high = cms.untracked.double(timeWindow), - low = cms.untracked.double(-timeWindow), - title = cms.untracked.string('time (ns)') - ), - otype = cms.untracked.string('SM'), - btype = cms.untracked.string('Crystal'), - description = cms.untracked.string('2D distribution of the mean rec hit timing. Only hits with GOOD or OUT_OF_TIME reconstruction flags and energy above threshold are used. Hits with |t| > ' + str(timeWindow) + ' ns are discarded. The energy thresholds are ' + ('%f and %f' % (energyThresholdEB, energyThresholdEE)) + ' for EB and EE respectively.') - ), TimeAll = cms.untracked.PSet( path = cms.untracked.string('%(subdet)s/%(prefix)sTimingTask/%(prefix)sTMT timing 1D summary%(suffix)s'), kind = cms.untracked.string('TH1F'), diff --git a/DQM/EcalMonitorTasks/python/TrigPrimTask_cfi.py b/DQM/EcalMonitorTasks/python/TrigPrimTask_cfi.py index d2a13a723818e..c58deb90a6ce7 100644 --- a/DQM/EcalMonitorTasks/python/TrigPrimTask_cfi.py +++ b/DQM/EcalMonitorTasks/python/TrigPrimTask_cfi.py @@ -177,13 +177,6 @@ btype = cms.untracked.string('TriggerTower'), description = cms.untracked.string('Occupancy for TP digis with TTF=4.') ), - TTFlags4ByLumi = cms.untracked.PSet( - path = cms.untracked.string('%(subdet)s/%(prefix)sTriggerTowerTask/%(prefix)sTTT TTF4 Occupancy%(suffix)s by lumi'), - kind = cms.untracked.string('TH2F'), - otype = cms.untracked.string('Ecal3P'), - btype = cms.untracked.string('TriggerTower'), - description = cms.untracked.string('Occupancy for TP digis with TTF=4, by lumisection.') - ), TTMaskMap = cms.untracked.PSet( path = cms.untracked.string('%(subdet)s/%(prefix)sTriggerTowerTask/TTStatus/%(prefix)sTTT TT Masking Status%(sm)s'), kind = cms.untracked.string('TProfile2D'), @@ -219,19 +212,6 @@ btype = cms.untracked.string('TriggerTower'), description = cms.untracked.string('2D distribution of the trigger primitive Et.') ), - EtSummaryByLumi = cms.untracked.PSet( - path = cms.untracked.string('%(subdet)s/%(prefix)sSummaryClient/%(prefix)sTTT%(suffix)s Et trigger tower summary by lumi'), - kind = cms.untracked.string('TProfile2D'), - zaxis = cms.untracked.PSet( - high = cms.untracked.double(256.0), - nbins = cms.untracked.int32(128), - low = cms.untracked.double(0.0), - title = cms.untracked.string('TP Et') - ), - otype = cms.untracked.string('Ecal3P'), - btype = cms.untracked.string('TriggerTower'), - description = cms.untracked.string('2D distribution of the Trigger Primitives Et for this lumisection.') - ), EtRealMap = cms.untracked.PSet( path = cms.untracked.string('%(subdet)s/%(prefix)sTriggerTowerTask/%(prefix)sTTT Et map Real Digis %(sm)s'), kind = cms.untracked.string('TProfile2D'), @@ -276,13 +256,6 @@ btype = cms.untracked.string('User'), path = cms.untracked.string('%(subdet)s/%(prefix)sTriggerTowerTask/%(prefix)sTTT Real vs Emulated TP Et%(suffix)s'), description = cms.untracked.string('Real data VS emulated TP Et (in-time)') - ), - LHCStatusByLumi = cms.untracked.PSet( - path = cms.untracked.string('Ecal/Trends/LHC status by lumi'), - kind = cms.untracked.string('REAL'), - otype = cms.untracked.string('None'), - btype = cms.untracked.string('User'), - description = cms.untracked.string('LHC Status in this lumisection. The convention for the value is the same as in the plot Info/LhcInfo/beamMode') ) ) ) diff --git a/DQM/EcalMonitorTasks/src/EnergyTask.cc b/DQM/EcalMonitorTasks/src/EnergyTask.cc index 7c3ed6d8e03e0..1ca55978f533c 100644 --- a/DQM/EcalMonitorTasks/src/EnergyTask.cc +++ b/DQM/EcalMonitorTasks/src/EnergyTask.cc @@ -26,15 +26,9 @@ namespace ecaldqm { return false; } - void EnergyTask::beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) { - // Reset by LS plots at beginning of every LS - MEs_.at("HitMapAllByLumi").reset(); - } - void EnergyTask::runOnRecHits(EcalRecHitCollection const& _hits) { MESet& meHitMap(MEs_.at("HitMap")); MESet& meHitMapAll(MEs_.at("HitMapAll")); - MESet& meHitMapAllByLumi(MEs_.at("HitMapAllByLumi")); MESet& meHit(MEs_.at("Hit")); MESet& meHitAll(MEs_.at("HitAll")); @@ -56,7 +50,6 @@ namespace ecaldqm { meHitMap.fill(id, energy); meHitMapAll.fill(id, energy); - meHitMapAllByLumi.fill(id, energy); meHit.fill(id, energy); meHitAll.fill(id, energy); diff --git a/DQM/EcalMonitorTasks/src/IntegrityTask.cc b/DQM/EcalMonitorTasks/src/IntegrityTask.cc index a634a17fb127c..7ad5fdb605266 100644 --- a/DQM/EcalMonitorTasks/src/IntegrityTask.cc +++ b/DQM/EcalMonitorTasks/src/IntegrityTask.cc @@ -6,12 +6,6 @@ namespace ecaldqm { IntegrityTask::IntegrityTask() : DQWorkerTask() {} - void IntegrityTask::beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) { - // Reset by LS plots at beginning of every LS - MEs_.at("MapByLumi").reset(); - MEs_.at("ByLumi").reset(); - } - template void IntegrityTask::runOnDetIdCollection(IDCollection const& _ids, Collections _collection) { // Collection is empty if there are no errors @@ -36,18 +30,13 @@ namespace ecaldqm { return; } - MESet& meMapByLumi(MEs_.at("MapByLumi")); - MESet& meByLumi(MEs_.at("ByLumi")); MESet& meTotal(MEs_.at("Total")); MESet& meTrendNErrors(MEs_.at("TrendNErrors")); std::for_each(_ids.begin(), _ids.end(), [&](typename IDCollection::value_type const& id) { set->fill(id); int dccid(dccId(id)); - meByLumi.fill(dccid); meTotal.fill(dccid); - // Fill Integrity Errors Map with channel errors for this lumi - meMapByLumi.fill(id); meTrendNErrors.fill(double(timestamp_.iLumi), 1.); }); @@ -70,8 +59,6 @@ namespace ecaldqm { return; } - MESet& meMapByLumi(MEs_.at("MapByLumi")); - MESet& meByLumi(MEs_.at("ByLumi")); MESet& meTotal(MEs_.at("Total")); MESet& meTrendNErrors(MEs_.at("TrendNErrors")); @@ -84,13 +71,7 @@ namespace ecaldqm { nCrystals = chIds.size(); else nCrystals = 25.; - meByLumi.fill(dccid, nCrystals); meTotal.fill(dccid, nCrystals); - // Fill Integrity Errors Map with tower errors for this lumi - // Since binned by crystal for compatibility with channel errors, - // fill with constituent channels of tower - for (std::vector::iterator chItr(chIds.begin()); chItr != chIds.end(); ++chItr) - meMapByLumi.fill(*chItr); meTrendNErrors.fill(double(timestamp_.iLumi), nCrystals); }); diff --git a/DQM/EcalMonitorTasks/src/LaserTask.cc b/DQM/EcalMonitorTasks/src/LaserTask.cc index e73a097bbeb86..c78ef92a9095b 100644 --- a/DQM/EcalMonitorTasks/src/LaserTask.cc +++ b/DQM/EcalMonitorTasks/src/LaserTask.cc @@ -55,11 +55,6 @@ namespace ecaldqm { void LaserTask::beginRun(edm::Run const&, edm::EventSetup const&) { emptyLS_ = 0; } - void LaserTask::beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) { - if (++emptyLS_ > emptyLSLimit_) - emptyLS_ = -1; - } - void LaserTask::beginEvent(edm::Event const& _evt, edm::EventSetup const&) { pnAmp_.clear(); } void LaserTask::runOnRawData(EcalRawDataCollection const& _rawData) { diff --git a/DQM/EcalMonitorTasks/src/LedTask.cc b/DQM/EcalMonitorTasks/src/LedTask.cc index 3f354fa71504e..d28adfb605e6d 100644 --- a/DQM/EcalMonitorTasks/src/LedTask.cc +++ b/DQM/EcalMonitorTasks/src/LedTask.cc @@ -55,12 +55,6 @@ namespace ecaldqm { void LedTask::beginRun(edm::Run const&, edm::EventSetup const&) { emptyLS_ = 0; } - void LedTask::beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) { - isemptyLS = 0; - if (emptyLS_ + 1 > emptyLSLimit_) - emptyLS_ = -1; - } - void LedTask::beginEvent(edm::Event const&, edm::EventSetup const&) { pnAmp_.clear(); } void LedTask::runOnRawData(EcalRawDataCollection const& _rawData) { @@ -332,10 +326,5 @@ namespace ecaldqm { } } - void LedTask::endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) { - if (isemptyLS == 1) - emptyLS_ += 1; - } - DEFINE_ECALDQM_WORKER(LedTask); } // namespace ecaldqm diff --git a/DQM/EcalMonitorTasks/src/OccupancyTask.cc b/DQM/EcalMonitorTasks/src/OccupancyTask.cc index aedc914de1d19..88e02581fba42 100644 --- a/DQM/EcalMonitorTasks/src/OccupancyTask.cc +++ b/DQM/EcalMonitorTasks/src/OccupancyTask.cc @@ -25,13 +25,6 @@ namespace ecaldqm { return false; } - void OccupancyTask::beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) { - // Reset by LS plots at beginning of every LS - MEs_.at("DigiAllByLumi").reset(); - MEs_.at("TPDigiThrAllByLumi").reset(); - MEs_.at("RecHitThrAllByLumi").reset(); - } - void OccupancyTask::runOnRawData(EcalRawDataCollection const& _dcchs) { MESet& meDCC(MEs_.at("DCC")); @@ -45,7 +38,6 @@ namespace ecaldqm { MESet& meDigiProjEta(MEs_.at("DigiProjEta")); MESet& meDigiProjPhi(MEs_.at("DigiProjPhi")); MESet& meDigiAll(MEs_.at("DigiAll")); - MESet& meDigiAllByLumi(MEs_.at("DigiAllByLumi")); MESet& meDigiDCC(MEs_.at("DigiDCC")); MESet& meDigi1D(MEs_.at("Digi1D")); MESet& meTrendNDigi(MEs_.at("TrendNDigi")); @@ -56,7 +48,6 @@ namespace ecaldqm { meDigiProjEta.fill(id); meDigiProjPhi.fill(id); meDigiAll.fill(id); - meDigiAllByLumi.fill(id); meDigiDCC.fill(id); }); @@ -71,7 +62,6 @@ namespace ecaldqm { // MESet& meTPDigiProjPhi(MEs_.at("TPDigiProjPhi")); MESet& meTPDigiRCT(MEs_.at("TPDigiRCT")); MESet& meTPDigiThrAll(MEs_.at("TPDigiThrAll")); - MESet& meTPDigiThrAllByLumi(MEs_.at("TPDigiThrAllByLumi")); MESet& meTPDigiThrProjEta(MEs_.at("TPDigiThrProjEta")); MESet& meTPDigiThrProjPhi(MEs_.at("TPDigiThrProjPhi")); MESet& meTrendNTPDigi(MEs_.at("TrendNTPDigi")); @@ -88,7 +78,6 @@ namespace ecaldqm { meTPDigiThrProjEta.fill(id); meTPDigiThrProjPhi.fill(id); meTPDigiThrAll.fill(id); - meTPDigiThrAllByLumi.fill(id); meTPDigiRCT.fill(id); if (id.subDet() == EcalBarrel) nFilteredEB += 1.; @@ -106,7 +95,6 @@ namespace ecaldqm { MESet& meRecHitProjEta(MEs_.at("RecHitProjEta")); MESet& meRecHitProjPhi(MEs_.at("RecHitProjPhi")); MESet& meRecHitThrAll(MEs_.at("RecHitThrAll")); - MESet& meRecHitThrAllByLumi(MEs_.at("RecHitThrAllByLumi")); MESet& meRecHitThrmvp(MEs_.at("RecHitThrmvp")); MESet& meRecHitThrpm(MEs_.at("RecHitThrpm")); MESet& meRecHitThrProjEta(MEs_.at("RecHitThrProjEta")); @@ -130,7 +118,6 @@ namespace ecaldqm { meRecHitThrProjEta.fill(id); meRecHitThrProjPhi.fill(id); meRecHitThrAll.fill(id); - meRecHitThrAllByLumi.fill(id); nFiltered += 1.; bool isPlusFar(iSubdet == EcalBarrel ? (EBDetId(id).iphi() > 100 && EBDetId(id).iphi() < 280) : zside(id) > 0); if (isPlusFar) diff --git a/DQM/EcalMonitorTasks/src/PresampleTask.cc b/DQM/EcalMonitorTasks/src/PresampleTask.cc index 5ce6dfea7e069..3a19ca8594a33 100644 --- a/DQM/EcalMonitorTasks/src/PresampleTask.cc +++ b/DQM/EcalMonitorTasks/src/PresampleTask.cc @@ -7,8 +7,7 @@ #include "FWCore/ParameterSet/interface/ParameterSet.h" namespace ecaldqm { - PresampleTask::PresampleTask() - : DQWorkerTask(), doPulseMaxCheck_(true), pulseMaxPosition_(0), nSamples_(0), mePedestalByLS(nullptr) {} + PresampleTask::PresampleTask() : DQWorkerTask(), doPulseMaxCheck_(true), pulseMaxPosition_(0), nSamples_(0) {} void PresampleTask::setParams(edm::ParameterSet const& _params) { doPulseMaxCheck_ = _params.getUntrackedParameter("doPulseMaxCheck"); @@ -28,15 +27,6 @@ namespace ecaldqm { return false; } - void PresampleTask::beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) { - // Fill separate MEs with only 10 LSs worth of stats - // Used to correctly fill Presample Trend plots: - // 1 pt:10 LS in Trend plots - mePedestalByLS = &MEs_.at("PedestalByLS"); - if (timestamp_.iLumi % 10 == 0) - mePedestalByLS->reset(); - } - template void PresampleTask::runOnDigis(DigiCollection const& _digis) { MESet& mePedestal(MEs_.at("Pedestal")); // contains cumulative run stats => not suitable for Trend plots @@ -70,7 +60,6 @@ namespace ecaldqm { for (int iSample(0); iSample < nSamples_; ++iSample) { mePedestal.fill(id, double(dataFrame.sample(iSample).adc())); - mePedestalByLS->fill(id, double(dataFrame.sample(iSample).adc())); } } // _digis loop diff --git a/DQM/EcalMonitorTasks/src/RawDataTask.cc b/DQM/EcalMonitorTasks/src/RawDataTask.cc index d372d8e3700b2..3394a4c1abba4 100644 --- a/DQM/EcalMonitorTasks/src/RawDataTask.cc +++ b/DQM/EcalMonitorTasks/src/RawDataTask.cc @@ -20,13 +20,6 @@ namespace ecaldqm { void RawDataTask::beginRun(edm::Run const& _run, edm::EventSetup const&) { runNumber_ = _run.run(); } - void RawDataTask::beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) { - // Reset by LS plots at beginning of every LS - MEs_.at("DesyncByLumi").reset(); - MEs_.at("FEByLumi").reset(); - MEs_.at("FEStatusErrMapByLumi").reset(); - } - void RawDataTask::beginEvent(edm::Event const& _evt, edm::EventSetup const&) { orbit_ = _evt.orbitNumber() & 0xffffffff; bx_ = _evt.bunchCrossing() & 0xfff; @@ -71,10 +64,7 @@ namespace ecaldqm { MESet& meBXFEInvalid(MEs_.at("BXFEInvalid")); MESet& meL1AFE(MEs_.at("L1AFE")); MESet& meFEStatus(MEs_.at("FEStatus")); - MESet& meFEStatusErrMapByLumi(MEs_.at("FEStatusErrMapByLumi")); - MESet& meDesyncByLumi(MEs_.at("DesyncByLumi")); MESet& meDesyncTotal(MEs_.at("DesyncTotal")); - MESet& meFEByLumi(MEs_.at("FEByLumi")); MESet& meBXTCC(MEs_.at("BXTCC")); MESet& meL1ATCC(MEs_.at("L1ATCC")); MESet& meBXSRP(MEs_.at("BXSRP")); @@ -160,10 +150,6 @@ namespace ecaldqm { DetId id(getElectronicsMap()->dccTowerConstituents(dccId, iFE + 1).at(0)); meFEStatus.fill(id, status); - // Fill FE Status Error Map with error states only - if (status != Enabled && status != Suppressed && status != FIFOFull && status != FIFOFullL1ADesync && - status != ForcedZS) - meFEStatusErrMapByLumi.fill(id, status); switch (status) { case Timeout: @@ -184,12 +170,9 @@ namespace ecaldqm { } if (feDesync > 0.) { - meDesyncByLumi.fill(dccId, feDesync); meDesyncTotal.fill(dccId, feDesync); meTrendNSyncErrors.fill(double(timestamp_.iLumi), feDesync); } - if (statusError > 0.) - meFEByLumi.fill(dccId, statusError); const vector& tccBx(dcchItr->getTCCBx()); const vector& tccL1(dcchItr->getTCCLv1()); diff --git a/DQM/EcalMonitorTasks/src/TimingTask.cc b/DQM/EcalMonitorTasks/src/TimingTask.cc index 8840ed345cf26..16405c832d940 100644 --- a/DQM/EcalMonitorTasks/src/TimingTask.cc +++ b/DQM/EcalMonitorTasks/src/TimingTask.cc @@ -20,8 +20,7 @@ namespace ecaldqm { energyThresholdEE_(0.), energyThresholdEEFwd_(0.), timingVsBXThreshold_(0.), - timeErrorThreshold_(0.), - meTimeMapByLS(nullptr) {} + timeErrorThreshold_(0.) {} void TimingTask::setParams(edm::ParameterSet const& _params) { bxBinEdges_ = onlineMode_ ? _params.getUntrackedParameter >("bxBins") @@ -47,15 +46,6 @@ namespace ecaldqm { return false; } - void TimingTask::beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) { - // Fill separate MEs with only 10 LSs worth of stats - // Used to correctly fill Presample Trend plots: - // 1 pt:10 LS in Trend plots - meTimeMapByLS = &MEs_.at("TimeMapByLS"); - if (timestamp_.iLumi % 10 == 0) - meTimeMapByLS->reset(); - } - void TimingTask::beginEvent(edm::Event const& _evt, edm::EventSetup const& _es) { using namespace std; std::vector::iterator pBin = std::upper_bound(bxBinEdges_.begin(), bxBinEdges_.end(), _evt.bunchCrossing()); @@ -123,7 +113,6 @@ namespace ecaldqm { if (energy > energyThreshold) { meTimeAll.fill(id, time); meTimeMap.fill(id, time); - meTimeMapByLS->fill(id, time); meTime1D.fill(id, time); meTimeAllMap.fill(id, time); } diff --git a/DQM/EcalMonitorTasks/src/TrigPrimTask.cc b/DQM/EcalMonitorTasks/src/TrigPrimTask.cc index 71717336b28c0..e92a1a78fa58a 100644 --- a/DQM/EcalMonitorTasks/src/TrigPrimTask.cc +++ b/DQM/EcalMonitorTasks/src/TrigPrimTask.cc @@ -52,15 +52,6 @@ namespace ecaldqm { // but filled by LS in runOnRealTPs() because MEs are not yet booked at beginRun() _es.get().get(TTStatusRcd); _es.get().get(StripStatusRcd); - } - - void TrigPrimTask::beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) { - // Reset by LS plots at beginning of every LS - MEs_.at("EtSummaryByLumi").reset(); - MEs_.at("TTFlags4ByLumi").reset(); - MEs_.at("LHCStatusByLumi").reset(-1); - - // Reset lhcStatusSet_ to false at the beginning of each LS; when LHC status is set in some event this variable will be set to true lhcStatusSet_ = false; } @@ -69,17 +60,6 @@ namespace ecaldqm { towerReadouts_.clear(); - if (!lhcStatusSet_) { - // Update LHC status once each LS - MESet& meLHCStatusByLumi(static_cast(MEs_.at("LHCStatusByLumi"))); - edm::Handle tcdsData; - _evt.getByToken(lhcStatusInfoRecordToken_, tcdsData); - if (tcdsData.isValid()) { - meLHCStatusByLumi.fill(double(tcdsData->getBST().getBeamMode())); - lhcStatusSet_ = true; - } - } - realTps_ = nullptr; // HLTCaloBit_ = false; @@ -189,14 +169,12 @@ namespace ecaldqm { MESet& meEtReal(MEs_.at("EtReal")); MESet& meEtRealMap(MEs_.at("EtRealMap")); MESet& meEtSummary(MEs_.at("EtSummary")); - MESet& meEtSummaryByLumi(MEs_.at("EtSummaryByLumi")); MESet& meLowIntMap(MEs_.at("LowIntMap")); MESet& meMedIntMap(MEs_.at("MedIntMap")); MESet& meHighIntMap(MEs_.at("HighIntMap")); MESet& meTTFlags(MEs_.at("TTFlags")); MESet& meTTFlagsVsEt(MEs_.at("TTFlagsVsEt")); MESet& meTTFlags4(MEs_.at("TTFlags4")); - MESet& meTTFlags4ByLumi(MEs_.at("TTFlags4ByLumi")); MESet& meTTFMismatch(MEs_.at("TTFMismatch")); MESet& meOccVsBx(MEs_.at("OccVsBx")); @@ -221,7 +199,6 @@ namespace ecaldqm { meEtReal.fill(ttid, et); meEtRealMap.fill(ttid, et); meEtSummary.fill(ttid, et); - meEtSummaryByLumi.fill(ttid, et); int interest(tpItr->ttFlag() & 0x3); @@ -247,7 +224,6 @@ namespace ecaldqm { // which contains info about TT auto-masking if (ttF >= 4) { meTTFlags4.fill(ttid); - meTTFlags4ByLumi.fill(ttid); } if ((ttF == 1 || ttF == 3) && towerReadouts_[ttid.rawId()] != getTrigTowerMap()->constituentsOf(ttid).size()) meTTFMismatch.fill(ttid);