cms-sw · jfernan2 · Jun 11, 2020 · Jun 11, 2020 · Jun 11, 2020 · Jun 11, 2020
diff --git a/Configuration/Applications/python/ConfigBuilder.py b/Configuration/Applications/python/ConfigBuilder.py
@@ -2225,12 +2225,12 @@ def prepare(self, doChecking = False):
         self.pythonCfgCode+="from PhysicsTools.PatAlgos.tools.helpers import associatePatAlgosToolsTask\n"
         self.pythonCfgCode+="associatePatAlgosToolsTask(process)\n"
 
-        if self._options.nThreads is not "1":
+        if True:
             self.pythonCfgCode +="\n"
             self.pythonCfgCode +="#Setup FWK for multithreaded\n"
             self.pythonCfgCode +="process.options.numberOfThreads=cms.untracked.uint32("+self._options.nThreads+")\n"
             self.pythonCfgCode +="process.options.numberOfStreams=cms.untracked.uint32("+self._options.nStreams+")\n"
-            self.pythonCfgCode +="process.options.numberOfConcurrentLuminosityBlocks=cms.untracked.uint32("+self._options.nConcurrentLumis+")\n"
+            self.pythonCfgCode +="process.options.numberOfConcurrentLuminosityBlocks=cms.untracked.uint32(2)\n"
             if int(self._options.nConcurrentLumis) > 1:
               self.pythonCfgCode +="if hasattr(process, 'DQMStore'): process.DQMStore.assertLegacySafe=cms.untracked.bool(False)\n"
             self.process.options.numberOfThreads=cms.untracked.uint32(int(self._options.nThreads))

diff --git 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
@@ -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 <typename FuncOnWorker>
     void executeOnWorkers_(FuncOnWorker,

diff --git 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
@@ -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
@@ -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
@@ -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<EcalChannelStatus> chStatus;
 
     float errFractionThreshold_;
   };

diff --git 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
@@ -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<ecaldqm::DQWorkerClient*>(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<ecaldqm::DQWorkerClient*>(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
@@ -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:<br/>0: Channel ok,<br/>1: DAC settings problem, pedestal not in the design range,<br/>2: Channel with no laser, ok elsewhere,<br/>3: Noisy,<br/>4: Very noisy,<br/>5-7: Reserved for more categories of noisy channels,<br/>8: Channel at fixed gain 6 (or 6 and 1),<br/>9: Channel at fixed gain 1,<br/>10: Channel at fixed gain 0 (dead of type this),<br/>11: Non-responding isolated channel (dead of type other),<br/>12: Channel and one or more neigbors not responding (e.g.: in a dead VFE 5x1 channel),<br/>13: Channel in TT with no data link, TP data ok,<br/>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
@@ -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
@@ -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
@@ -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
@@ -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.<br/>GRAY: Masked, no TTF4,<br/>BLACK: Masked, with TTF4,<br/>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.<br/>GRAY: Masked, no TTF4,<br/>BLACK: Masked, with TTF4,<br/>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
@@ -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<MESetChannel const*>(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
@@ -20,20 +20,13 @@ namespace ecaldqm {
     errFractionThreshold_ = _params.getUntrackedParameter<double>("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<EcalChannelStatusRcd>().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 |
                   1 << EcalDQMStatusHelper::TT_SIZE_ERROR);
 
     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
@@ -39,24 +39,19 @@ 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);
 
     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.);