cms-sw · cmsbuild · May 21, 2021 · May 19, 2021 · May 19, 2021 · May 19, 2021
diff --git a/DQM/RPCMonitorClient/interface/RPCDCSSummary.h b/DQM/RPCMonitorClient/interface/RPCDCSSummary.h
@@ -3,6 +3,9 @@
 
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/DQMEDHarvester.h"
+#include "CondFormats/RunInfo/interface/RunInfo.h"
+#include "CondFormats/RunInfo/interface/RunSummary.h"
+#include "CondFormats/DataRecord/interface/RunSummaryRcd.h"
 #include <map>
 
 class RPCDCSSummary : public DQMEDHarvester {
@@ -27,6 +30,8 @@ class RPCDCSSummary : public DQMEDHarvester {
   void myBooker(DQMStore::IBooker &);
   void checkDCSbit(edm::EventSetup const &);
 
+  edm::ESGetToken<RunInfo, RunInfoRcd> runInfoToken_;
+
   bool init_;
   double defaultValue_;
 

diff --git a/DQM/RPCMonitorClient/interface/RPCDaqInfo.h b/DQM/RPCMonitorClient/interface/RPCDaqInfo.h
@@ -8,6 +8,9 @@
 #include "FWCore/ServiceRegistry/interface/Service.h"
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/DQMEDHarvester.h"
+#include "CondFormats/RunInfo/interface/RunInfo.h"
+#include "CondFormats/RunInfo/interface/RunSummary.h"
+#include "CondFormats/DataRecord/interface/RunSummaryRcd.h"
 
 class RPCDaqInfo : public DQMEDHarvester {
 public:
@@ -25,6 +28,8 @@ class RPCDaqInfo : public DQMEDHarvester {
 private:
   void myBooker(DQMStore::IBooker &);
 
+  edm::ESGetToken<RunInfo, RunInfoRcd> runInfoToken_;
+
   bool init_;
 
   MonitorElement *DaqFraction_;

diff --git a/DQM/RPCMonitorClient/interface/RPCDataCertification.h b/DQM/RPCMonitorClient/interface/RPCDataCertification.h
@@ -4,6 +4,9 @@
 #include "FWCore/ServiceRegistry/interface/Service.h"
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/DQMEDHarvester.h"
+#include "CondFormats/RunInfo/interface/RunInfo.h"
+#include "CondFormats/RunInfo/interface/RunSummary.h"
+#include "CondFormats/DataRecord/interface/RunSummaryRcd.h"
 
 class RPCDataCertification : public DQMEDHarvester {
 public:
@@ -25,6 +28,8 @@ class RPCDataCertification : public DQMEDHarvester {
   void myBooker(DQMStore::IBooker&);
   void checkFED(edm::EventSetup const&);
 
+  edm::ESGetToken<RunInfo, RunInfoRcd> runInfoToken_;
+
   MonitorElement* CertMap_;
   MonitorElement* totalCertFraction;
   constexpr static int kNWheels = 5;

diff --git a/DQM/RPCMonitorClient/interface/RPCDqmClient.h b/DQM/RPCMonitorClient/interface/RPCDqmClient.h
@@ -6,6 +6,9 @@
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "DQM/RPCMonitorClient/interface/RPCClient.h"
 
+#include "Geometry/RPCGeometry/interface/RPCGeometry.h"
+#include "Geometry/Records/interface/MuonGeometryRecord.h"
+
 #include <string>
 #include <vector>
 
@@ -44,5 +47,7 @@ class RPCDqmClient : public DQMEDHarvester {
   std::vector<RPCClient *> clientModules_;
 
   std::vector<int> clientTag_;
+
+  edm::ESGetToken<RPCGeometry, MuonGeometryRecord> rpcGeomToken_;
 };
 #endif
diff --git a/DQM/RPCMonitorClient/interface/RPCEventSummary.h b/DQM/RPCMonitorClient/interface/RPCEventSummary.h
@@ -4,6 +4,9 @@
 #include "FWCore/ServiceRegistry/interface/Service.h"
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/DQMEDHarvester.h"
+#include "CondFormats/RunInfo/interface/RunInfo.h"
+#include "CondFormats/RunInfo/interface/RunSummary.h"
+#include "CondFormats/DataRecord/interface/RunSummaryRcd.h"
 
 #include <string>
 
@@ -25,6 +28,9 @@ class RPCEventSummary : public DQMEDHarvester {
 
 private:
   void clientOperation(DQMStore::IGetter &igetter);
+
+  edm::ESGetToken<RunInfo, RunInfoRcd> runInfoToken_;
+
   std::string eventInfoPath_, prefixDir_;
 
   //  bool tier0_;

diff --git a/DQM/RPCMonitorClient/interface/RPCMonitorLinkSynchro.h b/DQM/RPCMonitorClient/interface/RPCMonitorLinkSynchro.h
@@ -9,6 +9,7 @@
 
 #include "FWCore/Framework/interface/ESWatcher.h"
 #include "FWCore/Utilities/interface/InputTag.h"
+#include "CondFormats/RPCObjects/interface/RPCEMap.h"
 #include "CondFormats/DataRecord/interface/RPCEMapRcd.h"
 
 #include "DQM/RPCMonitorClient/interface/RPCLinkSynchroStat.h"
@@ -40,6 +41,7 @@ class RPCMonitorLinkSynchro : public DQMOneEDAnalyzer<edm::one::WatchLuminosityB
 protected:
   edm::ParameterSet theConfig;
   edm::ESWatcher<RPCEMapRcd> theCablingWatcher;
+  edm::ESGetToken<RPCEMap, RPCEMapRcd> rpcEMapToken_;
   RPCLinkSynchroStat theSynchroStat;
 
   MonitorElement* me_delaySummary;

diff --git a/DQM/RPCMonitorClient/src/RPCDCSSummary.cc b/DQM/RPCMonitorClient/src/RPCDCSSummary.cc
@@ -8,8 +8,6 @@
 //#include "DQMServices/Core/interface/DQMStore.h"
 
 //CondFormats
-#include "CondFormats/RunInfo/interface/RunInfo.h"
-#include "CondFormats/DataRecord/interface/RunSummaryRcd.h"
 
 RPCDCSSummary::RPCDCSSummary(const edm::ParameterSet& ps) {
   numberOfDisks_ = ps.getUntrackedParameter<int>("NumberOfEndcapDisks", 4);
@@ -22,6 +20,8 @@ RPCDCSSummary::RPCDCSSummary(const edm::ParameterSet& ps) {
   NumberOfFeds_ = FEDRange_.second - FEDRange_.first + 1;
   init_ = false;
   defaultValue_ = 1.;
+
+  runInfoToken_ = esConsumes<edm::Transition::EndLuminosityBlock>();
 }
 
 RPCDCSSummary::~RPCDCSSummary() {}
@@ -52,9 +52,8 @@ void RPCDCSSummary::checkDCSbit(edm::EventSetup const& setup) {
   if (auto runInfoRec = setup.tryToGet<RunInfoRcd>()) {
     defaultValue_ = -1.;
     //get fed summary information
-    edm::ESHandle<RunInfo> sumFED;
-    runInfoRec->get(sumFED);
-    std::vector<int> FedsInIds = sumFED->m_fed_in;
+    auto sumFED = runInfoRec->get(runInfoToken_);
+    const std::vector<int> FedsInIds = sumFED.m_fed_in;
     unsigned int f = 0;
     bool flag = false;
     while (!flag && f < FedsInIds.size()) {

diff --git a/DQM/RPCMonitorClient/src/RPCDaqInfo.cc b/DQM/RPCMonitorClient/src/RPCDaqInfo.cc
@@ -1,8 +1,5 @@
 #include "DQM/RPCMonitorClient/interface/RPCDaqInfo.h"
 #include "DataFormats/FEDRawData/interface/FEDNumbering.h"
-#include "CondFormats/RunInfo/interface/RunInfo.h"
-#include "CondFormats/RunInfo/interface/RunSummary.h"
-#include "CondFormats/DataRecord/interface/RunSummaryRcd.h"
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 
@@ -14,6 +11,8 @@ RPCDaqInfo::RPCDaqInfo(const edm::ParameterSet& ps) {
 
   numberOfDisks_ = ps.getUntrackedParameter<int>("NumberOfEndcapDisks", 4);
 
+  runInfoToken_ = esConsumes<edm::Transition::EndLuminosityBlock>();
+
   init_ = false;
 }
 
@@ -29,9 +28,8 @@ void RPCDaqInfo::dqmEndLuminosityBlock(DQMStore::IBooker& ibooker,
 
   if (auto runInfoRec = iSetup.tryToGet<RunInfoRcd>()) {
     //get fed summary information
-    edm::ESHandle<RunInfo> sumFED;
-    runInfoRec->get(sumFED);
-    std::vector<int> FedsInIds = sumFED->m_fed_in;
+    auto sumFED = runInfoRec->get(runInfoToken_);
+    const std::vector<int> FedsInIds = sumFED.m_fed_in;
 
     int FedCount = 0;
 

diff --git a/DQM/RPCMonitorClient/src/RPCDataCertification.cc b/DQM/RPCMonitorClient/src/RPCDataCertification.cc
@@ -6,9 +6,6 @@
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
 #include "DQMServices/Core/interface/DQMStore.h"
-//CondFormats
-#include "CondFormats/RunInfo/interface/RunInfo.h"
-#include "CondFormats/DataRecord/interface/RunSummaryRcd.h"
 
 RPCDataCertification::RPCDataCertification(const edm::ParameterSet& ps) {
   numberOfDisks_ = ps.getUntrackedParameter<int>("NumberOfEndcapDisks", 4);
@@ -17,6 +14,8 @@ RPCDataCertification::RPCDataCertification(const edm::ParameterSet& ps) {
   NumberOfFeds_ = FEDRange_.second - FEDRange_.first + 1;
   offlineDQM_ = ps.getUntrackedParameter<bool>("OfflineDQM", true);
 
+  runInfoToken_ = esConsumes<edm::Transition::EndLuminosityBlock>();
+
   init_ = false;
   defaultValue_ = 1.;
 }
@@ -50,9 +49,8 @@ void RPCDataCertification::checkFED(edm::EventSetup const& setup) {
   if (auto runInfoRec = setup.tryToGet<RunInfoRcd>()) {
     defaultValue = -1;
     //get fed summary information
-    edm::ESHandle<RunInfo> sumFED;
-    runInfoRec->get(sumFED);
-    std::vector<int> FedsInIds = sumFED->m_fed_in;
+    auto sumFED = runInfoRec->get(runInfoToken_);
+    const std::vector<int> FedsInIds = sumFED.m_fed_in;
     unsigned int f = 0;
     bool flag = false;
     while (!flag && f < FedsInIds.size()) {

diff --git a/DQM/RPCMonitorClient/src/RPCDqmClient.cc b/DQM/RPCMonitorClient/src/RPCDqmClient.cc
@@ -11,7 +11,6 @@
 #include "DQM/RPCMonitorClient/interface/RPCOccupancyTest.h"
 #include "DQM/RPCMonitorClient/interface/RPCNoisyStripTest.h"
 //Geometry
-#include "Geometry/RPCGeometry/interface/RPCGeometry.h"
 #include "Geometry/RPCGeometry/interface/RPCGeomServ.h"
 #include "Geometry/Records/interface/MuonGeometryRecord.h"
 //Framework
@@ -49,6 +48,8 @@ RPCDqmClient::RPCDqmClient(const edm::ParameterSet& parameters_) {
 
   //clear counters
   lumiCounter_ = 0;
+
+  rpcGeomToken_ = esConsumes<edm::Transition::EndLuminosityBlock>();
 }
 
 RPCDqmClient::~RPCDqmClient() {}
@@ -180,8 +181,7 @@ void RPCDqmClient::getMonitorElements(DQMStore::IGetter& igetter) {
 void RPCDqmClient::getRPCdetId(const edm::EventSetup& eventSetup) {
   myDetIds_.clear();
 
-  edm::ESHandle<RPCGeometry> rpcGeo;
-  eventSetup.get<MuonGeometryRecord>().get(rpcGeo);
+  auto rpcGeo = eventSetup.getHandle(rpcGeomToken_);
 
   for (auto& det : rpcGeo->dets()) {
     const RPCChamber* ch = dynamic_cast<const RPCChamber*>(det);

diff --git a/DQM/RPCMonitorClient/src/RPCEventSummary.cc b/DQM/RPCMonitorClient/src/RPCEventSummary.cc
@@ -2,9 +2,6 @@
 #include <sstream>
 
 #include <DQM/RPCMonitorClient/interface/RPCEventSummary.h>
-//CondFormats
-#include "CondFormats/RunInfo/interface/RunInfo.h"
-#include "CondFormats/DataRecord/interface/RunSummaryRcd.h"
 // Framework
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 //#include "FWCore/Framework/interface/LuminosityBlock.h"
@@ -36,6 +33,8 @@ RPCEventSummary::RPCEventSummary(const edm::ParameterSet& ps) {
   NumberOfFeds_ = FEDRange_.second - FEDRange_.first + 1;
 
   offlineDQM_ = ps.getUntrackedParameter<bool>("OfflineDQM", true);
+
+  runInfoToken_ = esConsumes<edm::Transition::EndLuminosityBlock>();
 }
 
 RPCEventSummary::~RPCEventSummary() { edm::LogVerbatim("rpceventsummary") << "[RPCEventSummary]: Destructor "; }
@@ -63,9 +62,8 @@ void RPCEventSummary::dqmEndLuminosityBlock(DQMStore::IBooker& ibooker,
     if (auto runInfoRec = setup.tryToGet<RunInfoRcd>()) {
       defaultValue = -1;
       //get fed summary information
-      edm::ESHandle<RunInfo> sumFED;
-      runInfoRec->get(sumFED);
-      std::vector<int> FedsInIds = sumFED->m_fed_in;
+      auto sumFED = runInfoRec->get(runInfoToken_);
+      const std::vector<int> FedsInIds = sumFED.m_fed_in;
       unsigned int f = 0;
       isIn_ = false;
       while (!isIn_ && f < FedsInIds.size()) {

diff --git a/DQM/RPCMonitorClient/src/RPCMonitorLinkSynchro.cc b/DQM/RPCMonitorClient/src/RPCMonitorLinkSynchro.cc
@@ -10,7 +10,6 @@
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/ESTransientHandle.h"
 
-#include "CondFormats/RPCObjects/interface/RPCEMap.h"
 #include "CondFormats/RPCObjects/interface/RPCReadOutMapping.h"
 
 RPCMonitorLinkSynchro::RPCMonitorLinkSynchro(const edm::ParameterSet& cfg)
@@ -20,6 +19,7 @@ RPCMonitorLinkSynchro::RPCMonitorLinkSynchro(const edm::ParameterSet& cfg)
 {
   rpcRawSynchroProdItemTag_ =
       consumes<RPCRawSynchro::ProdItem>(cfg.getParameter<edm::InputTag>("rpcRawSynchroProdItemTag"));
+  rpcEMapToken_ = esConsumes<edm::Transition::BeginRun>();
 }
 
 RPCMonitorLinkSynchro::~RPCMonitorLinkSynchro() {}
@@ -31,8 +31,7 @@ void RPCMonitorLinkSynchro::endLuminosityBlock(const edm::LuminosityBlock& ls, c
 
 void RPCMonitorLinkSynchro::dqmBeginRun(const edm::Run& r, const edm::EventSetup& es) {
   if (theCablingWatcher.check(es)) {
-    edm::ESTransientHandle<RPCEMap> readoutMapping;
-    es.get<RPCEMapRcd>().get(readoutMapping);
+    edm::ESTransientHandle<RPCEMap> readoutMapping = es.getTransientHandle(rpcEMapToken_);
     std::unique_ptr<RPCReadOutMapping const> cabling{readoutMapping->convert()};
     edm::LogInfo("RPCMonitorLinkSynchro")
         << "RPCMonitorLinkSynchro - record has CHANGED!!, read map, VERSION: " << cabling->version();

diff --git a/DQM/RPCMonitorDigi/interface/RPCMonitorDigi.h b/DQM/RPCMonitorDigi/interface/RPCMonitorDigi.h
@@ -9,6 +9,7 @@
 #include "DQMServices/Core/interface/DQMStore.h"
 
 #include "Geometry/RPCGeometry/interface/RPCGeometry.h"
+#include "Geometry/Records/interface/MuonGeometryRecord.h"
 #include "DataFormats/Scalers/interface/DcsStatus.h"
 #include "DataFormats/MuonDetId/interface/RPCDetId.h"
 #include "DataFormats/RPCRecHit/interface/RPCRecHitCollection.h"
@@ -76,6 +77,8 @@ class RPCMonitorDigi : public DQMEDAnalyzer {
   edm::EDGetTokenT<reco::CandidateView> muonLabel_;
   edm::EDGetTokenT<RPCRecHitCollection> rpcRecHitLabel_;
   edm::EDGetTokenT<DcsStatusCollection> scalersRawToDigiLabel_;
+
+  edm::ESGetToken<RPCGeometry, MuonGeometryRecord> rpcGeomToken_;
 };
 
 #endif
diff --git a/DQM/RPCMonitorDigi/src/RPCMonitorDigi.cc b/DQM/RPCMonitorDigi/src/RPCMonitorDigi.cc
@@ -1,7 +1,6 @@
 #include "DQM/RPCMonitorDigi/interface/RPCMonitorDigi.h"
 #include "DQM/RPCMonitorDigi/interface/utils.h"
 
-#include "Geometry/Records/interface/MuonGeometryRecord.h"
 #include "Geometry/CommonDetUnit/interface/GeomDet.h"
 #include "Geometry/RPCGeometry/interface/RPCGeomServ.h"
 #include "Geometry/RPCGeometry/interface/RPCGeometry.h"
@@ -38,19 +37,19 @@ RPCMonitorDigi::RPCMonitorDigi(const edm::ParameterSet& pset)
 
   noiseFolder_ = pset.getUntrackedParameter<std::string>("NoiseFolder", "AllHits");
   muonFolder_ = pset.getUntrackedParameter<std::string>("MuonFolder", "Muon");
+
+  rpcGeomToken_ = esConsumes<edm::Transition::BeginRun>();
 }
 
 void RPCMonitorDigi::bookHistograms(DQMStore::IBooker& ibooker, edm::Run const& r, edm::EventSetup const& iSetup) {
   edm::LogInfo("rpcmonitordigi") << "[RPCMonitorDigi]: Begin Run ";
 
   std::set<int> disk_set, ring_set;
-  edm::ESHandle<RPCGeometry> rpcGeoHandle;
-  iSetup.get<MuonGeometryRecord>().get(rpcGeoHandle);
-  const RPCGeometry* rpcGeo = rpcGeoHandle.product();
+  const auto& rpcGeo = iSetup.getData(rpcGeomToken_);
 
   //loop on geometry to book all MEs
   edm::LogInfo("rpcmonitordigi") << "[RPCMonitorDigi]: Booking histograms per roll. ";
-  for (TrackingGeometry::DetContainer::const_iterator it = rpcGeo->dets().begin(); it < rpcGeo->dets().end(); it++) {
+  for (TrackingGeometry::DetContainer::const_iterator it = rpcGeo.dets().begin(); it < rpcGeo.dets().end(); it++) {
     if (dynamic_cast<const RPCChamber*>(*it) != nullptr) {
       const RPCChamber* ch = dynamic_cast<const RPCChamber*>(*it);
       std::vector<const RPCRoll*> roles = (ch->rolls());
@@ -68,16 +67,16 @@ void RPCMonitorDigi::bookHistograms(DQMStore::IBooker& ibooker, edm::Run const&
           RPCGeomServ rpcsrv(rpcId);
           std::string nameID = rpcsrv.name();
           if (useMuonDigis_)
-            bookRollME(ibooker, rpcId, rpcGeo, muonFolder_, meMuonCollection[nameID]);
-          bookRollME(ibooker, rpcId, rpcGeo, noiseFolder_, meNoiseCollection[nameID]);
+            bookRollME(ibooker, rpcId, &rpcGeo, muonFolder_, meMuonCollection[nameID]);
+          bookRollME(ibooker, rpcId, &rpcGeo, noiseFolder_, meNoiseCollection[nameID]);
         }
       } else {
         RPCDetId rpcId = roles[0]->id();  //any roll would do - here I just take the first one
         RPCGeomServ rpcsrv(rpcId);
         std::string nameID = rpcsrv.chambername();
         if (useMuonDigis_)
-          bookRollME(ibooker, rpcId, rpcGeo, muonFolder_, meMuonCollection[nameID]);
-        bookRollME(ibooker, rpcId, rpcGeo, noiseFolder_, meNoiseCollection[nameID]);
+          bookRollME(ibooker, rpcId, &rpcGeo, muonFolder_, meMuonCollection[nameID]);
+        bookRollME(ibooker, rpcId, &rpcGeo, noiseFolder_, meNoiseCollection[nameID]);
         if (rpcId.region() != 0) {
           disk_set.insert(rpcId.station());
           ring_set.insert(rpcId.ring());