Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

added esConsumes to modules in SimMuon/DTDigitizer #30197

Merged
merged 1 commit into from Jun 12, 2020
Merged

added esConsumes to modules in SimMuon/DTDigitizer #30197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 5 additions & 3 deletions SimMuon/DTDigitizer/plugins/DTChamberMasker.cc
View file
Open in desktop
Expand Up @@ -33,6 +33,7 @@
#include "FWCore/Framework/interface/Run.h"

#include "FWCore/Framework/interface/ESHandle.h"
#include "FWCore/Utilities/interface/ESGetToken.h"
#include "FWCore/Framework/interface/EventSetup.h"

#include "FWCore/Framework/interface/MakerMacros.h"
Expand Down Expand Up @@ -76,6 +77,7 @@ class DTChamberMasker : public edm::stream::EDProducer<> {
// ----------member data ---------------------------

edm::EDGetTokenT<DTDigiCollection> m_digiToken;
edm::ESGetToken<MuonSystemAging, MuonSystemAgingRcd> m_agingObjToken;
std::map<unsigned int, float> m_ChEffs;
};

Expand All @@ -87,7 +89,8 @@ class DTChamberMasker : public edm::stream::EDProducer<> {
// constructors and destructor
//
DTChamberMasker::DTChamberMasker(const edm::ParameterSet &iConfig)
: m_digiToken(consumes<DTDigiCollection>(iConfig.getParameter<edm::InputTag>("digiTag"))) {
: m_digiToken(consumes<DTDigiCollection>(iConfig.getParameter<edm::InputTag>("digiTag"))),
m_agingObjToken(esConsumes<MuonSystemAging, MuonSystemAgingRcd>()) {
produces<DTDigiCollection>();
}

Expand Down Expand Up @@ -124,8 +127,7 @@ void DTChamberMasker::produce(edm::Event &event, const edm::EventSetup &conditio
void DTChamberMasker::beginRun(edm::Run const &run, edm::EventSetup const &iSetup) {
m_ChEffs.clear();

edm::ESHandle<MuonSystemAging> agingObj;
iSetup.get<MuonSystemAgingRcd>().get(agingObj);
edm::ESHandle<MuonSystemAging> agingObj = iSetup.getHandle(m_agingObjToken);

m_ChEffs = agingObj->m_DTChambEffs;
}
Expand Down
14 changes: 4 additions & 10 deletions SimMuon/DTDigitizer/src/DTDigitizer.cc
View file
Open in desktop
Expand Up @@ -26,17 +26,11 @@
#include "FWCore/ServiceRegistry/interface/Service.h"

// Geometry
#include "Geometry/DTGeometry/interface/DTGeometry.h"
#include "Geometry/DTGeometry/interface/DTLayer.h"
#include "Geometry/DTGeometry/interface/DTTopology.h"
#include "Geometry/Records/interface/MuonGeometryRecord.h"

#include "DataFormats/GeometryVector/interface/LocalPoint.h"

// Magnetic Field
#include "MagneticField/Engine/interface/MagneticField.h"
#include "MagneticField/Records/interface/IdealMagneticFieldRecord.h"

// Digis
#include "DataFormats/DTDigi/interface/DTDigiCollection.h"
#include "DataFormats/MuonDetId/interface/DTLayerId.h"
Expand Down Expand Up @@ -124,6 +118,8 @@ DTDigitizer::DTDigitizer(const ParameterSet &conf_)
mix_ = conf_.getParameter<std::string>("mixLabel");
collection_for_XF = conf_.getParameter<std::string>("InputCollection");
cf_token = consumes<CrossingFrame<PSimHit>>(edm::InputTag(mix_, collection_for_XF));
muonGeom_token = esConsumes<DTGeometry, MuonGeometryRecord>(edm::ESInputTag("", geometryType));
magnField_token = esConsumes<MagneticField, IdealMagneticFieldRecord>();

// String to choice between ideal (the deafult) and (mis)aligned geometry for
// the digitization step
Expand Down Expand Up @@ -155,12 +151,10 @@ void DTDigitizer::produce(Event &iEvent, const EventSetup &iSetup) {
unique_ptr<DTDigiSimLinkCollection> outputLinks(new DTDigiSimLinkCollection());

// Muon Geometry
ESHandle<DTGeometry> muonGeom;
iSetup.get<MuonGeometryRecord>().get(geometryType, muonGeom);
ESHandle<DTGeometry> muonGeom = iSetup.getHandle(muonGeom_token);

// Magnetic Field
ESHandle<MagneticField> magnField;
iSetup.get<IdealMagneticFieldRecord>().get(magnField);
ESHandle<MagneticField> magnField = iSetup.getHandle(magnField_token);

//************ 2 ***************

Expand Down
8 changes: 8 additions & 0 deletions SimMuon/DTDigitizer/src/DTDigitizer.h
View file
Open in desktop
Expand Up @@ -15,13 +15,19 @@
#include "DataFormats/MuonDetId/interface/DTWireId.h"
#include "FWCore/Framework/interface/ConsumesCollector.h"
#include "SimDataFormats/DigiSimLinks/interface/DTDigiSimLinkCollection.h"
#include "FWCore/Utilities/interface/ESGetToken.h"
#include "Geometry/Records/interface/MuonGeometryRecord.h"
#include "Geometry/DTGeometry/interface/DTGeometry.h"

#include "DataFormats/GeometryVector/interface/LocalVector.h"
// SimHits
#include "SimDataFormats/CrossingFrame/interface/CrossingFrame.h"
#include "SimDataFormats/CrossingFrame/interface/MixCollection.h"
#include "SimDataFormats/TrackingHit/interface/PSimHit.h"
#include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h"
// Magnetic Field
#include "MagneticField/Engine/interface/MagneticField.h"
#include "MagneticField/Records/interface/IdealMagneticFieldRecord.h"

#include <memory>
#include <vector>
Expand Down Expand Up @@ -128,5 +134,7 @@ class DTDigitizer : public edm::stream::EDProducer<> {
std::string collection_for_XF;

edm::EDGetTokenT<CrossingFrame<PSimHit>> cf_token;
edm::ESGetToken<DTGeometry, MuonGeometryRecord> muonGeom_token;
edm::ESGetToken<MagneticField, IdealMagneticFieldRecord> magnField_token;
};
#endif