Skip to content

Commit

Permalink
migrate esConsumes
Browse files Browse the repository at this point in the history
  • Loading branch information
calderona committed May 19, 2021
1 parent 1170c96 commit 5bc6101
Show file tree
Hide file tree
Showing 11 changed files with 47 additions and 58 deletions.
4 changes: 4 additions & 0 deletions DQMOffline/Muon/interface/CSCOfflineMonitor.h
Expand Up @@ -91,6 +91,10 @@ class CSCOfflineMonitor : public DQMEDAnalyzer {
edm::EDGetTokenT<CSCRecHit2DCollection> rh_token;
edm::EDGetTokenT<CSCSegmentCollection> se_token;

const edm::ESGetToken<CSCGeometry, MuonGeometryRecord> cscGeomToken_;

const edm::ESGetToken<CSCCrateMap, CSCCrateMapRcd> hcrateToken_;

// modules
void doOccupancies(edm::Handle<CSCStripDigiCollection> strips,
edm::Handle<CSCWireDigiCollection> wires,
Expand Down
2 changes: 2 additions & 0 deletions DQMOffline/Muon/interface/DTSegmentsTask.h
Expand Up @@ -41,6 +41,8 @@ class DTSegmentsTask : public DQMEDAnalyzer {
bool checkNoisyChannels;
edm::ParameterSet parameters;

const edm::ESGetToken<DTStatusFlag, DTStatusFlagRcd> statusMapToken_;

// the histos
std::vector<MonitorElement *> phiHistos;
std::vector<MonitorElement *> thetaHistos;
Expand Down
17 changes: 7 additions & 10 deletions DQMOffline/Muon/interface/GEMEfficiencyAnalyzer.h
Expand Up @@ -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:
Expand All @@ -34,21 +34,18 @@ class GEMEfficiencyAnalyzer : public GEMOfflineDQMBase {
void analyze(const edm::Event &event, const edm::EventSetup &eventSetup) override;

private:


struct GEMLayerData {
GEMLayerData(Disk::DiskPointer surface, std::vector<const GEMChamber *> chambers, int region, int station, int layer)
: surface(surface), chambers(chambers), region(region), station(station), layer(layer) {}

Disk::DiskPointer surface;
std::vector<const GEMChamber *> chambers;
int region, station, layer;

};

const edm::ESGetToken<GEMGeometry, MuonGeometryRecord> gemToken_;
const edm::ESGetToken<GlobalTrackingGeometry, GlobalTrackingGeometryRecord> globalGeomToken_;
const edm::ESGetToken<TransientTrackBuilder, TransientTrackRecord> trasientTranckToken_;
const edm::ESGetToken<GEMGeometry, MuonGeometryRecord> gemToken_;
const edm::ESGetToken<GlobalTrackingGeometry, GlobalTrackingGeometryRecord> globalGeomToken_;
const edm::ESGetToken<TransientTrackBuilder, TransientTrackRecord> trasientTranckToken_;

MonitorElement *bookNumerator1D(DQMStore::IBooker &, MonitorElement *);
MonitorElement *bookNumerator2D(DQMStore::IBooker &, MonitorElement *);
Expand Down
4 changes: 1 addition & 3 deletions DQMOffline/Muon/interface/GEMOfflineMonitor.h
Expand Up @@ -30,9 +30,7 @@ class GEMOfflineMonitor : public GEMOfflineDQMBase {
edm::EDGetTokenT<GEMDigiCollection> digi_token_;
edm::EDGetTokenT<GEMRecHitCollection> rechit_token_;



const edm::ESGetToken<GEMGeometry, MuonGeometryRecord> gemToken_;
const edm::ESGetToken<GEMGeometry, MuonGeometryRecord> gemToken_;

bool do_digi_occupancy_;
bool do_hit_occupancy_;
Expand Down
10 changes: 5 additions & 5 deletions DQMOffline/Muon/interface/MuonEnergyDepositAnalyzer.h
Expand Up @@ -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:
Expand All @@ -45,9 +45,9 @@ class MuonEnergyDepositAnalyzer : public DQMEDAnalyzer {
edm::ParameterSet parameters;
edm::EDGetTokenT<reco::MuonCollection> theMuonCollectionLabel_;

edm::ESHandle<TransientTrackBuilder> theB;
edm::ESGetToken<TransientTrackBuilder, TransientTrackRecord> trasientTrackToken_;
edm::ESHandle<TransientTrackBuilder> theB;

edm::ESGetToken<TransientTrackBuilder, TransientTrackRecord> trasientTrackToken_;

// Switch for verbosity
std::string metname;
Expand Down
11 changes: 8 additions & 3 deletions DQMOffline/Muon/src/CSCOfflineMonitor.cc
Expand Up @@ -10,7 +10,9 @@ using namespace std;
///////////////////
// CONSTRUCTOR //
///////////////////
CSCOfflineMonitor::CSCOfflineMonitor(const edm::ParameterSet& pset) {
CSCOfflineMonitor::CSCOfflineMonitor(const edm::ParameterSet& pset)
: cscGeomToken_(esConsumes<CSCGeometry, MuonGeometryRecord>()),
hcrateToken_(esConsumes<CSCCrateMap, CSCCrateMapRcd>()) {
rd_token = consumes<FEDRawDataCollection>(pset.getParameter<edm::InputTag>("FEDRawDataCollectionTag"));
sd_token = consumes<CSCStripDigiCollection>(pset.getParameter<edm::InputTag>("stripDigiTag"));
wd_token = consumes<CSCWireDigiCollection>(pset.getParameter<edm::InputTag>("wireDigiTag"));
Expand Down Expand Up @@ -817,7 +819,8 @@ void CSCOfflineMonitor::analyze(const edm::Event& event, const edm::EventSetup&

// Get the CSC Geometry :
edm::ESHandle<CSCGeometry> cscGeom;
eventSetup.get<MuonGeometryRecord>().get(cscGeom);

cscGeom = eventSetup.getHandle(cscGeomToken_);

// Get the RecHits collection :
edm::Handle<CSCRecHit2DCollection> recHits;
Expand Down Expand Up @@ -1802,7 +1805,9 @@ void CSCOfflineMonitor::doBXMonitor(edm::Handle<CSCALCTDigiCollection> alcts,
// Loop over raw data to get TMBHeader information
// Taking code from EventFilter/CSCRawToDigis/CSCDCCUnpacker.cc
edm::ESHandle<CSCCrateMap> hcrate;
eventSetup.get<CSCCrateMapRcd>().get(hcrate);

hcrate = eventSetup.getHandle(hcrateToken_);

const CSCCrateMap* pcrate = hcrate.product();

// Try to get raw data
Expand Down
5 changes: 3 additions & 2 deletions DQMOffline/Muon/src/DTSegmentsTask.cc
Expand Up @@ -24,7 +24,8 @@
using namespace edm;
using namespace std;

DTSegmentsTask::DTSegmentsTask(const edm::ParameterSet& pset) {
DTSegmentsTask::DTSegmentsTask(const edm::ParameterSet& pset)
: statusMapToken_(esConsumes<DTStatusFlag, DTStatusFlagRcd>()) {
debug = pset.getUntrackedParameter<bool>("debug", false);
parameters = pset;

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

// Get the 4D segment collection from the event
Expand Down
24 changes: 8 additions & 16 deletions DQMOffline/Muon/src/GEMEfficiencyAnalyzer.cc
Expand Up @@ -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<GEMGeometry, MuonGeometryRecord>()),
globalGeomToken_(esConsumes<GlobalTrackingGeometry, GlobalTrackingGeometryRecord>()),
trasientTranckToken_(esConsumes<TransientTrackBuilder, TransientTrackRecord>()) {

GEMEfficiencyAnalyzer::GEMEfficiencyAnalyzer(const edm::ParameterSet& pset)
: GEMOfflineDQMBase(pset),
gemToken_(esConsumes<GEMGeometry, MuonGeometryRecord>()),
globalGeomToken_(esConsumes<GlobalTrackingGeometry, GlobalTrackingGeometryRecord>()),
trasientTranckToken_(esConsumes<TransientTrackBuilder, TransientTrackRecord>()) {
name_ = pset.getUntrackedParameter<std::string>("name");
folder_ = pset.getUntrackedParameter<std::string>("folder");

Expand Down Expand Up @@ -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<GEMGeometry> gem;
edm::ESHandle<GEMGeometry> gem;
gem = isetup.getHandle(gemToken_);

if (not gem.isValid()) {
Expand Down Expand Up @@ -326,10 +322,9 @@ void GEMEfficiencyAnalyzer::analyze(const edm::Event& event, const edm::EventSet
return;
}

edm::ESHandle<GEMGeometry> gem;
edm::ESHandle<GEMGeometry> gem;
gem = setup.getHandle(gemToken_);


if (not gem.isValid()) {
edm::LogError(kLogCategory_) << "GEMGeometry is invalid" << std::endl;
return;
Expand All @@ -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<TransientTrackBuilder> 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;
Expand Down
15 changes: 6 additions & 9 deletions DQMOffline/Muon/src/GEMOfflineMonitor.cc
Expand Up @@ -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<GEMGeometry, MuonGeometryRecord>()) {

GEMOfflineMonitor::GEMOfflineMonitor(const edm::ParameterSet& pset)
: GEMOfflineDQMBase(pset), gemToken_(esConsumes<GEMGeometry, MuonGeometryRecord>()) {
digi_token_ = consumes<GEMDigiCollection>(pset.getParameter<edm::InputTag>("digiTag"));
rechit_token_ = consumes<GEMRecHitCollection>(pset.getParameter<edm::InputTag>("recHitTag"));
do_digi_occupancy_ = pset.getUntrackedParameter<bool>("doDigiOccupancy");
Expand All @@ -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<GEMGeometry> gem;
edm::ESHandle<GEMGeometry> gem;
gem = setup.getHandle(gemToken_);

if (not gem.isValid()) {
edm::LogError(log_category_) << "GEMGeometry is invalid" << std::endl;
return;
Expand Down Expand Up @@ -136,8 +133,8 @@ void GEMOfflineMonitor::analyze(const edm::Event& event, const edm::EventSetup&
}
}

edm::ESHandle<GEMGeometry> gem; gem = setup.getHandle(gemToken_);

edm::ESHandle<GEMGeometry> gem;
gem = setup.getHandle(gemToken_);

if (not gem.isValid()) {
edm::LogError(log_category_) << "GEMGeometry is invalid" << std::endl;
Expand Down
5 changes: 1 addition & 4 deletions DQMOffline/Muon/src/MuonEnergyDepositAnalyzer.cc
Expand Up @@ -22,8 +22,7 @@ using namespace std;
using namespace edm;

MuonEnergyDepositAnalyzer::MuonEnergyDepositAnalyzer(const edm::ParameterSet& pSet)
: trasientTrackToken_(esConsumes<TransientTrackBuilder, TransientTrackRecord>()) {

: trasientTrackToken_(esConsumes<TransientTrackBuilder, TransientTrackRecord>()) {
parameters = pSet;

theMuonCollectionLabel_ = consumes<reco::MuonCollection>(parameters.getParameter<InputTag>("MuonCollection"));
Expand Down Expand Up @@ -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;

Expand Down
8 changes: 2 additions & 6 deletions DQMOffline/Muon/src/MuonIdDQM.cc
@@ -1,8 +1,7 @@
#include "DQMOffline/Muon/interface/MuonIdDQM.h"

MuonIdDQM::MuonIdDQM(const edm::ParameterSet& iConfig)
: trackingGeomToken_(esConsumes<GlobalTrackingGeometry, GlobalTrackingGeometryRecord>()) {

: trackingGeomToken_(esConsumes<GlobalTrackingGeometry, GlobalTrackingGeometryRecord>()) {
inputMuonCollection_ = consumes<reco::MuonCollection>(iConfig.getParameter<edm::InputTag>("inputMuonCollection"));
inputDTRecSegment4DCollection_ =
consumes<DTRecSegment4DCollection>(iConfig.getParameter<edm::InputTag>("inputDTRecSegment4DCollection"));
Expand All @@ -13,8 +12,6 @@ MuonIdDQM::MuonIdDQM(const edm::ParameterSet& iConfig)
useTrackerMuonsNotGlobalMuons_ = iConfig.getUntrackedParameter<bool>("useTrackerMuonsNotGlobalMuons");
useGlobalMuonsNotTrackerMuons_ = iConfig.getUntrackedParameter<bool>("useGlobalMuonsNotTrackerMuons");
baseFolder_ = iConfig.getUntrackedParameter<std::string>("baseFolder");


}

MuonIdDQM::~MuonIdDQM() {}
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 5bc6101

Please sign in to comment.