Skip to content

Commit

Permalink
Merge pull request #26352 from ianna/dd4hep-merge-geometry-v1
Browse files Browse the repository at this point in the history 
DD4hep: Merge Geometry Event Setup Records
  • Loading branch information
@cmsbuild
cmsbuild committed Apr 9, 2019
2 parents 65d5af1 + 904c606 commit bfad7ea
Show file tree
Hide file tree
Showing 20 changed files with 52 additions and 49 deletions.
4 changes: 2 additions & 2 deletions DetectorDescription/DDCMS/plugins/DDCMSDetector.cc
View file
Expand Up @@ -5,7 +5,7 @@
#include "FWCore/Framework/interface/ESTransientHandle.h"
#include "FWCore/Framework/interface/EventSetup.h"
#include "FWCore/MessageLogger/interface/MessageLogger.h"
#include "Geometry/Records/interface/DetectorDescriptionRcd.h"
#include "Geometry/Records/interface/GeometryFileRcd.h"
#include "DetectorDescription/DDCMS/interface/DDDetector.h"
#include "Geometry/Records/interface/DDVectorRegistryRcd.h"
#include "DetectorDescription/DDCMS/interface/DDVectorRegistry.h"
Expand Down Expand Up @@ -39,7 +39,7 @@ void
DDCMSDetector::analyze(const Event&, const EventSetup& iEventSetup)
{
ESTransientHandle<DDDetector> det;
iEventSetup.get<DetectorDescriptionRcd>().get(m_tag.module(), det);
iEventSetup.get<GeometryFileRcd>().get(m_tag.module(), det);

LogInfo("DDCMS") << "Iterate over the detectors:\n";
for( auto const& it : det->description()->detectors()) {
Expand Down
8 changes: 4 additions & 4 deletions DetectorDescription/DDCMS/plugins/DDDetectorESProducer.cc
View file
Expand Up @@ -24,7 +24,7 @@
#include "FWCore/Framework/interface/ESHandle.h"
#include "FWCore/MessageLogger/interface/MessageLogger.h"

#include "Geometry/Records/interface/DetectorDescriptionRcd.h"
#include "Geometry/Records/interface/GeometryFileRcd.h"
#include "DetectorDescription/DDCMS/interface/DDDetector.h"
#include "DD4hep/Detector.h"

Expand All @@ -41,7 +41,7 @@ class DDDetectorESProducer : public ESProducer,
using ReturnType = unique_ptr<DDDetector>;
using Detector = dd4hep::Detector;

ReturnType produce(const DetectorDescriptionRcd&);
ReturnType produce(const GeometryFileRcd&);
static void fillDescriptions(ConfigurationDescriptions&);

protected:
Expand All @@ -58,7 +58,7 @@ DDDetectorESProducer::DDDetectorESProducer(const ParameterSet& iConfig)
m_label(iConfig.getParameter<string>("appendToDataLabel"))
{
setWhatProduced(this);
findingRecord<DetectorDescriptionRcd>();
findingRecord<GeometryFileRcd>();
}

DDDetectorESProducer::~DDDetectorESProducer()
Expand All @@ -81,7 +81,7 @@ DDDetectorESProducer::setIntervalFor(const eventsetup::EventSetupRecordKey& iKey
}

DDDetectorESProducer::ReturnType
DDDetectorESProducer::produce(const DetectorDescriptionRcd& iRecord)
DDDetectorESProducer::produce(const GeometryFileRcd& iRecord)
{
LogDebug("Geometry") << "DDDetectorESProducer::Produce " << m_label;
return make_unique<DDDetector>(m_label, m_confGeomXMLFiles);
Expand Down
4 changes: 2 additions & 2 deletions DetectorDescription/DDCMS/plugins/DDSpecParRegistryESProducer.cc
View file
Expand Up @@ -26,7 +26,7 @@
#include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
#include "Geometry/Records/interface/DDSpecParRegistryRcd.h"
#include "DetectorDescription/DDCMS/interface/DDSpecParRegistry.h"
#include "Geometry/Records/interface/DetectorDescriptionRcd.h"
#include "Geometry/Records/interface/GeometryFileRcd.h"
#include "DetectorDescription/DDCMS/interface/DDDetector.h"
#include "DD4hep/Detector.h"

Expand Down Expand Up @@ -70,7 +70,7 @@ DDSpecParRegistryESProducer::ReturnType
DDSpecParRegistryESProducer::produce(const DDSpecParRegistryRcd& iRecord)
{
edm::ESHandle<DDDetector> det;
iRecord.getRecord<DetectorDescriptionRcd>().get(m_label, det);
iRecord.getRecord<GeometryFileRcd>().get(m_label, det);

const DDSpecParRegistry* registry = det->description()->extension<DDSpecParRegistry>();
auto product = std::make_unique<DDSpecParRegistry>();
Expand Down
4 changes: 2 additions & 2 deletions DetectorDescription/DDCMS/plugins/DDTestDumpFile.cc
View file
Expand Up @@ -3,7 +3,7 @@
#include "FWCore/Framework/interface/ESTransientHandle.h"
#include "FWCore/Framework/interface/EventSetup.h"
#include "FWCore/MessageLogger/interface/MessageLogger.h"
#include "Geometry/Records/interface/DetectorDescriptionRcd.h"
#include "Geometry/Records/interface/GeometryFileRcd.h"
#include "DetectorDescription/DDCMS/interface/DDDetector.h"
#include "DD4hep/Detector.h"
#include "DD4hep/DD4hepRootPersistency.h"
Expand Down Expand Up @@ -45,7 +45,7 @@ DDTestDumpFile::analyze(const Event&, const EventSetup& iEventSetup)
{
LogVerbatim("Geometry") << "DDTestDumpFile::analyze: " << m_label;
ESTransientHandle<DDDetector> det;
iEventSetup.get<DetectorDescriptionRcd>().get(m_label.module(), det);
iEventSetup.get<GeometryFileRcd>().get(m_label.module(), det);

TGeoManager& geom = det->description()->manager();

Expand Down
4 changes: 2 additions & 2 deletions DetectorDescription/DDCMS/plugins/DDTestDumpGeometry.cc
View file
Expand Up @@ -3,7 +3,7 @@
#include "FWCore/Framework/interface/ESTransientHandle.h"
#include "FWCore/Framework/interface/EventSetup.h"
#include "FWCore/MessageLogger/interface/MessageLogger.h"
#include "Geometry/Records/interface/DetectorDescriptionRcd.h"
#include "Geometry/Records/interface/GeometryFileRcd.h"
#include "DetectorDescription/DDCMS/interface/DDDetector.h"
#include "DD4hep/Detector.h"
#include "DD4hep/DD4hepRootPersistency.h"
Expand Down Expand Up @@ -40,7 +40,7 @@ DDTestDumpGeometry::analyze(const Event&, const EventSetup& iEventSetup)
{
LogVerbatim("Geometry") << "DDTestDumpGeometry::analyze: " << m_tag;
ESTransientHandle<DDDetector> det;
iEventSetup.get<DetectorDescriptionRcd>().get(m_tag.module(), det);
iEventSetup.get<GeometryFileRcd>().get(m_tag.module(), det);

TGeoManager const& geom = det->description()->manager();

Expand Down
4 changes: 2 additions & 2 deletions DetectorDescription/DDCMS/plugins/DDTestNavigateGeometry.cc
View file
Expand Up @@ -3,7 +3,7 @@
#include "FWCore/Framework/interface/ESTransientHandle.h"
#include "FWCore/Framework/interface/EventSetup.h"
#include "FWCore/MessageLogger/interface/MessageLogger.h"
#include "Geometry/Records/interface/DetectorDescriptionRcd.h"
#include "Geometry/Records/interface/GeometryFileRcd.h"
#include "DetectorDescription/DDCMS/interface/DDDetector.h"
#include "Geometry/Records/interface/DDVectorRegistryRcd.h"
#include "DetectorDescription/DDCMS/interface/DDVectorRegistry.h"
Expand Down Expand Up @@ -59,7 +59,7 @@ DDTestNavigateGeometry::analyze(const Event&, const EventSetup& iEventSetup)
}
});

const DetectorDescriptionRcd& ddRecord = iEventSetup.get<DetectorDescriptionRcd>();
const GeometryFileRcd& ddRecord = iEventSetup.get<GeometryFileRcd>();
ESTransientHandle<DDDetector> ddd;
ddRecord.get(m_tag.module(), ddd);

Expand Down
4 changes: 2 additions & 2 deletions DetectorDescription/DDCMS/plugins/DDVectorRegistryESProducer.cc
View file
Expand Up @@ -27,7 +27,7 @@
#include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
#include "Geometry/Records/interface/DDVectorRegistryRcd.h"
#include "DetectorDescription/DDCMS/interface/DDVectorRegistry.h"
#include "Geometry/Records/interface/DetectorDescriptionRcd.h"
#include "Geometry/Records/interface/GeometryFileRcd.h"
#include "DetectorDescription/DDCMS/interface/DDDetector.h"
#include "DD4hep/Detector.h"

Expand Down Expand Up @@ -73,7 +73,7 @@ DDVectorRegistryESProducer::produce(const DDVectorRegistryRcd& iRecord)
{
LogDebug("Geometry") << "DDVectorRegistryESProducer::produce\n";
edm::ESHandle<DDDetector> det;
iRecord.getRecord<DetectorDescriptionRcd>().get(m_label, det);
iRecord.getRecord<GeometryFileRcd>().get(m_label, det);

const DDVectorsMap& registry = det->vectors();

Expand Down
4 changes: 2 additions & 2 deletions DetectorDescription/DDCMS/src/ES_DDDetector.cc
View file
Expand Up @@ -2,7 +2,7 @@
#include "DetectorDescription/DDCMS/interface/DDDetector.h"
#include "DetectorDescription/DDCMS/interface/DDSpecParRegistry.h"
#include "DetectorDescription/DDCMS/interface/DDVectorRegistry.h"
#include "Geometry/Records/interface/DetectorDescriptionRcd.h"
#include "Geometry/Records/interface/GeometryFileRcd.h"
#include "FWCore/Framework/interface/data_default_record_trait.h"

using namespace cms;
Expand All @@ -11,4 +11,4 @@ TYPELOOKUP_DATA_REG(DDDetector);
TYPELOOKUP_DATA_REG(DDSpecParRegistry);
TYPELOOKUP_DATA_REG(DDVectorRegistry);

EVENTSETUP_DATA_DEFAULT_RECORD(DDDetector, DetectorDescriptionRcd);
EVENTSETUP_DATA_DEFAULT_RECORD(DDDetector, GeometryFileRcd);
2 changes: 0 additions & 2 deletions DetectorDescription/Parser/test/testmat.cpp
View file
Expand Up @@ -60,8 +60,6 @@ int main(int argc, char *argv[])
edm::makeParameterSets(config, params);
edm::ServiceToken tempToken(edm::ServiceRegistry::createServicesFromConfig(std::move(params)));



// E. Make the services available.
edm::ServiceRegistry::Operate operate(tempToken);

Expand Down
1 change: 0 additions & 1 deletion DetectorDescription/RegressionTest/test/dumpDDCompactView.cpp
View file
Expand Up @@ -68,7 +68,6 @@ int main(int argc, char *argv[])
edm::makeParameterSets(config, params);
edm::ServiceToken tempToken(edm::ServiceRegistry::createServicesFromConfig(std::move(params)));


// E. Make the services available.
edm::ServiceRegistry::Operate operate(tempToken);

Expand Down
4 changes: 2 additions & 2 deletions Geometry/DTGeometryBuilder/plugins/DTGeometryValidate.cc
View file
Expand Up @@ -7,7 +7,7 @@

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

#include "Fireworks/Core/interface/FWGeometry.h"

Expand Down Expand Up @@ -95,7 +95,7 @@ DTGeometryValidate::DTGeometryValidate(const edm::ParameterSet& iConfig)
void
DTGeometryValidate::analyze(const edm::Event& event, const edm::EventSetup& eventSetup)
{
eventSetup.get<MuonGeometryRcd>().get(dtGeometry_);
eventSetup.get<MuonGeometryRecord>().get(dtGeometry_);

if(dtGeometry_.isValid()) {
LogVerbatim("DTGeometry") << "Validating DT chamber geometry";
Expand Down
6 changes: 3 additions & 3 deletions Geometry/DTGeometryBuilder/plugins/dd4hep/DTGeometryBuilder.cc
View file
Expand Up @@ -30,9 +30,9 @@
#include "DataFormats/GeometrySurface/interface/RectangularPlaneBounds.h"

#include "Geometry/MuonNumbering/interface/DD4hep_MuonNumbering.h"
#include "Geometry/Records/interface/MuonNumberingRcd.h"
#include "Geometry/Records/interface/MuonGeometryRcd.h"
#include "Geometry/Records/interface/DetectorDescriptionRcd.h"
#include "Geometry/Records/interface/MuonNumberingRecord.h"
#include "Geometry/Records/interface/MuonGeometryRecord.h"
#include "Geometry/Records/interface/GeometryFileRcd.h"
#include "DetectorDescription/DDCMS/interface/DDDetector.h"
#include "DetectorDescription/DDCMS/interface/DDFilteredView.h"
#include "Geometry/DTGeometry/interface/DTGeometry.h"
Expand Down
20 changes: 10 additions & 10 deletions Geometry/DTGeometryBuilder/plugins/dd4hep/DTGeometryESProducer.cc
View file
Expand Up @@ -37,10 +37,10 @@
#include "FWCore/ParameterSet/interface/ParameterSet.h"
#include "FWCore/Utilities/interface/ReusableObjectHolder.h"
#include "Geometry/MuonNumbering/interface/DD4hep_MuonNumbering.h"
#include "Geometry/Records/interface/MuonNumberingRcd.h"
#include "Geometry/Records/interface/MuonGeometryRcd.h"
#include "Geometry/Records/interface/MuonNumberingRecord.h"
#include "Geometry/Records/interface/MuonGeometryRecord.h"
#include "Geometry/Records/interface/DDSpecParRegistryRcd.h"
#include "Geometry/Records/interface/DetectorDescriptionRcd.h"
#include "Geometry/Records/interface/GeometryFileRcd.h"
#include "DetectorDescription/DDCMS/interface/DDSpecParRegistry.h"
#include "DetectorDescription/DDCMS/interface/DDDetector.h"
#include "DetectorDescription/DDCMS/interface/DDFilteredView.h"
Expand All @@ -65,15 +65,15 @@ class DTGeometryESProducer : public ESProducer {
using ReturnType = shared_ptr<DTGeometry>;
using Detector = dd4hep::Detector;

ReturnType produce(const MuonGeometryRcd& record);
ReturnType produce(const MuonGeometryRecord& record);

private:

using HostType = ESProductHost<DTGeometry,
MuonNumberingRcd,
MuonNumberingRecord,
DTRecoGeometryRcd>;

void setupGeometry(MuonNumberingRcd const&, shared_ptr<HostType>&);
void setupGeometry(MuonNumberingRecord const&, shared_ptr<HostType>&);
void setupDBGeometry(DTRecoGeometryRcd const&, shared_ptr<HostType>&);

ReusableObjectHolder<HostType> m_holder;
Expand Down Expand Up @@ -108,7 +108,7 @@ DTGeometryESProducer::DTGeometryESProducer(const ParameterSet & iConfig)
DTGeometryESProducer::~DTGeometryESProducer(){}

std::shared_ptr<DTGeometry>
DTGeometryESProducer::produce(const MuonGeometryRcd & record) {
DTGeometryESProducer::produce(const MuonGeometryRecord & record) {

auto host = m_holder.makeOrGet([]() {
return new HostType;
Expand All @@ -118,7 +118,7 @@ DTGeometryESProducer::produce(const MuonGeometryRcd & record) {
BenchmarkGrd counter("DTGeometryESProducer");

if(m_fromDDD) {
host->ifRecordChanges<MuonNumberingRcd>(record,
host->ifRecordChanges<MuonNumberingRecord>(record,
[this, &host](auto const& rec) {
setupGeometry(rec, host);
});
Expand Down Expand Up @@ -159,15 +159,15 @@ DTGeometryESProducer::produce(const MuonGeometryRcd & record) {
}

void
DTGeometryESProducer::setupGeometry(const MuonNumberingRcd& record,
DTGeometryESProducer::setupGeometry(const MuonNumberingRecord& record,
shared_ptr<HostType>& host) {
host->clear();

edm::ESHandle<MuonNumbering> mdc;
record.get(mdc);

edm::ESTransientHandle<DDDetector> cpv;
record.getRecord<DetectorDescriptionRcd>().get(m_tag.module(), cpv);
record.getRecord<GeometryFileRcd>().get(m_tag.module(), cpv);

ESTransientHandle<DDSpecParRegistry> registry;
record.getRecord<DDSpecParRegistryRcd>().get(m_tag.module(), registry);
Expand Down
4 changes: 2 additions & 2 deletions Geometry/DTGeometryBuilder/plugins/dd4hep/DTGeometryTest.cc
View file
Expand Up @@ -4,7 +4,7 @@
#include "FWCore/Framework/interface/EventSetup.h"
#include "FWCore/MessageLogger/interface/MessageLogger.h"
#include "Geometry/DTGeometry/interface/DTGeometry.h"
#include "Geometry/Records/interface/MuonGeometryRcd.h"
#include "Geometry/Records/interface/MuonGeometryRecord.h"

#include <iostream>
#include <string>
Expand Down Expand Up @@ -34,7 +34,7 @@ DTGeometryTest::analyze(const Event&, const EventSetup& iEventSetup)
{
LogVerbatim("Geometry") << "DTGeometryTest::analyze: " << m_label;
ESTransientHandle<DTGeometry> pDD;
iEventSetup.get<MuonGeometryRcd>().get(m_label, pDD);
iEventSetup.get<MuonGeometryRecord>().get(m_label, pDD);

LogVerbatim("Geometry") << " Geometry node for DTGeom is " << &(*pDD);
LogVerbatim("Geometry") << " I have " << pDD->detTypes().size() << " detTypes";
Expand Down
4 changes: 2 additions & 2 deletions Geometry/MuonNumbering/plugins/DDTestMuonNumbering.cc
View file
Expand Up @@ -3,7 +3,7 @@
#include "FWCore/Framework/interface/ESTransientHandle.h"
#include "FWCore/Framework/interface/EventSetup.h"
#include "FWCore/MessageLogger/interface/MessageLogger.h"
#include "Geometry/Records/interface/MuonNumberingRcd.h"
#include "Geometry/Records/interface/MuonNumberingRecord.h"
#include "Geometry/MuonNumbering/interface/DD4hep_MuonNumbering.h"

#include <iostream>
Expand All @@ -26,7 +26,7 @@ DDTestMuonNumbering::analyze(const Event&, const EventSetup& iEventSetup)
{
LogVerbatim("Geometry") << "DDTestMuonNumbering::analyze";
ESTransientHandle<MuonNumbering> numbering;
iEventSetup.get<MuonNumberingRcd>().get(numbering);
iEventSetup.get<MuonNumberingRecord>().get(numbering);

LogVerbatim("Geometry") << "MuonNumbering size: " << numbering->values().size();
LogVerbatim("Geometry").log([&numbering](auto& log) {
Expand Down
6 changes: 3 additions & 3 deletions Geometry/MuonNumbering/plugins/MuonNumberingESProducer.cc
View file
Expand Up @@ -23,7 +23,7 @@
#include "FWCore/Framework/interface/ESProducer.h"
#include "FWCore/Framework/interface/ESHandle.h"
#include "FWCore/MessageLogger/interface/MessageLogger.h"
#include "Geometry/Records/interface/MuonNumberingRcd.h"
#include "Geometry/Records/interface/MuonNumberingRecord.h"
#include "Geometry/MuonNumbering/interface/DD4hep_MuonNumbering.h"
#include "Geometry/Records/interface/DDSpecParRegistryRcd.h"
#include "DetectorDescription/DDCMS/interface/DDSpecParRegistry.h"
Expand All @@ -39,7 +39,7 @@ class MuonNumberingESProducer : public ESProducer {

using ReturnType = unique_ptr<MuonNumbering>;

ReturnType produce(const MuonNumberingRcd&);
ReturnType produce(const MuonNumberingRecord&);

private:
const string m_label;
Expand All @@ -58,7 +58,7 @@ MuonNumberingESProducer::~MuonNumberingESProducer()
{}

MuonNumberingESProducer::ReturnType
MuonNumberingESProducer::produce(const MuonNumberingRcd& iRecord)
MuonNumberingESProducer::produce(const MuonNumberingRecord& iRecord)
{
LogDebug("Geometry") << "MuonNumberingESProducer::produce from " << m_label << " with " << m_key;
auto product = make_unique<MuonNumbering>();
Expand Down
5 changes: 3 additions & 2 deletions Geometry/Records/interface/DDSpecParRegistryRcd.h
View file
Expand Up @@ -2,9 +2,10 @@
#define GEOMETRY_RECORDS_DD_SPECPAR_REGISTRY_RCD_H

#include "FWCore/Framework/interface/DependentRecordImplementation.h"
#include "Geometry/Records/interface/DetectorDescriptionRcd.h"
#include "Geometry/Records/interface/GeometryFileRcd.h"
#include "boost/mpl/vector.hpp"

class DDSpecParRegistryRcd : public edm::eventsetup::DependentRecordImplementation<
DDSpecParRegistryRcd, boost::mpl::vector<DetectorDescriptionRcd>> {};
DDSpecParRegistryRcd, boost::mpl::vector<GeometryFileRcd>> {};

#endif
5 changes: 3 additions & 2 deletions Geometry/Records/interface/DDVectorRegistryRcd.h
View file
Expand Up @@ -2,9 +2,10 @@
#define GEOMETRY_RECORDS_DD_VECTOR_REGISTRY_RCD_H

#include "FWCore/Framework/interface/DependentRecordImplementation.h"
#include "Geometry/Records/interface/DetectorDescriptionRcd.h"
#include "Geometry/Records/interface/GeometryFileRcd.h"
#include "boost/mpl/vector.hpp"

class DDVectorRegistryRcd : public edm::eventsetup::DependentRecordImplementation<
DDVectorRegistryRcd, boost::mpl::vector<DetectorDescriptionRcd>> {};
DDVectorRegistryRcd, boost::mpl::vector<GeometryFileRcd>> {};

#endif
4 changes: 3 additions & 1 deletion Geometry/Records/interface/MuonGeometryRecord.h
View file
Expand Up @@ -10,6 +10,8 @@
#include "FWCore/Framework/interface/EventSetupRecordImplementation.h"
#include "FWCore/Framework/interface/DependentRecordImplementation.h"
#include "Geometry/Records/interface/IdealGeometryRecord.h"
#include "Geometry/Records/interface/GeometryFileRcd.h"
#include "Geometry/Records/interface/DDSpecParRegistryRcd.h"
#include "Geometry/Records/interface/MuonNumberingRecord.h"
#include "Geometry/Records/interface/ME0RecoGeometryRcd.h"
#include "Geometry/Records/interface/GEMRecoGeometryRcd.h"
Expand All @@ -25,6 +27,6 @@
#include "CondFormats/AlignmentRecord/interface/CSCAlignmentErrorRcd.h"
#include "CondFormats/AlignmentRecord/interface/CSCAlignmentErrorExtendedRcd.h"
#include "CondFormats/AlignmentRecord/interface/GlobalPositionRcd.h"
class MuonGeometryRecord : public edm::eventsetup::DependentRecordImplementation<MuonGeometryRecord,boost::mpl::vector<IdealGeometryRecord, MuonNumberingRecord, DTAlignmentRcd, DTAlignmentErrorRcd, DTAlignmentErrorExtendedRcd, CSCAlignmentRcd, CSCAlignmentErrorRcd, CSCAlignmentErrorExtendedRcd, GlobalPositionRcd, ME0RecoGeometryRcd, GEMRecoGeometryRcd, RPCRecoGeometryRcd, DTRecoGeometryRcd, CSCRecoGeometryRcd, CSCRecoDigiParametersRcd> > {};
class MuonGeometryRecord : public edm::eventsetup::DependentRecordImplementation<MuonGeometryRecord,boost::mpl::vector<IdealGeometryRecord, DDSpecParRegistryRcd, GeometryFileRcd, MuonNumberingRecord, DTAlignmentRcd, DTAlignmentErrorRcd, DTAlignmentErrorExtendedRcd, CSCAlignmentRcd, CSCAlignmentErrorRcd, CSCAlignmentErrorExtendedRcd, GlobalPositionRcd, ME0RecoGeometryRcd, GEMRecoGeometryRcd, RPCRecoGeometryRcd, DTRecoGeometryRcd, CSCRecoGeometryRcd, CSCRecoDigiParametersRcd> > {};

#endif
4 changes: 3 additions & 1 deletion Geometry/Records/interface/MuonNumberingRecord.h
View file
Expand Up @@ -20,11 +20,13 @@

#include <boost/mpl/vector.hpp>
#include "Geometry/Records/interface/IdealGeometryRecord.h"
#include "Geometry/Records/interface/GeometryFileRcd.h"
#include "Geometry/Records/interface/DDSpecParRegistryRcd.h"
#include "FWCore/Framework/interface/DependentRecordImplementation.h"
#include "Geometry/Records/interface/CSCRecoDigiParametersRcd.h"
#include "Geometry/Records/interface/CSCRecoGeometryRcd.h"
#include "Geometry/Records/interface/DTRecoGeometryRcd.h"

class MuonNumberingRecord : public edm::eventsetup::DependentRecordImplementation<MuonNumberingRecord, boost::mpl::vector<IdealGeometryRecord, CSCRecoDigiParametersRcd, CSCRecoGeometryRcd, DTRecoGeometryRcd> > {};
class MuonNumberingRecord : public edm::eventsetup::DependentRecordImplementation<MuonNumberingRecord, boost::mpl::vector<IdealGeometryRecord, CSCRecoDigiParametersRcd, CSCRecoGeometryRcd, DTRecoGeometryRcd, DDSpecParRegistryRcd, GeometryFileRcd> > {};

#endif

0 comments on commit bfad7ea

Please sign in to comment.