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

Migrate ESProducers in DetectorDescription from setConsumes() to type-deducing consumes() #31438

Merged
merged 1 commit into from Sep 12, 2020
Merged

Migrate ESProducers in DetectorDescription from setConsumes() to type-deducing consumes() #31438

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
4 changes: 2 additions & 2 deletions DetectorDescription/DDCMS/plugins/DDDetectorESProducer.cc
View file
Open in desktop
Expand Up @@ -73,14 +73,14 @@ DDDetectorESProducer::DDDetectorESProducer(const ParameterSet& iConfig)
&DDDetectorESProducer::produceMagField,
edm::es::Label(iConfig.getParameter<std::string>("@module_label")));
if (fromDB_) {
c.setConsumes(mfToken_, edm::ESInputTag("", label_));
mfToken_ = c.consumes(edm::ESInputTag("", label_));
}
findingRecord<IdealMagneticFieldRecord>();
} else {
auto c = setWhatProduced(
this, &DDDetectorESProducer::produceGeom, edm::es::Label(iConfig.getParameter<std::string>("@module_label")));
if (fromDB_) {
c.setConsumes(geomToken_, edm::ESInputTag("", label_));
geomToken_ = c.consumes(edm::ESInputTag("", label_));
}
findingRecord<IdealGeometryRecord>();
}
Expand Down
8 changes: 4 additions & 4 deletions DetectorDescription/DDCMS/plugins/DDSpecParRegistryESProducer.cc
View file
Open in desktop
Expand Up @@ -45,12 +45,12 @@ class DDSpecParRegistryESProducer : public edm::ESProducer {
ReturnType produce(const DDSpecParRegistryRcd&);

private:
edm::ESGetToken<DDDetector, IdealGeometryRecord> m_token;
const edm::ESGetToken<DDDetector, IdealGeometryRecord> m_token;
};

DDSpecParRegistryESProducer::DDSpecParRegistryESProducer(const edm::ParameterSet& iConfig) {
setWhatProduced(this).setConsumes(m_token,
edm::ESInputTag("", iConfig.getParameter<std::string>("appendToDataLabel")));
DDSpecParRegistryESProducer::DDSpecParRegistryESProducer(const edm::ParameterSet& iConfig)
: m_token(
setWhatProduced(this).consumes(edm::ESInputTag("", iConfig.getParameter<std::string>("appendToDataLabel")))) {
}

DDSpecParRegistryESProducer::~DDSpecParRegistryESProducer() {}
Expand Down
7 changes: 3 additions & 4 deletions DetectorDescription/DDCMS/plugins/DDVectorRegistryESProducer.cc
View file
Open in desktop
Expand Up @@ -47,12 +47,11 @@ class DDVectorRegistryESProducer : public edm::ESProducer {
ReturnType produce(const DDVectorRegistryRcd&);

private:
edm::ESGetToken<DDDetector, IdealGeometryRecord> m_token;
const edm::ESGetToken<DDDetector, IdealGeometryRecord> m_token;
};

DDVectorRegistryESProducer::DDVectorRegistryESProducer(const edm::ParameterSet& iConfig) {
setWhatProduced(this).setConsumes(m_token, edm::ESInputTag("", iConfig.getParameter<string>("appendToDataLabel")));
}
DDVectorRegistryESProducer::DDVectorRegistryESProducer(const edm::ParameterSet& iConfig)
: m_token(setWhatProduced(this).consumes(edm::ESInputTag("", iConfig.getParameter<string>("appendToDataLabel")))) {}

DDVectorRegistryESProducer::~DDVectorRegistryESProducer() {}

Expand Down