From 35891cc3fd20474f57e00c8c3021dc4a7a271681 Mon Sep 17 00:00:00 2001 From: calderon Date: Wed, 19 May 2021 18:19:25 +0200 Subject: [PATCH 01/13] migrate esConsumes --- DQMOffline/Muon/src/MuonIdDQM.cc | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/DQMOffline/Muon/src/MuonIdDQM.cc b/DQMOffline/Muon/src/MuonIdDQM.cc index 43592ed965d29..9fd4852a28b5f 100644 --- a/DQMOffline/Muon/src/MuonIdDQM.cc +++ b/DQMOffline/Muon/src/MuonIdDQM.cc @@ -1,6 +1,8 @@ #include "DQMOffline/Muon/interface/MuonIdDQM.h" -MuonIdDQM::MuonIdDQM(const edm::ParameterSet& iConfig) { +MuonIdDQM::MuonIdDQM(const edm::ParameterSet& iConfig) + : trackingGeomToken_(esConsumes()) { + inputMuonCollection_ = consumes(iConfig.getParameter("inputMuonCollection")); inputDTRecSegment4DCollection_ = consumes(iConfig.getParameter("inputDTRecSegment4DCollection")); @@ -11,6 +13,8 @@ MuonIdDQM::MuonIdDQM(const edm::ParameterSet& iConfig) { useTrackerMuonsNotGlobalMuons_ = iConfig.getUntrackedParameter("useTrackerMuonsNotGlobalMuons"); useGlobalMuonsNotTrackerMuons_ = iConfig.getUntrackedParameter("useGlobalMuonsNotTrackerMuons"); baseFolder_ = iConfig.getUntrackedParameter("baseFolder"); + + } MuonIdDQM::~MuonIdDQM() {} @@ -130,7 +134,9 @@ void MuonIdDQM::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) iEvent.getByToken(inputMuonCollection_, muonCollectionH_); iEvent.getByToken(inputDTRecSegment4DCollection_, dtSegmentCollectionH_); iEvent.getByToken(inputCSCSegmentCollection_, cscSegmentCollectionH_); - iSetup.get().get(geometry_); + + geometry_ = iSetup.getHandle(trackingGeomToken_); + for (MuonCollection::const_iterator muon = muonCollectionH_->begin(); muon != muonCollectionH_->end(); ++muon) { // trackerMuon == 0; globalMuon == 1; trackerMuon && !globalMuon == 2; globalMuon && !trackerMuon == 3 From 26fb4c4ef884cc5d83606401593858e1c5778544 Mon Sep 17 00:00:00 2001 From: calderon Date: Wed, 19 May 2021 18:19:55 +0200 Subject: [PATCH 02/13] migrate esConsumes --- DQMOffline/Muon/interface/MuonIdDQM.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/DQMOffline/Muon/interface/MuonIdDQM.h b/DQMOffline/Muon/interface/MuonIdDQM.h index f06430971d999..c650fdaa6e9ac 100644 --- a/DQMOffline/Muon/interface/MuonIdDQM.h +++ b/DQMOffline/Muon/interface/MuonIdDQM.h @@ -73,6 +73,8 @@ class MuonIdDQM : public DQMEDAnalyzer { edm::Handle cscSegmentCollectionH_; edm::ESHandle geometry_; + const edm::ESGetToken trackingGeomToken_; + // trackerMuon == 0; globalMuon == 1 MonitorElement* hNumChambers[4]; MonitorElement* hNumMatches[4]; From 0346da22bbcadf408ec883841a5a4d5c7bb8fb36 Mon Sep 17 00:00:00 2001 From: calderon Date: Wed, 19 May 2021 18:39:55 +0200 Subject: [PATCH 03/13] migrate esConsumes --- DQMOffline/Muon/interface/MuonEnergyDepositAnalyzer.h | 7 +++++++ DQMOffline/Muon/src/MuonEnergyDepositAnalyzer.cc | 11 ++++++++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/DQMOffline/Muon/interface/MuonEnergyDepositAnalyzer.h b/DQMOffline/Muon/interface/MuonEnergyDepositAnalyzer.h index b2cf8b7d3e2b3..2f30e15e3cdd2 100644 --- a/DQMOffline/Muon/interface/MuonEnergyDepositAnalyzer.h +++ b/DQMOffline/Muon/interface/MuonEnergyDepositAnalyzer.h @@ -25,6 +25,9 @@ #include "DataFormats/MuonReco/interface/MuonFwd.h" #include "DataFormats/MuonReco/interface/MuonEnergy.h" +#include "TrackingTools/TransientTrack/interface/TransientTrackBuilder.h" +#include "TrackingTools/Records/interface/TransientTrackRecord.h" + class MuonEnergyDepositAnalyzer : public DQMEDAnalyzer { public: /// Constructor @@ -42,6 +45,10 @@ class MuonEnergyDepositAnalyzer : public DQMEDAnalyzer { edm::ParameterSet parameters; edm::EDGetTokenT theMuonCollectionLabel_; + edm::ESHandle theB; + + edm::ESGetToken trasientTrackToken_; + // Switch for verbosity std::string metname; std::string AlgoName; diff --git a/DQMOffline/Muon/src/MuonEnergyDepositAnalyzer.cc b/DQMOffline/Muon/src/MuonEnergyDepositAnalyzer.cc index d709b392546cd..7afa989aa9741 100644 --- a/DQMOffline/Muon/src/MuonEnergyDepositAnalyzer.cc +++ b/DQMOffline/Muon/src/MuonEnergyDepositAnalyzer.cc @@ -21,7 +21,9 @@ using namespace std; using namespace edm; -MuonEnergyDepositAnalyzer::MuonEnergyDepositAnalyzer(const edm::ParameterSet& pSet) { +MuonEnergyDepositAnalyzer::MuonEnergyDepositAnalyzer(const edm::ParameterSet& pSet) + : trasientTrackToken_(esConsumes()) { + parameters = pSet; theMuonCollectionLabel_ = consumes(parameters.getParameter("MuonCollection")); @@ -208,8 +210,11 @@ void MuonEnergyDepositAnalyzer::analyze(const edm::Event& iEvent, const edm::Eve hoS9DepEnergy->Fill(muEnergy.hoS9); // plot for energy tests - edm::ESHandle theB; - iSetup.get().get("TransientTrackBuilder", theB); + + + theB = iSetup.getHandle(trasientTrackToken_); + + reco::TransientTrack TransTrack; if (recoMu->isGlobalMuon()) From e13b3cab728922fc51e347e19bb2e59762f6854c Mon Sep 17 00:00:00 2001 From: calderon Date: Wed, 19 May 2021 19:01:46 +0200 Subject: [PATCH 04/13] migrate esConsumes --- DQMOffline/Muon/interface/GEMOfflineMonitor.h | 5 +++++ DQMOffline/Muon/src/GEMOfflineMonitor.cc | 16 +++++++++++----- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/DQMOffline/Muon/interface/GEMOfflineMonitor.h b/DQMOffline/Muon/interface/GEMOfflineMonitor.h index ad7e4f07f5988..5c31790212399 100644 --- a/DQMOffline/Muon/interface/GEMOfflineMonitor.h +++ b/DQMOffline/Muon/interface/GEMOfflineMonitor.h @@ -8,6 +8,7 @@ #include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h" #include "DataFormats/GEMDigi/interface/GEMDigiCollection.h" #include "DataFormats/GEMRecHit/interface/GEMRecHitCollection.h" +#include "Geometry/Records/interface/MuonGeometryRecord.h" class GEMOfflineMonitor : public GEMOfflineDQMBase { public: @@ -29,6 +30,10 @@ class GEMOfflineMonitor : public GEMOfflineDQMBase { edm::EDGetTokenT digi_token_; edm::EDGetTokenT rechit_token_; + + + const edm::ESGetToken gemToken_; + bool do_digi_occupancy_; bool do_hit_occupancy_; diff --git a/DQMOffline/Muon/src/GEMOfflineMonitor.cc b/DQMOffline/Muon/src/GEMOfflineMonitor.cc index b63af1d1369b8..c3107dc31678b 100644 --- a/DQMOffline/Muon/src/GEMOfflineMonitor.cc +++ b/DQMOffline/Muon/src/GEMOfflineMonitor.cc @@ -4,7 +4,10 @@ #include "Geometry/Records/interface/MuonGeometryRecord.h" #include "Validation/MuonGEMHits/interface/GEMValidationUtils.h" -GEMOfflineMonitor::GEMOfflineMonitor(const edm::ParameterSet& pset) : GEMOfflineDQMBase(pset) { +GEMOfflineMonitor::GEMOfflineMonitor(const edm::ParameterSet& pset) + : GEMOfflineDQMBase(pset), + gemToken_(esConsumes()) { + digi_token_ = consumes(pset.getParameter("digiTag")); rechit_token_ = consumes(pset.getParameter("recHitTag")); do_digi_occupancy_ = pset.getUntrackedParameter("doDigiOccupancy"); @@ -25,8 +28,10 @@ void GEMOfflineMonitor::fillDescriptions(edm::ConfigurationDescriptions& descrip } void GEMOfflineMonitor::bookHistograms(DQMStore::IBooker& ibooker, edm::Run const& run, edm::EventSetup const& setup) { - edm::ESHandle gem; - setup.get().get(gem); + + edm::ESHandle gem; + gem = setup.getHandle(gemToken_); + if (not gem.isValid()) { edm::LogError(log_category_) << "GEMGeometry is invalid" << std::endl; return; @@ -131,8 +136,9 @@ void GEMOfflineMonitor::analyze(const edm::Event& event, const edm::EventSetup& } } - edm::ESHandle gem; - setup.get().get(gem); + edm::ESHandle gem; gem = setup.getHandle(gemToken_); + + if (not gem.isValid()) { edm::LogError(log_category_) << "GEMGeometry is invalid" << std::endl; return; From 1170c9685e16a3affb8ceb0e53fe6ea54611b4d1 Mon Sep 17 00:00:00 2001 From: calderon Date: Wed, 19 May 2021 19:34:45 +0200 Subject: [PATCH 05/13] migrate esConsumes --- .../Muon/interface/GEMEfficiencyAnalyzer.h | 11 +++++++ DQMOffline/Muon/src/GEMEfficiencyAnalyzer.cc | 33 ++++++++++++++----- 2 files changed, 35 insertions(+), 9 deletions(-) diff --git a/DQMOffline/Muon/interface/GEMEfficiencyAnalyzer.h b/DQMOffline/Muon/interface/GEMEfficiencyAnalyzer.h index 32ff4641fe507..42030b2cffb66 100644 --- a/DQMOffline/Muon/interface/GEMEfficiencyAnalyzer.h +++ b/DQMOffline/Muon/interface/GEMEfficiencyAnalyzer.h @@ -18,6 +18,10 @@ #include "DataFormats/MuonReco/interface/MuonSelectors.h" #include "RecoMuon/TrackingTools/interface/MuonServiceProxy.h" #include "TrackingTools/TransientTrack/interface/TransientTrack.h" +#include "TrackingTools/TransientTrack/interface/TransientTrackBuilder.h" +#include "TrackingTools/Records/interface/TransientTrackRecord.h" +#include "Geometry/CommonTopologies/interface/GlobalTrackingGeometry.h" +#include "Geometry/Records/interface/GlobalTrackingGeometryRecord.h" class GEMEfficiencyAnalyzer : public GEMOfflineDQMBase { public: @@ -30,6 +34,8 @@ class GEMEfficiencyAnalyzer : public GEMOfflineDQMBase { void analyze(const edm::Event &event, const edm::EventSetup &eventSetup) override; private: + + struct GEMLayerData { GEMLayerData(Disk::DiskPointer surface, std::vector chambers, int region, int station, int layer) : surface(surface), chambers(chambers), region(region), station(station), layer(layer) {} @@ -37,8 +43,13 @@ class GEMEfficiencyAnalyzer : public GEMOfflineDQMBase { Disk::DiskPointer surface; std::vector chambers; int region, station, layer; + }; + const edm::ESGetToken gemToken_; + const edm::ESGetToken globalGeomToken_; + const edm::ESGetToken trasientTranckToken_; + MonitorElement *bookNumerator1D(DQMStore::IBooker &, MonitorElement *); MonitorElement *bookNumerator2D(DQMStore::IBooker &, MonitorElement *); diff --git a/DQMOffline/Muon/src/GEMEfficiencyAnalyzer.cc b/DQMOffline/Muon/src/GEMEfficiencyAnalyzer.cc index feccaebf41f0d..0f07009b68087 100644 --- a/DQMOffline/Muon/src/GEMEfficiencyAnalyzer.cc +++ b/DQMOffline/Muon/src/GEMEfficiencyAnalyzer.cc @@ -6,13 +6,17 @@ #include "DataFormats/Math/interface/deltaPhi.h" #include "DataFormats/GeometryCommonDetAlgo/interface/ErrorFrameTransformer.h" #include "DataFormats/GeometrySurface/interface/SimpleDiskBounds.h" -#include "Geometry/CommonTopologies/interface/GlobalTrackingGeometry.h" -#include "Geometry/Records/interface/GlobalTrackingGeometryRecord.h" #include "Geometry/CommonTopologies/interface/StripTopology.h" #include "Validation/MuonHits/interface/MuonHitHelper.h" #include "Validation/MuonGEMHits/interface/GEMValidationUtils.h" -GEMEfficiencyAnalyzer::GEMEfficiencyAnalyzer(const edm::ParameterSet& pset) : GEMOfflineDQMBase(pset) { + +GEMEfficiencyAnalyzer::GEMEfficiencyAnalyzer(const edm::ParameterSet& pset) + : GEMOfflineDQMBase(pset), + gemToken_(esConsumes()), + globalGeomToken_(esConsumes()), + trasientTranckToken_(esConsumes()) { + name_ = pset.getUntrackedParameter("name"); folder_ = pset.getUntrackedParameter("folder"); @@ -106,8 +110,11 @@ void GEMEfficiencyAnalyzer::fillDescriptions(edm::ConfigurationDescriptions& des void GEMEfficiencyAnalyzer::bookHistograms(DQMStore::IBooker& ibooker, edm::Run const& run, edm::EventSetup const& isetup) { - edm::ESHandle gem; - isetup.get().get(gem); + + + edm::ESHandle gem; + gem = isetup.getHandle(gemToken_); + if (not gem.isValid()) { edm::LogError(kLogCategory_) << "GEMGeometry is invalid" << std::endl; return; @@ -319,22 +326,30 @@ void GEMEfficiencyAnalyzer::analyze(const edm::Event& event, const edm::EventSet return; } - edm::ESHandle gem; - setup.get().get(gem); + edm::ESHandle gem; + gem = setup.getHandle(gemToken_); + + if (not gem.isValid()) { edm::LogError(kLogCategory_) << "GEMGeometry is invalid" << std::endl; return; } edm::ESHandle global_tracking_geometry; - setup.get().get(global_tracking_geometry); + + global_tracking_geometry = setup.getHandle(globalGeomToken_); + + + + if (not global_tracking_geometry.isValid()) { edm::LogError(kLogCategory_) << "GlobalTrackingGeometry is invalid" << std::endl; return; } edm::ESHandle transient_track_builder; - setup.get().get("TransientTrackBuilder", transient_track_builder); + transient_track_builder=setup.getHandle(trasientTranckToken_); + if (not transient_track_builder.isValid()) { edm::LogError(kLogCategory_) << "TransientTrackRecord is invalid" << std::endl; return; From 5bc610138244eadbd099d69aa1dbe91d2bc90b69 Mon Sep 17 00:00:00 2001 From: calderon Date: Wed, 19 May 2021 20:06:39 +0200 Subject: [PATCH 06/13] migrate esConsumes --- DQMOffline/Muon/interface/CSCOfflineMonitor.h | 4 ++++ DQMOffline/Muon/interface/DTSegmentsTask.h | 2 ++ .../Muon/interface/GEMEfficiencyAnalyzer.h | 17 ++++++------- DQMOffline/Muon/interface/GEMOfflineMonitor.h | 4 +--- .../interface/MuonEnergyDepositAnalyzer.h | 10 ++++---- DQMOffline/Muon/src/CSCOfflineMonitor.cc | 11 ++++++--- DQMOffline/Muon/src/DTSegmentsTask.cc | 5 ++-- DQMOffline/Muon/src/GEMEfficiencyAnalyzer.cc | 24 +++++++------------ DQMOffline/Muon/src/GEMOfflineMonitor.cc | 15 +++++------- .../Muon/src/MuonEnergyDepositAnalyzer.cc | 5 +--- DQMOffline/Muon/src/MuonIdDQM.cc | 8 ++----- 11 files changed, 47 insertions(+), 58 deletions(-) diff --git a/DQMOffline/Muon/interface/CSCOfflineMonitor.h b/DQMOffline/Muon/interface/CSCOfflineMonitor.h index 28752f4786d4f..2a9ce2cd65e4c 100644 --- a/DQMOffline/Muon/interface/CSCOfflineMonitor.h +++ b/DQMOffline/Muon/interface/CSCOfflineMonitor.h @@ -91,6 +91,10 @@ class CSCOfflineMonitor : public DQMEDAnalyzer { edm::EDGetTokenT rh_token; edm::EDGetTokenT se_token; + const edm::ESGetToken cscGeomToken_; + + const edm::ESGetToken hcrateToken_; + // modules void doOccupancies(edm::Handle strips, edm::Handle wires, diff --git a/DQMOffline/Muon/interface/DTSegmentsTask.h b/DQMOffline/Muon/interface/DTSegmentsTask.h index b8b0af5b7c09c..db9136317090e 100644 --- a/DQMOffline/Muon/interface/DTSegmentsTask.h +++ b/DQMOffline/Muon/interface/DTSegmentsTask.h @@ -41,6 +41,8 @@ class DTSegmentsTask : public DQMEDAnalyzer { bool checkNoisyChannels; edm::ParameterSet parameters; + const edm::ESGetToken statusMapToken_; + // the histos std::vector phiHistos; std::vector thetaHistos; diff --git a/DQMOffline/Muon/interface/GEMEfficiencyAnalyzer.h b/DQMOffline/Muon/interface/GEMEfficiencyAnalyzer.h index 42030b2cffb66..4b8a95052fc96 100644 --- a/DQMOffline/Muon/interface/GEMEfficiencyAnalyzer.h +++ b/DQMOffline/Muon/interface/GEMEfficiencyAnalyzer.h @@ -18,10 +18,10 @@ #include "DataFormats/MuonReco/interface/MuonSelectors.h" #include "RecoMuon/TrackingTools/interface/MuonServiceProxy.h" #include "TrackingTools/TransientTrack/interface/TransientTrack.h" -#include "TrackingTools/TransientTrack/interface/TransientTrackBuilder.h" -#include "TrackingTools/Records/interface/TransientTrackRecord.h" -#include "Geometry/CommonTopologies/interface/GlobalTrackingGeometry.h" -#include "Geometry/Records/interface/GlobalTrackingGeometryRecord.h" +#include "TrackingTools/TransientTrack/interface/TransientTrackBuilder.h" +#include "TrackingTools/Records/interface/TransientTrackRecord.h" +#include "Geometry/CommonTopologies/interface/GlobalTrackingGeometry.h" +#include "Geometry/Records/interface/GlobalTrackingGeometryRecord.h" class GEMEfficiencyAnalyzer : public GEMOfflineDQMBase { public: @@ -34,8 +34,6 @@ class GEMEfficiencyAnalyzer : public GEMOfflineDQMBase { void analyze(const edm::Event &event, const edm::EventSetup &eventSetup) override; private: - - struct GEMLayerData { GEMLayerData(Disk::DiskPointer surface, std::vector chambers, int region, int station, int layer) : surface(surface), chambers(chambers), region(region), station(station), layer(layer) {} @@ -43,12 +41,11 @@ class GEMEfficiencyAnalyzer : public GEMOfflineDQMBase { Disk::DiskPointer surface; std::vector chambers; int region, station, layer; - }; - const edm::ESGetToken gemToken_; - const edm::ESGetToken globalGeomToken_; - const edm::ESGetToken trasientTranckToken_; + const edm::ESGetToken gemToken_; + const edm::ESGetToken globalGeomToken_; + const edm::ESGetToken trasientTranckToken_; MonitorElement *bookNumerator1D(DQMStore::IBooker &, MonitorElement *); MonitorElement *bookNumerator2D(DQMStore::IBooker &, MonitorElement *); diff --git a/DQMOffline/Muon/interface/GEMOfflineMonitor.h b/DQMOffline/Muon/interface/GEMOfflineMonitor.h index 5c31790212399..1691cb95d1e87 100644 --- a/DQMOffline/Muon/interface/GEMOfflineMonitor.h +++ b/DQMOffline/Muon/interface/GEMOfflineMonitor.h @@ -30,9 +30,7 @@ class GEMOfflineMonitor : public GEMOfflineDQMBase { edm::EDGetTokenT digi_token_; edm::EDGetTokenT rechit_token_; - - - const edm::ESGetToken gemToken_; + const edm::ESGetToken gemToken_; bool do_digi_occupancy_; bool do_hit_occupancy_; diff --git a/DQMOffline/Muon/interface/MuonEnergyDepositAnalyzer.h b/DQMOffline/Muon/interface/MuonEnergyDepositAnalyzer.h index 2f30e15e3cdd2..2454a5959cb0e 100644 --- a/DQMOffline/Muon/interface/MuonEnergyDepositAnalyzer.h +++ b/DQMOffline/Muon/interface/MuonEnergyDepositAnalyzer.h @@ -25,8 +25,8 @@ #include "DataFormats/MuonReco/interface/MuonFwd.h" #include "DataFormats/MuonReco/interface/MuonEnergy.h" -#include "TrackingTools/TransientTrack/interface/TransientTrackBuilder.h" -#include "TrackingTools/Records/interface/TransientTrackRecord.h" +#include "TrackingTools/TransientTrack/interface/TransientTrackBuilder.h" +#include "TrackingTools/Records/interface/TransientTrackRecord.h" class MuonEnergyDepositAnalyzer : public DQMEDAnalyzer { public: @@ -45,9 +45,9 @@ class MuonEnergyDepositAnalyzer : public DQMEDAnalyzer { edm::ParameterSet parameters; edm::EDGetTokenT theMuonCollectionLabel_; - edm::ESHandle theB; - - edm::ESGetToken trasientTrackToken_; + edm::ESHandle theB; + + edm::ESGetToken trasientTrackToken_; // Switch for verbosity std::string metname; diff --git a/DQMOffline/Muon/src/CSCOfflineMonitor.cc b/DQMOffline/Muon/src/CSCOfflineMonitor.cc index e59ab60258d68..46aefbec512c5 100644 --- a/DQMOffline/Muon/src/CSCOfflineMonitor.cc +++ b/DQMOffline/Muon/src/CSCOfflineMonitor.cc @@ -10,7 +10,9 @@ using namespace std; /////////////////// // CONSTRUCTOR // /////////////////// -CSCOfflineMonitor::CSCOfflineMonitor(const edm::ParameterSet& pset) { +CSCOfflineMonitor::CSCOfflineMonitor(const edm::ParameterSet& pset) + : cscGeomToken_(esConsumes()), + hcrateToken_(esConsumes()) { rd_token = consumes(pset.getParameter("FEDRawDataCollectionTag")); sd_token = consumes(pset.getParameter("stripDigiTag")); wd_token = consumes(pset.getParameter("wireDigiTag")); @@ -817,7 +819,8 @@ void CSCOfflineMonitor::analyze(const edm::Event& event, const edm::EventSetup& // Get the CSC Geometry : edm::ESHandle cscGeom; - eventSetup.get().get(cscGeom); + + cscGeom = eventSetup.getHandle(cscGeomToken_); // Get the RecHits collection : edm::Handle recHits; @@ -1802,7 +1805,9 @@ void CSCOfflineMonitor::doBXMonitor(edm::Handle alcts, // Loop over raw data to get TMBHeader information // Taking code from EventFilter/CSCRawToDigis/CSCDCCUnpacker.cc edm::ESHandle hcrate; - eventSetup.get().get(hcrate); + + hcrate = eventSetup.getHandle(hcrateToken_); + const CSCCrateMap* pcrate = hcrate.product(); // Try to get raw data diff --git a/DQMOffline/Muon/src/DTSegmentsTask.cc b/DQMOffline/Muon/src/DTSegmentsTask.cc index ccfc11b3e417f..e7ee456286768 100644 --- a/DQMOffline/Muon/src/DTSegmentsTask.cc +++ b/DQMOffline/Muon/src/DTSegmentsTask.cc @@ -24,7 +24,8 @@ using namespace edm; using namespace std; -DTSegmentsTask::DTSegmentsTask(const edm::ParameterSet& pset) { +DTSegmentsTask::DTSegmentsTask(const edm::ParameterSet& pset) + : statusMapToken_(esConsumes()) { debug = pset.getUntrackedParameter("debug", false); parameters = pset; @@ -112,7 +113,7 @@ void DTSegmentsTask::analyze(const edm::Event& event, const edm::EventSetup& set // bool checkNoisyChannels = parameters.getUntrackedParameter("checkNoisyChannels",false); ESHandle statusMap; if (checkNoisyChannels) { - setup.get().get(statusMap); + statusMap = setup.getHandle(statusMapToken_); } // Get the 4D segment collection from the event diff --git a/DQMOffline/Muon/src/GEMEfficiencyAnalyzer.cc b/DQMOffline/Muon/src/GEMEfficiencyAnalyzer.cc index 0f07009b68087..a6032ba953c3e 100644 --- a/DQMOffline/Muon/src/GEMEfficiencyAnalyzer.cc +++ b/DQMOffline/Muon/src/GEMEfficiencyAnalyzer.cc @@ -10,13 +10,11 @@ #include "Validation/MuonHits/interface/MuonHitHelper.h" #include "Validation/MuonGEMHits/interface/GEMValidationUtils.h" - -GEMEfficiencyAnalyzer::GEMEfficiencyAnalyzer(const edm::ParameterSet& pset) - : GEMOfflineDQMBase(pset), - gemToken_(esConsumes()), - globalGeomToken_(esConsumes()), - trasientTranckToken_(esConsumes()) { - +GEMEfficiencyAnalyzer::GEMEfficiencyAnalyzer(const edm::ParameterSet& pset) + : GEMOfflineDQMBase(pset), + gemToken_(esConsumes()), + globalGeomToken_(esConsumes()), + trasientTranckToken_(esConsumes()) { name_ = pset.getUntrackedParameter("name"); folder_ = pset.getUntrackedParameter("folder"); @@ -110,9 +108,7 @@ void GEMEfficiencyAnalyzer::fillDescriptions(edm::ConfigurationDescriptions& des void GEMEfficiencyAnalyzer::bookHistograms(DQMStore::IBooker& ibooker, edm::Run const& run, edm::EventSetup const& isetup) { - - - edm::ESHandle gem; + edm::ESHandle gem; gem = isetup.getHandle(gemToken_); if (not gem.isValid()) { @@ -326,10 +322,9 @@ void GEMEfficiencyAnalyzer::analyze(const edm::Event& event, const edm::EventSet return; } - edm::ESHandle gem; + edm::ESHandle gem; gem = setup.getHandle(gemToken_); - if (not gem.isValid()) { edm::LogError(kLogCategory_) << "GEMGeometry is invalid" << std::endl; return; @@ -339,16 +334,13 @@ void GEMEfficiencyAnalyzer::analyze(const edm::Event& event, const edm::EventSet global_tracking_geometry = setup.getHandle(globalGeomToken_); - - - if (not global_tracking_geometry.isValid()) { edm::LogError(kLogCategory_) << "GlobalTrackingGeometry is invalid" << std::endl; return; } edm::ESHandle transient_track_builder; - transient_track_builder=setup.getHandle(trasientTranckToken_); + transient_track_builder = setup.getHandle(trasientTranckToken_); if (not transient_track_builder.isValid()) { edm::LogError(kLogCategory_) << "TransientTrackRecord is invalid" << std::endl; diff --git a/DQMOffline/Muon/src/GEMOfflineMonitor.cc b/DQMOffline/Muon/src/GEMOfflineMonitor.cc index c3107dc31678b..cfb6414cdff57 100644 --- a/DQMOffline/Muon/src/GEMOfflineMonitor.cc +++ b/DQMOffline/Muon/src/GEMOfflineMonitor.cc @@ -4,10 +4,8 @@ #include "Geometry/Records/interface/MuonGeometryRecord.h" #include "Validation/MuonGEMHits/interface/GEMValidationUtils.h" -GEMOfflineMonitor::GEMOfflineMonitor(const edm::ParameterSet& pset) - : GEMOfflineDQMBase(pset), - gemToken_(esConsumes()) { - +GEMOfflineMonitor::GEMOfflineMonitor(const edm::ParameterSet& pset) + : GEMOfflineDQMBase(pset), gemToken_(esConsumes()) { digi_token_ = consumes(pset.getParameter("digiTag")); rechit_token_ = consumes(pset.getParameter("recHitTag")); do_digi_occupancy_ = pset.getUntrackedParameter("doDigiOccupancy"); @@ -28,10 +26,9 @@ void GEMOfflineMonitor::fillDescriptions(edm::ConfigurationDescriptions& descrip } void GEMOfflineMonitor::bookHistograms(DQMStore::IBooker& ibooker, edm::Run const& run, edm::EventSetup const& setup) { - - edm::ESHandle gem; + edm::ESHandle gem; gem = setup.getHandle(gemToken_); - + if (not gem.isValid()) { edm::LogError(log_category_) << "GEMGeometry is invalid" << std::endl; return; @@ -136,8 +133,8 @@ void GEMOfflineMonitor::analyze(const edm::Event& event, const edm::EventSetup& } } - edm::ESHandle gem; gem = setup.getHandle(gemToken_); - + edm::ESHandle gem; + gem = setup.getHandle(gemToken_); if (not gem.isValid()) { edm::LogError(log_category_) << "GEMGeometry is invalid" << std::endl; diff --git a/DQMOffline/Muon/src/MuonEnergyDepositAnalyzer.cc b/DQMOffline/Muon/src/MuonEnergyDepositAnalyzer.cc index 7afa989aa9741..b8c17d0a4a644 100644 --- a/DQMOffline/Muon/src/MuonEnergyDepositAnalyzer.cc +++ b/DQMOffline/Muon/src/MuonEnergyDepositAnalyzer.cc @@ -22,8 +22,7 @@ using namespace std; using namespace edm; MuonEnergyDepositAnalyzer::MuonEnergyDepositAnalyzer(const edm::ParameterSet& pSet) - : trasientTrackToken_(esConsumes()) { - + : trasientTrackToken_(esConsumes()) { parameters = pSet; theMuonCollectionLabel_ = consumes(parameters.getParameter("MuonCollection")); @@ -211,9 +210,7 @@ void MuonEnergyDepositAnalyzer::analyze(const edm::Event& iEvent, const edm::Eve // plot for energy tests - theB = iSetup.getHandle(trasientTrackToken_); - reco::TransientTrack TransTrack; diff --git a/DQMOffline/Muon/src/MuonIdDQM.cc b/DQMOffline/Muon/src/MuonIdDQM.cc index 9fd4852a28b5f..d1968ac94c66f 100644 --- a/DQMOffline/Muon/src/MuonIdDQM.cc +++ b/DQMOffline/Muon/src/MuonIdDQM.cc @@ -1,8 +1,7 @@ #include "DQMOffline/Muon/interface/MuonIdDQM.h" MuonIdDQM::MuonIdDQM(const edm::ParameterSet& iConfig) - : trackingGeomToken_(esConsumes()) { - + : trackingGeomToken_(esConsumes()) { inputMuonCollection_ = consumes(iConfig.getParameter("inputMuonCollection")); inputDTRecSegment4DCollection_ = consumes(iConfig.getParameter("inputDTRecSegment4DCollection")); @@ -13,8 +12,6 @@ MuonIdDQM::MuonIdDQM(const edm::ParameterSet& iConfig) useTrackerMuonsNotGlobalMuons_ = iConfig.getUntrackedParameter("useTrackerMuonsNotGlobalMuons"); useGlobalMuonsNotTrackerMuons_ = iConfig.getUntrackedParameter("useGlobalMuonsNotTrackerMuons"); baseFolder_ = iConfig.getUntrackedParameter("baseFolder"); - - } MuonIdDQM::~MuonIdDQM() {} @@ -134,9 +131,8 @@ void MuonIdDQM::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) iEvent.getByToken(inputMuonCollection_, muonCollectionH_); iEvent.getByToken(inputDTRecSegment4DCollection_, dtSegmentCollectionH_); iEvent.getByToken(inputCSCSegmentCollection_, cscSegmentCollectionH_); - + geometry_ = iSetup.getHandle(trackingGeomToken_); - for (MuonCollection::const_iterator muon = muonCollectionH_->begin(); muon != muonCollectionH_->end(); ++muon) { // trackerMuon == 0; globalMuon == 1; trackerMuon && !globalMuon == 2; globalMuon && !trackerMuon == 3 From 987756c1b35b674e905de643c9fa57767afa5916 Mon Sep 17 00:00:00 2001 From: calderon Date: Thu, 20 May 2021 13:24:33 +0200 Subject: [PATCH 07/13] migrate esConsumes --- DQMOffline/Muon/src/MuonEnergyDepositAnalyzer.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/DQMOffline/Muon/src/MuonEnergyDepositAnalyzer.cc b/DQMOffline/Muon/src/MuonEnergyDepositAnalyzer.cc index b8c17d0a4a644..c62bfa23fd0e8 100644 --- a/DQMOffline/Muon/src/MuonEnergyDepositAnalyzer.cc +++ b/DQMOffline/Muon/src/MuonEnergyDepositAnalyzer.cc @@ -22,7 +22,8 @@ using namespace std; using namespace edm; MuonEnergyDepositAnalyzer::MuonEnergyDepositAnalyzer(const edm::ParameterSet& pSet) - : trasientTrackToken_(esConsumes()) { + : trasientTrackToken_(esConsumes(edm::ESInputTag("", "TransientTrackBuilder"))) { + parameters = pSet; theMuonCollectionLabel_ = consumes(parameters.getParameter("MuonCollection")); From b80f763c0740ea7529334a42a84f6a94e0ee39c5 Mon Sep 17 00:00:00 2001 From: calderon Date: Thu, 20 May 2021 16:15:42 +0200 Subject: [PATCH 08/13] migrate esConsumes --- DQMOffline/Muon/src/MuonEnergyDepositAnalyzer.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/DQMOffline/Muon/src/MuonEnergyDepositAnalyzer.cc b/DQMOffline/Muon/src/MuonEnergyDepositAnalyzer.cc index c62bfa23fd0e8..905383dc1b494 100644 --- a/DQMOffline/Muon/src/MuonEnergyDepositAnalyzer.cc +++ b/DQMOffline/Muon/src/MuonEnergyDepositAnalyzer.cc @@ -22,8 +22,8 @@ using namespace std; using namespace edm; MuonEnergyDepositAnalyzer::MuonEnergyDepositAnalyzer(const edm::ParameterSet& pSet) - : trasientTrackToken_(esConsumes(edm::ESInputTag("", "TransientTrackBuilder"))) { - + : trasientTrackToken_( + esConsumes(edm::ESInputTag("", "TransientTrackBuilder"))) { parameters = pSet; theMuonCollectionLabel_ = consumes(parameters.getParameter("MuonCollection")); From be211059b1ad24f29da9fd405a7cb2768ff28cf7 Mon Sep 17 00:00:00 2001 From: calderon Date: Mon, 24 May 2021 10:52:04 +0200 Subject: [PATCH 09/13] minor fix --- DQMOffline/Muon/src/GEMEfficiencyAnalyzer.cc | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/DQMOffline/Muon/src/GEMEfficiencyAnalyzer.cc b/DQMOffline/Muon/src/GEMEfficiencyAnalyzer.cc index a6032ba953c3e..c3feb14cb0da0 100644 --- a/DQMOffline/Muon/src/GEMEfficiencyAnalyzer.cc +++ b/DQMOffline/Muon/src/GEMEfficiencyAnalyzer.cc @@ -12,9 +12,11 @@ GEMEfficiencyAnalyzer::GEMEfficiencyAnalyzer(const edm::ParameterSet& pset) : GEMOfflineDQMBase(pset), - gemToken_(esConsumes()), + gemToken1_(esConsumes()), + gemToken2_(esConsumes()), globalGeomToken_(esConsumes()), - trasientTranckToken_(esConsumes()) { + trasientTrackToken_(esConsumes(edm::ESInputTag("", "TransientTrackBuilder"))) { + name_ = pset.getUntrackedParameter("name"); folder_ = pset.getUntrackedParameter("folder"); @@ -109,7 +111,7 @@ void GEMEfficiencyAnalyzer::bookHistograms(DQMStore::IBooker& ibooker, edm::Run const& run, edm::EventSetup const& isetup) { edm::ESHandle gem; - gem = isetup.getHandle(gemToken_); + gem = isetup.getHandle(gemToken1_); if (not gem.isValid()) { edm::LogError(kLogCategory_) << "GEMGeometry is invalid" << std::endl; @@ -323,7 +325,7 @@ void GEMEfficiencyAnalyzer::analyze(const edm::Event& event, const edm::EventSet } edm::ESHandle gem; - gem = setup.getHandle(gemToken_); + gem = setup.getHandle(gemToken2_); if (not gem.isValid()) { edm::LogError(kLogCategory_) << "GEMGeometry is invalid" << std::endl; @@ -340,7 +342,7 @@ void GEMEfficiencyAnalyzer::analyze(const edm::Event& event, const edm::EventSet } edm::ESHandle transient_track_builder; - transient_track_builder = setup.getHandle(trasientTranckToken_); + transient_track_builder = setup.getHandle(trasientTrackToken_); if (not transient_track_builder.isValid()) { edm::LogError(kLogCategory_) << "TransientTrackRecord is invalid" << std::endl; From dfb3510399823a6c3450a4c3b61f39c77c330b18 Mon Sep 17 00:00:00 2001 From: calderon Date: Mon, 24 May 2021 10:52:14 +0200 Subject: [PATCH 10/13] minor fix --- DQMOffline/Muon/interface/GEMEfficiencyAnalyzer.h | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/DQMOffline/Muon/interface/GEMEfficiencyAnalyzer.h b/DQMOffline/Muon/interface/GEMEfficiencyAnalyzer.h index 4b8a95052fc96..dc00b7c3e1de4 100644 --- a/DQMOffline/Muon/interface/GEMEfficiencyAnalyzer.h +++ b/DQMOffline/Muon/interface/GEMEfficiencyAnalyzer.h @@ -22,8 +22,12 @@ #include "TrackingTools/Records/interface/TransientTrackRecord.h" #include "Geometry/CommonTopologies/interface/GlobalTrackingGeometry.h" #include "Geometry/Records/interface/GlobalTrackingGeometryRecord.h" +#include "Geometry/GEMGeometry/interface/GEMGeometry.h" +#include "Geometry/Records/interface/MuonGeometryRecord.h" + class GEMEfficiencyAnalyzer : public GEMOfflineDQMBase { + public: explicit GEMEfficiencyAnalyzer(const edm::ParameterSet &); ~GEMEfficiencyAnalyzer() override; @@ -43,9 +47,10 @@ class GEMEfficiencyAnalyzer : public GEMOfflineDQMBase { int region, station, layer; }; - const edm::ESGetToken gemToken_; + const edm::ESGetToken gemToken1_; + const edm::ESGetToken gemToken2_; const edm::ESGetToken globalGeomToken_; - const edm::ESGetToken trasientTranckToken_; + const edm::ESGetToken trasientTrackToken_; MonitorElement *bookNumerator1D(DQMStore::IBooker &, MonitorElement *); MonitorElement *bookNumerator2D(DQMStore::IBooker &, MonitorElement *); From a1ff25b2500b520f5c022152760382db747ca224 Mon Sep 17 00:00:00 2001 From: calderon Date: Mon, 24 May 2021 11:10:09 +0200 Subject: [PATCH 11/13] minor fix --- DQMOffline/Muon/interface/GEMEfficiencyAnalyzer.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/DQMOffline/Muon/interface/GEMEfficiencyAnalyzer.h b/DQMOffline/Muon/interface/GEMEfficiencyAnalyzer.h index dc00b7c3e1de4..328ed80407040 100644 --- a/DQMOffline/Muon/interface/GEMEfficiencyAnalyzer.h +++ b/DQMOffline/Muon/interface/GEMEfficiencyAnalyzer.h @@ -25,9 +25,7 @@ #include "Geometry/GEMGeometry/interface/GEMGeometry.h" #include "Geometry/Records/interface/MuonGeometryRecord.h" - class GEMEfficiencyAnalyzer : public GEMOfflineDQMBase { - public: explicit GEMEfficiencyAnalyzer(const edm::ParameterSet &); ~GEMEfficiencyAnalyzer() override; @@ -47,7 +45,7 @@ class GEMEfficiencyAnalyzer : public GEMOfflineDQMBase { int region, station, layer; }; - const edm::ESGetToken gemToken1_; + const edm::ESGetToken gemToken1_; const edm::ESGetToken gemToken2_; const edm::ESGetToken globalGeomToken_; const edm::ESGetToken trasientTrackToken_; From 2a18e5faeb080966cda5bdfbac84d3e1434aa24b Mon Sep 17 00:00:00 2001 From: calderon Date: Mon, 24 May 2021 11:10:14 +0200 Subject: [PATCH 12/13] minor fix --- DQMOffline/Muon/src/GEMEfficiencyAnalyzer.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/DQMOffline/Muon/src/GEMEfficiencyAnalyzer.cc b/DQMOffline/Muon/src/GEMEfficiencyAnalyzer.cc index c3feb14cb0da0..e2c3413c7a569 100644 --- a/DQMOffline/Muon/src/GEMEfficiencyAnalyzer.cc +++ b/DQMOffline/Muon/src/GEMEfficiencyAnalyzer.cc @@ -12,11 +12,11 @@ GEMEfficiencyAnalyzer::GEMEfficiencyAnalyzer(const edm::ParameterSet& pset) : GEMOfflineDQMBase(pset), - gemToken1_(esConsumes()), - gemToken2_(esConsumes()), + gemToken1_(esConsumes()), + gemToken2_(esConsumes()), globalGeomToken_(esConsumes()), - trasientTrackToken_(esConsumes(edm::ESInputTag("", "TransientTrackBuilder"))) { - + trasientTrackToken_( + esConsumes(edm::ESInputTag("", "TransientTrackBuilder"))) { name_ = pset.getUntrackedParameter("name"); folder_ = pset.getUntrackedParameter("folder"); From a86456ab72e37313930910f2eb86f4cc140f83a7 Mon Sep 17 00:00:00 2001 From: calderon Date: Mon, 24 May 2021 11:49:44 +0200 Subject: [PATCH 13/13] minor fix --- DQMOffline/Muon/src/GEMEfficiencyAnalyzer.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DQMOffline/Muon/src/GEMEfficiencyAnalyzer.cc b/DQMOffline/Muon/src/GEMEfficiencyAnalyzer.cc index e2c3413c7a569..0dd168dae318b 100644 --- a/DQMOffline/Muon/src/GEMEfficiencyAnalyzer.cc +++ b/DQMOffline/Muon/src/GEMEfficiencyAnalyzer.cc @@ -12,7 +12,7 @@ GEMEfficiencyAnalyzer::GEMEfficiencyAnalyzer(const edm::ParameterSet& pset) : GEMOfflineDQMBase(pset), - gemToken1_(esConsumes()), + gemToken1_(esConsumes()), gemToken2_(esConsumes()), globalGeomToken_(esConsumes()), trasientTrackToken_(