Skip to content

Commit d50809a

Browse files
cmsbuildcmsbuild
authored
Merge pull request cms-sw#33786 from calderona/calderona_MuDQMesconsume
Migrate ED modules to use esConsumes
2 parents c628f33 + a86456a commit d50809a

12 files changed

+72
-20
lines changed

‎DQMOffline/Muon/interface/CSCOfflineMonitor.h‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,10 @@ class CSCOfflineMonitor : public DQMEDAnalyzer {
9191
edm::EDGetTokenT<CSCRecHit2DCollection> rh_token;
9292
edm::EDGetTokenT<CSCSegmentCollection> se_token;
9393

94+
const edm::ESGetToken<CSCGeometry, MuonGeometryRecord> cscGeomToken_;
95+
96+
const edm::ESGetToken<CSCCrateMap, CSCCrateMapRcd> hcrateToken_;
97+
9498
// modules
9599
void doOccupancies(edm::Handle<CSCStripDigiCollection> strips,
96100
edm::Handle<CSCWireDigiCollection> wires,

‎DQMOffline/Muon/interface/DTSegmentsTask.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ class DTSegmentsTask : public DQMEDAnalyzer {
4141
bool checkNoisyChannels;
4242
edm::ParameterSet parameters;
4343

44+
const edm::ESGetToken<DTStatusFlag, DTStatusFlagRcd> statusMapToken_;
45+
4446
// the histos
4547
std::vector<MonitorElement *> phiHistos;
4648
std::vector<MonitorElement *> thetaHistos;

‎DQMOffline/Muon/interface/GEMEfficiencyAnalyzer.h‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,12 @@
1818
#include "DataFormats/MuonReco/interface/MuonSelectors.h"
1919
#include "RecoMuon/TrackingTools/interface/MuonServiceProxy.h"
2020
#include "TrackingTools/TransientTrack/interface/TransientTrack.h"
21+
#include "TrackingTools/TransientTrack/interface/TransientTrackBuilder.h"
22+
#include "TrackingTools/Records/interface/TransientTrackRecord.h"
23+
#include "Geometry/CommonTopologies/interface/GlobalTrackingGeometry.h"
24+
#include "Geometry/Records/interface/GlobalTrackingGeometryRecord.h"
25+
#include "Geometry/GEMGeometry/interface/GEMGeometry.h"
26+
#include "Geometry/Records/interface/MuonGeometryRecord.h"
2127

2228
class GEMEfficiencyAnalyzer : public GEMOfflineDQMBase {
2329
public:
@@ -38,6 +44,11 @@ class GEMEfficiencyAnalyzer : public GEMOfflineDQMBase {
3844
int region, station, layer;
3945
};
4046

47+
const edm::ESGetToken<GEMGeometry, MuonGeometryRecord> gemToken1_;
48+
const edm::ESGetToken<GEMGeometry, MuonGeometryRecord> gemToken2_;
49+
const edm::ESGetToken<GlobalTrackingGeometry, GlobalTrackingGeometryRecord> globalGeomToken_;
50+
const edm::ESGetToken<TransientTrackBuilder, TransientTrackRecord> trasientTrackToken_;
51+
4152
MonitorElement *bookNumerator1D(DQMStore::IBooker &, MonitorElement *);
4253
MonitorElement *bookNumerator2D(DQMStore::IBooker &, MonitorElement *);
4354

‎DQMOffline/Muon/interface/GEMOfflineMonitor.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
99
#include "DataFormats/GEMDigi/interface/GEMDigiCollection.h"
1010
#include "DataFormats/GEMRecHit/interface/GEMRecHitCollection.h"
11+
#include "Geometry/Records/interface/MuonGeometryRecord.h"
1112

1213
class GEMOfflineMonitor : public GEMOfflineDQMBase {
1314
public:
@@ -29,6 +30,8 @@ class GEMOfflineMonitor : public GEMOfflineDQMBase {
2930
edm::EDGetTokenT<GEMDigiCollection> digi_token_;
3031
edm::EDGetTokenT<GEMRecHitCollection> rechit_token_;
3132

33+
const edm::ESGetToken<GEMGeometry, MuonGeometryRecord> gemToken_;
34+
3235
bool do_digi_occupancy_;
3336
bool do_hit_occupancy_;
3437

‎DQMOffline/Muon/interface/MuonEnergyDepositAnalyzer.h‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@
2525
#include "DataFormats/MuonReco/interface/MuonFwd.h"
2626
#include "DataFormats/MuonReco/interface/MuonEnergy.h"
2727

28+
#include "TrackingTools/TransientTrack/interface/TransientTrackBuilder.h"
29+
#include "TrackingTools/Records/interface/TransientTrackRecord.h"
30+
2831
class MuonEnergyDepositAnalyzer : public DQMEDAnalyzer {
2932
public:
3033
/// Constructor
@@ -42,6 +45,10 @@ class MuonEnergyDepositAnalyzer : public DQMEDAnalyzer {
4245
edm::ParameterSet parameters;
4346
edm::EDGetTokenT<reco::MuonCollection> theMuonCollectionLabel_;
4447

48+
edm::ESHandle<TransientTrackBuilder> theB;
49+
50+
edm::ESGetToken<TransientTrackBuilder, TransientTrackRecord> trasientTrackToken_;
51+
4552
// Switch for verbosity
4653
std::string metname;
4754
std::string AlgoName;

‎DQMOffline/Muon/interface/MuonIdDQM.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,8 @@ class MuonIdDQM : public DQMEDAnalyzer {
7373
edm::Handle<CSCSegmentCollection> cscSegmentCollectionH_;
7474
edm::ESHandle<GlobalTrackingGeometry> geometry_;
7575

76+
const edm::ESGetToken<GlobalTrackingGeometry, GlobalTrackingGeometryRecord> trackingGeomToken_;
77+
7678
// trackerMuon == 0; globalMuon == 1
7779
MonitorElement* hNumChambers[4];
7880
MonitorElement* hNumMatches[4];

‎DQMOffline/Muon/src/CSCOfflineMonitor.cc‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@ using namespace std;
1010
///////////////////
1111
// CONSTRUCTOR //
1212
///////////////////
13-
CSCOfflineMonitor::CSCOfflineMonitor(const edm::ParameterSet& pset) {
13+
CSCOfflineMonitor::CSCOfflineMonitor(const edm::ParameterSet& pset)
14+
: cscGeomToken_(esConsumes<CSCGeometry, MuonGeometryRecord>()),
15+
hcrateToken_(esConsumes<CSCCrateMap, CSCCrateMapRcd>()) {
1416
rd_token = consumes<FEDRawDataCollection>(pset.getParameter<edm::InputTag>("FEDRawDataCollectionTag"));
1517
sd_token = consumes<CSCStripDigiCollection>(pset.getParameter<edm::InputTag>("stripDigiTag"));
1618
wd_token = consumes<CSCWireDigiCollection>(pset.getParameter<edm::InputTag>("wireDigiTag"));
@@ -817,7 +819,8 @@ void CSCOfflineMonitor::analyze(const edm::Event& event, const edm::EventSetup&
817819

818820
// Get the CSC Geometry :
819821
edm::ESHandle<CSCGeometry> cscGeom;
820-
eventSetup.get<MuonGeometryRecord>().get(cscGeom);
822+
823+
cscGeom = eventSetup.getHandle(cscGeomToken_);
821824

822825
// Get the RecHits collection :
823826
edm::Handle<CSCRecHit2DCollection> recHits;
@@ -1802,7 +1805,9 @@ void CSCOfflineMonitor::doBXMonitor(edm::Handle<CSCALCTDigiCollection> alcts,
18021805
// Loop over raw data to get TMBHeader information
18031806
// Taking code from EventFilter/CSCRawToDigis/CSCDCCUnpacker.cc
18041807
edm::ESHandle<CSCCrateMap> hcrate;
1805-
eventSetup.get<CSCCrateMapRcd>().get(hcrate);
1808+
1809+
hcrate = eventSetup.getHandle(hcrateToken_);
1810+
18061811
const CSCCrateMap* pcrate = hcrate.product();
18071812

18081813
// Try to get raw data

‎DQMOffline/Muon/src/DTSegmentsTask.cc‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@
2424
using namespace edm;
2525
using namespace std;
2626

27-
DTSegmentsTask::DTSegmentsTask(const edm::ParameterSet& pset) {
27+
DTSegmentsTask::DTSegmentsTask(const edm::ParameterSet& pset)
28+
: statusMapToken_(esConsumes<DTStatusFlag, DTStatusFlagRcd>()) {
2829
debug = pset.getUntrackedParameter<bool>("debug", false);
2930
parameters = pset;
3031

@@ -112,7 +113,7 @@ void DTSegmentsTask::analyze(const edm::Event& event, const edm::EventSetup& set
112113
// bool checkNoisyChannels = parameters.getUntrackedParameter<bool>("checkNoisyChannels",false);
113114
ESHandle<DTStatusFlag> statusMap;
114115
if (checkNoisyChannels) {
115-
setup.get<DTStatusFlagRcd>().get(statusMap);
116+
statusMap = setup.getHandle(statusMapToken_);
116117
}
117118

118119
// Get the 4D segment collection from the event

‎DQMOffline/Muon/src/GEMEfficiencyAnalyzer.cc‎

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,17 @@
66
#include "DataFormats/Math/interface/deltaPhi.h"
77
#include "DataFormats/GeometryCommonDetAlgo/interface/ErrorFrameTransformer.h"
88
#include "DataFormats/GeometrySurface/interface/SimpleDiskBounds.h"
9-
#include "Geometry/CommonTopologies/interface/GlobalTrackingGeometry.h"
10-
#include "Geometry/Records/interface/GlobalTrackingGeometryRecord.h"
119
#include "Geometry/CommonTopologies/interface/StripTopology.h"
1210
#include "Validation/MuonHits/interface/MuonHitHelper.h"
1311
#include "Validation/MuonGEMHits/interface/GEMValidationUtils.h"
1412

15-
GEMEfficiencyAnalyzer::GEMEfficiencyAnalyzer(const edm::ParameterSet& pset) : GEMOfflineDQMBase(pset) {
13+
GEMEfficiencyAnalyzer::GEMEfficiencyAnalyzer(const edm::ParameterSet& pset)
14+
: GEMOfflineDQMBase(pset),
15+
gemToken1_(esConsumes<edm::Transition::BeginRun>()),
16+
gemToken2_(esConsumes<GEMGeometry, MuonGeometryRecord>()),
17+
globalGeomToken_(esConsumes<GlobalTrackingGeometry, GlobalTrackingGeometryRecord>()),
18+
trasientTrackToken_(
19+
esConsumes<TransientTrackBuilder, TransientTrackRecord>(edm::ESInputTag("", "TransientTrackBuilder"))) {
1620
name_ = pset.getUntrackedParameter<std::string>("name");
1721
folder_ = pset.getUntrackedParameter<std::string>("folder");
1822

@@ -107,7 +111,8 @@ void GEMEfficiencyAnalyzer::bookHistograms(DQMStore::IBooker& ibooker,
107111
edm::Run const& run,
108112
edm::EventSetup const& isetup) {
109113
edm::ESHandle<GEMGeometry> gem;
110-
isetup.get<MuonGeometryRecord>().get(gem);
114+
gem = isetup.getHandle(gemToken1_);
115+
111116
if (not gem.isValid()) {
112117
edm::LogError(kLogCategory_) << "GEMGeometry is invalid" << std::endl;
113118
return;
@@ -361,21 +366,25 @@ void GEMEfficiencyAnalyzer::analyze(const edm::Event& event, const edm::EventSet
361366
}
362367

363368
edm::ESHandle<GEMGeometry> gem;
364-
setup.get<MuonGeometryRecord>().get(gem);
369+
gem = setup.getHandle(gemToken2_);
370+
365371
if (not gem.isValid()) {
366372
edm::LogError(kLogCategory_) << "GEMGeometry is invalid" << std::endl;
367373
return;
368374
}
369375

370376
edm::ESHandle<GlobalTrackingGeometry> global_tracking_geometry;
371-
setup.get<GlobalTrackingGeometryRecord>().get(global_tracking_geometry);
377+
378+
global_tracking_geometry = setup.getHandle(globalGeomToken_);
379+
372380
if (not global_tracking_geometry.isValid()) {
373381
edm::LogError(kLogCategory_) << "GlobalTrackingGeometry is invalid" << std::endl;
374382
return;
375383
}
376384

377385
edm::ESHandle<TransientTrackBuilder> transient_track_builder;
378-
setup.get<TransientTrackRecord>().get("TransientTrackBuilder", transient_track_builder);
386+
transient_track_builder = setup.getHandle(trasientTrackToken_);
387+
379388
if (not transient_track_builder.isValid()) {
380389
edm::LogError(kLogCategory_) << "TransientTrackRecord is invalid" << std::endl;
381390
return;

‎DQMOffline/Muon/src/GEMOfflineMonitor.cc‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
#include "Geometry/Records/interface/MuonGeometryRecord.h"
55
#include "Validation/MuonGEMHits/interface/GEMValidationUtils.h"
66

7-
GEMOfflineMonitor::GEMOfflineMonitor(const edm::ParameterSet& pset) : GEMOfflineDQMBase(pset) {
7+
GEMOfflineMonitor::GEMOfflineMonitor(const edm::ParameterSet& pset)
8+
: GEMOfflineDQMBase(pset), gemToken_(esConsumes<GEMGeometry, MuonGeometryRecord>()) {
89
digi_token_ = consumes<GEMDigiCollection>(pset.getParameter<edm::InputTag>("digiTag"));
910
rechit_token_ = consumes<GEMRecHitCollection>(pset.getParameter<edm::InputTag>("recHitTag"));
1011
do_digi_occupancy_ = pset.getUntrackedParameter<bool>("doDigiOccupancy");
@@ -26,7 +27,8 @@ void GEMOfflineMonitor::fillDescriptions(edm::ConfigurationDescriptions& descrip
2627

2728
void GEMOfflineMonitor::bookHistograms(DQMStore::IBooker& ibooker, edm::Run const& run, edm::EventSetup const& setup) {
2829
edm::ESHandle<GEMGeometry> gem;
29-
setup.get<MuonGeometryRecord>().get(gem);
30+
gem = setup.getHandle(gemToken_);
31+
3032
if (not gem.isValid()) {
3133
edm::LogError(log_category_) << "GEMGeometry is invalid" << std::endl;
3234
return;
@@ -132,7 +134,8 @@ void GEMOfflineMonitor::analyze(const edm::Event& event, const edm::EventSetup&
132134
}
133135

134136
edm::ESHandle<GEMGeometry> gem;
135-
setup.get<MuonGeometryRecord>().get(gem);
137+
gem = setup.getHandle(gemToken_);
138+
136139
if (not gem.isValid()) {
137140
edm::LogError(log_category_) << "GEMGeometry is invalid" << std::endl;
138141
return;

0 commit comments

Comments
 (0)