Skip to content

Commit

Permalink
Merge pull request #35157 from sroychow/condtoolsgeomesConsumes
Browse files Browse the repository at this point in the history 
Migrate CondTools-Ecal modules to use esconsumes
  • Loading branch information
@cmsbuild
cmsbuild authored Sep 6, 2021
2 parents 19d89cf + 49615d2 commit 311e964
Show file tree
Hide file tree
Showing 11 changed files with 113 additions and 84 deletions.
16 changes: 9 additions & 7 deletions CondTools/Geometry/plugins/CSCRecoIdealDBLoader.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,16 @@ class CSCRecoIdealDBLoader : public edm::one::EDAnalyzer<edm::one::WatchRuns> {

private:
bool fromDD4Hep_;
edm::ESGetToken<cms::DDCompactView, IdealGeometryRecord> dd4HepCompactViewToken_;
edm::ESGetToken<DDCompactView, IdealGeometryRecord> compactViewToken_;
edm::ESGetToken<MuonGeometryConstants, IdealGeometryRecord> muonGeomConstantsToken_;
};

CSCRecoIdealDBLoader::CSCRecoIdealDBLoader(const edm::ParameterSet& iC) {
fromDD4Hep_ = iC.getUntrackedParameter<bool>("fromDD4Hep", false);
dd4HepCompactViewToken_ = esConsumes<edm::Transition::BeginRun>();
compactViewToken_ = esConsumes<edm::Transition::BeginRun>();
muonGeomConstantsToken_ = esConsumes<edm::Transition::BeginRun>();
}

void CSCRecoIdealDBLoader::beginRun(const edm::Run&, edm::EventSetup const& es) {
Expand All @@ -45,19 +51,15 @@ void CSCRecoIdealDBLoader::beginRun(const edm::Run&, edm::EventSetup const& es)
return;
}

edm::ESHandle<MuonGeometryConstants> pMNDC;
auto pMNDC = es.getHandle(muonGeomConstantsToken_);
CSCGeometryParsFromDD cscgp;

if (fromDD4Hep_) {
edm::ESTransientHandle<cms::DDCompactView> pDD;
es.get<IdealGeometryRecord>().get(pDD);
es.get<IdealGeometryRecord>().get(pMNDC);
auto pDD = es.getTransientHandle(dd4HepCompactViewToken_);
const cms::DDCompactView& cpv = *pDD;
cscgp.build(&cpv, *pMNDC, *rig, *rdp);
} else {
edm::ESTransientHandle<DDCompactView> pDD;
es.get<IdealGeometryRecord>().get(pDD);
es.get<IdealGeometryRecord>().get(pMNDC);
auto pDD = es.getTransientHandle(compactViewToken_);
const DDCompactView& cpv = *pDD;
cscgp.build(&cpv, *pMNDC, *rig, *rdp);
}
Expand Down
16 changes: 9 additions & 7 deletions CondTools/Geometry/plugins/DTRecoIdealDBLoader.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,16 @@ class DTRecoIdealDBLoader : public edm::one::EDAnalyzer<edm::one::WatchRuns> {

private:
bool fromDD4Hep_;
edm::ESGetToken<cms::DDCompactView, IdealGeometryRecord> dd4HepCompactViewToken_;
edm::ESGetToken<DDCompactView, IdealGeometryRecord> compactViewToken_;
edm::ESGetToken<MuonGeometryConstants, IdealGeometryRecord> muonGeomConstantsToken_;
};

DTRecoIdealDBLoader::DTRecoIdealDBLoader(const edm::ParameterSet& iC) {
fromDD4Hep_ = iC.getUntrackedParameter<bool>("fromDD4Hep", false);
dd4HepCompactViewToken_ = esConsumes<edm::Transition::BeginRun>();
compactViewToken_ = esConsumes<edm::Transition::BeginRun>();
muonGeomConstantsToken_ = esConsumes<edm::Transition::BeginRun>();
}

void DTRecoIdealDBLoader::beginRun(const edm::Run&, edm::EventSetup const& es) {
Expand All @@ -43,19 +49,15 @@ void DTRecoIdealDBLoader::beginRun(const edm::Run&, edm::EventSetup const& es) {
return;
}

edm::ESHandle<MuonGeometryConstants> pMNDC;
auto pMNDC = es.getHandle(muonGeomConstantsToken_);
DTGeometryParsFromDD dtgp;

if (fromDD4Hep_) {
edm::ESTransientHandle<cms::DDCompactView> pDD;
es.get<IdealGeometryRecord>().get(pDD);
es.get<IdealGeometryRecord>().get(pMNDC);
auto pDD = es.getTransientHandle(dd4HepCompactViewToken_);
const cms::DDCompactView& cpv = *pDD;
dtgp.build(&cpv, *pMNDC, *rig);
} else {
edm::ESTransientHandle<DDCompactView> pDD;
es.get<IdealGeometryRecord>().get(pDD);
es.get<IdealGeometryRecord>().get(pMNDC);
auto pDD = es.getTransientHandle(compactViewToken_);
const DDCompactView& cpv = *pDD;
dtgp.build(&cpv, *pMNDC, *rig);
}
Expand Down
17 changes: 10 additions & 7 deletions CondTools/Geometry/plugins/GEMRecoIdealDBLoader.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,16 @@ class GEMRecoIdealDBLoader : public edm::one::EDAnalyzer<edm::one::WatchRuns> {

private:
bool fromDD4Hep_;
edm::ESGetToken<cms::DDCompactView, IdealGeometryRecord> dd4HepCompactViewToken_;
edm::ESGetToken<DDCompactView, IdealGeometryRecord> compactViewToken_;
edm::ESGetToken<MuonGeometryConstants, IdealGeometryRecord> muonGeomConstantsToken_;
};

GEMRecoIdealDBLoader::GEMRecoIdealDBLoader(const edm::ParameterSet& iC) {
fromDD4Hep_ = iC.getUntrackedParameter<bool>("fromDD4Hep", false); // set true for DD4HEP
dd4HepCompactViewToken_ = esConsumes<edm::Transition::BeginRun>();
compactViewToken_ = esConsumes<edm::Transition::BeginRun>();
muonGeomConstantsToken_ = esConsumes<edm::Transition::BeginRun>();
}

void GEMRecoIdealDBLoader::beginRun(const edm::Run&, edm::EventSetup const& es) {
Expand All @@ -46,22 +52,19 @@ void GEMRecoIdealDBLoader::beginRun(const edm::Run&, edm::EventSetup const& es)
}

if (mydbservice->isNewTagRequest("GEMRecoGeometryRcd")) {
edm::ESHandle<MuonGeometryConstants> pMNDC;
auto pMNDC = es.getHandle(muonGeomConstantsToken_);

GEMGeometryParsFromDD rpcpd;
RecoIdealGeometry* rig = new RecoIdealGeometry;

if (fromDD4Hep_) {
edm::LogVerbatim("GEMRecoIdealDBLoader") << "(0) GEMRecoIdealDBLoader - DD4HEP ";
edm::ESTransientHandle<cms::DDCompactView> pDD;
es.get<IdealGeometryRecord>().get(pDD);
es.get<IdealGeometryRecord>().get(pMNDC);
auto pDD = es.getTransientHandle(dd4HepCompactViewToken_);
const cms::DDCompactView& cpv = *pDD;
rpcpd.build(&cpv, *pMNDC, *rig);
} else {
edm::LogVerbatim("GEMRecoIdealDBLoader") << "(0) GEMRecoIdealDBLoader - DDD ";
edm::ESTransientHandle<DDCompactView> pDD;
es.get<IdealGeometryRecord>().get(pDD);
es.get<IdealGeometryRecord>().get(pMNDC);
auto pDD = es.getTransientHandle(compactViewToken_);
const DDCompactView& cpv = *pDD;
rpcpd.build(&cpv, *pMNDC, *rig);
}
Expand Down
10 changes: 6 additions & 4 deletions CondTools/Geometry/plugins/HcalParametersDBBuilder.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ class HcalParametersDBBuilder : public edm::one::EDAnalyzer<edm::one::WatchRuns>

private:
bool fromDD4Hep_;
edm::ESGetToken<cms::DDCompactView, IdealGeometryRecord> dd4HepCompactViewToken_;
edm::ESGetToken<DDCompactView, IdealGeometryRecord> compactViewToken_;
};

HcalParametersDBBuilder::HcalParametersDBBuilder(const edm::ParameterSet& ps)
Expand All @@ -34,6 +36,8 @@ HcalParametersDBBuilder::HcalParametersDBBuilder(const edm::ParameterSet& ps)
edm::LogVerbatim("HCalGeom") << "HcalParametersDBBuilder::HcalParametersDBBuilder called with dd4hep: "
<< fromDD4Hep_;
#endif
dd4HepCompactViewToken_ = esConsumes<edm::Transition::BeginRun>();
compactViewToken_ = esConsumes<edm::Transition::BeginRun>();
}

void HcalParametersDBBuilder::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
Expand All @@ -56,15 +60,13 @@ void HcalParametersDBBuilder::beginRun(const edm::Run&, edm::EventSetup const& e
#ifdef EDM_ML_DEBUG
edm::LogVerbatim("HCalGeom") << "HcalParametersDBBuilder::Try to access cms::DDCompactView";
#endif
edm::ESTransientHandle<cms::DDCompactView> cpv;
es.get<IdealGeometryRecord>().get(cpv);
auto cpv = es.getTransientHandle(dd4HepCompactViewToken_);
builder.build((*cpv), *php);
} else {
#ifdef EDM_ML_DEBUG
edm::LogVerbatim("HCalGeom") << "HcalParametersDBBuilder::Try to access DDCompactView";
#endif
edm::ESTransientHandle<DDCompactView> cpv;
es.get<IdealGeometryRecord>().get(cpv);
auto cpv = es.getTransientHandle(compactViewToken_);
builder.build(&(*cpv), *php);
}

Expand Down
16 changes: 9 additions & 7 deletions CondTools/Geometry/plugins/ME0RecoIdealDBLoader.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,16 @@ class ME0RecoIdealDBLoader : public edm::one::EDAnalyzer<edm::one::WatchRuns> {

private:
bool fromDD4Hep_;
edm::ESGetToken<cms::DDCompactView, IdealGeometryRecord> dd4HepCompactViewToken_;
edm::ESGetToken<DDCompactView, IdealGeometryRecord> compactViewToken_;
edm::ESGetToken<MuonGeometryConstants, IdealGeometryRecord> muonGeomConstantsToken_;
};

ME0RecoIdealDBLoader::ME0RecoIdealDBLoader(const edm::ParameterSet& iC) {
fromDD4Hep_ = iC.getUntrackedParameter<bool>("fromDD4Hep", false); // set true for DD4HEP
dd4HepCompactViewToken_ = esConsumes<edm::Transition::BeginRun>();
compactViewToken_ = esConsumes<edm::Transition::BeginRun>();
muonGeomConstantsToken_ = esConsumes<edm::Transition::BeginRun>();
}

void ME0RecoIdealDBLoader::beginRun(const edm::Run&, edm::EventSetup const& es) {
Expand All @@ -44,21 +50,17 @@ void ME0RecoIdealDBLoader::beginRun(const edm::Run&, edm::EventSetup const& es)
}

if (mydbservice->isNewTagRequest("ME0RecoGeometryRcd")) {
edm::ESHandle<MuonGeometryConstants> pMNDC;
auto pMNDC = es.getHandle(muonGeomConstantsToken_);
ME0GeometryParsFromDD me0pd;
RecoIdealGeometry* rig = new RecoIdealGeometry;
if (fromDD4Hep_) {
edm::LogVerbatim("ME0RecoIdealDBLoader") << "(0) ME0RecoIdealDBLoader - DD4HEP ";
edm::ESTransientHandle<cms::DDCompactView> pDD;
es.get<IdealGeometryRecord>().get(pDD);
es.get<IdealGeometryRecord>().get(pMNDC);
auto pDD = es.getTransientHandle(dd4HepCompactViewToken_);
const cms::DDCompactView& cpv = *pDD;
me0pd.build(&cpv, *pMNDC, *rig);
} else {
edm::LogVerbatim("ME0RecoIdealDBLoader") << "(0) ME0RecoIdealDBLoader - DDD ";
edm::ESTransientHandle<DDCompactView> pDD;
es.get<IdealGeometryRecord>().get(pDD);
es.get<IdealGeometryRecord>().get(pMNDC);
auto pDD = es.getTransientHandle(compactViewToken_);
const DDCompactView& cpv = *pDD;
me0pd.build(&cpv, *pMNDC, *rig);
}
Expand Down
64 changes: 36 additions & 28 deletions CondTools/Geometry/plugins/PCaloGeometryBuilder.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,17 @@ class PCaloGeometryBuilder : public edm::one::EDAnalyzer<edm::one::WatchRuns> {
PCaloGeometryBuilder(const edm::ParameterSet& pset)
: m_ecalE(pset.getUntrackedParameter<bool>("EcalE", true)),
m_ecalP(pset.getUntrackedParameter<bool>("EcalP", true)),
m_hgcal(pset.getUntrackedParameter<bool>("HGCal", false)) {}
m_hgcal(pset.getUntrackedParameter<bool>("HGCal", false)) {
const std::string toDB("_toDB");
ebGeomToken_ = esConsumes<edm::Transition::BeginRun>(edm::ESInputTag(EcalBarrelGeometry::producerTag() + toDB));
eeGeomToken_ = esConsumes<edm::Transition::BeginRun>(edm::ESInputTag(EcalEndcapGeometry::producerTag() + toDB));
esGeomToken_ = esConsumes<edm::Transition::BeginRun>(edm::ESInputTag(EcalPreshowerGeometry::producerTag() + toDB));
hgcalGeomToken_ = esConsumes<edm::Transition::BeginRun>(edm::ESInputTag(HGCalGeometry::producerTag() + toDB));
hcalGeomToken_ = esConsumes<edm::Transition::BeginRun>(edm::ESInputTag(HcalGeometry::producerTag() + toDB));
ctGeomToken_ = esConsumes<edm::Transition::BeginRun>(edm::ESInputTag(CaloTowerGeometry::producerTag() + toDB));
zdcGeomToken_ = esConsumes<edm::Transition::BeginRun>(edm::ESInputTag(ZdcGeometry::producerTag() + toDB));
castGeomToken_ = esConsumes<edm::Transition::BeginRun>(edm::ESInputTag(CastorGeometry::producerTag() + toDB));
}

void beginRun(edm::Run const& iEvent, edm::EventSetup const&) override;
void analyze(edm::Event const& iEvent, edm::EventSetup const&) override {}
Expand All @@ -29,48 +39,46 @@ class PCaloGeometryBuilder : public edm::one::EDAnalyzer<edm::one::WatchRuns> {
bool m_ecalE;
bool m_ecalP;
bool m_hgcal;
edm::ESGetToken<CaloSubdetectorGeometry, EcalBarrelGeometry::AlignedRecord> ebGeomToken_;
edm::ESGetToken<CaloSubdetectorGeometry, EcalEndcapGeometry::AlignedRecord> eeGeomToken_;
edm::ESGetToken<CaloSubdetectorGeometry, EcalPreshowerGeometry::AlignedRecord> esGeomToken_;
edm::ESGetToken<CaloSubdetectorGeometry, HGCalGeometry::AlignedRecord> hgcalGeomToken_;
edm::ESGetToken<CaloSubdetectorGeometry, HcalGeometry::AlignedRecord> hcalGeomToken_;
edm::ESGetToken<CaloSubdetectorGeometry, CaloTowerGeometry::AlignedRecord> ctGeomToken_;
edm::ESGetToken<CaloSubdetectorGeometry, ZdcGeometry::AlignedRecord> zdcGeomToken_;
edm::ESGetToken<CaloSubdetectorGeometry, CastorGeometry::AlignedRecord> castGeomToken_;
};

void PCaloGeometryBuilder::beginRun(const edm::Run&, edm::EventSetup const& es) {
const std::string toDB("_toDB");

std::cout << "Writing out " << EcalBarrelGeometry::producerTag() << std::endl;
edm::ESHandle<CaloSubdetectorGeometry> pGeb;
es.get<EcalBarrelGeometry::AlignedRecord>().get(EcalBarrelGeometry::producerTag() + toDB, pGeb);

edm::LogInfo("PCaloGeometryBuilder") << "Writing out " << EcalBarrelGeometry::producerTag() << std::endl;
auto pGeb = es.getHandle(ebGeomToken_);
if (m_ecalE) {
std::cout << "Writing out " << EcalEndcapGeometry::producerTag() << std::endl;
edm::ESHandle<CaloSubdetectorGeometry> pGee;
es.get<EcalEndcapGeometry::AlignedRecord>().get(EcalEndcapGeometry::producerTag() + toDB, pGee);
edm::LogInfo("PCaloGeometryBuilder") << "Writing out " << EcalEndcapGeometry::producerTag() << std::endl;
auto pGeb = es.getHandle(eeGeomToken_);
}

if (m_ecalP) {
std::cout << "Writing out " << EcalPreshowerGeometry::producerTag() << std::endl;
edm::ESHandle<CaloSubdetectorGeometry> pGes;
es.get<EcalPreshowerGeometry::AlignedRecord>().get(EcalPreshowerGeometry::producerTag() + toDB, pGes);
edm::LogInfo("PCaloGeometryBuilder") << "Writing out " << EcalPreshowerGeometry::producerTag() << std::endl;
auto pGes = es.getHandle(esGeomToken_);
}

if (m_hgcal) {
std::cout << "Writing out " << HGCalGeometry::producerTag() << std::endl;
edm::ESHandle<CaloSubdetectorGeometry> pGee;
es.get<HGCalGeometry::AlignedRecord>().get(HGCalGeometry::producerTag() + toDB, pGee);
edm::LogInfo("PCaloGeometryBuilder") << "Writing out " << HGCalGeometry::producerTag() << std::endl;
auto pGhgcal = es.getHandle(hgcalGeomToken_);
;
}

std::cout << "Writing out " << HcalGeometry::producerTag() << std::endl;
edm::ESHandle<CaloSubdetectorGeometry> pGhcal;
es.get<HcalGeometry::AlignedRecord>().get(HcalGeometry::producerTag() + toDB, pGhcal);
edm::LogInfo("PCaloGeometryBuilder") << "Writing out " << HcalGeometry::producerTag() << std::endl;
auto pGhcal = es.getHandle(hcalGeomToken_);

std::cout << "Writing out " << CaloTowerGeometry::producerTag() << std::endl;
edm::ESHandle<CaloSubdetectorGeometry> pGct;
es.get<CaloTowerGeometry::AlignedRecord>().get(CaloTowerGeometry::producerTag() + toDB, pGct);
edm::LogInfo("PCaloGeometryBuilder") << "Writing out " << CaloTowerGeometry::producerTag() << std::endl;
auto pGct = es.getHandle(ctGeomToken_);

std::cout << "Writing out " << ZdcGeometry::producerTag() << std::endl;
edm::ESHandle<CaloSubdetectorGeometry> pGzdc;
es.get<ZdcGeometry::AlignedRecord>().get(ZdcGeometry::producerTag() + toDB, pGzdc);
edm::LogInfo("PCaloGeometryBuilder") << "Writing out " << ZdcGeometry::producerTag() << std::endl;
auto pGzdc = es.getHandle(zdcGeomToken_);

std::cout << "Writing out " << CastorGeometry::producerTag() << std::endl;
edm::ESHandle<CaloSubdetectorGeometry> pGcast;
es.get<CastorGeometry::AlignedRecord>().get(CastorGeometry::producerTag() + toDB, pGcast);
edm::LogInfo("PCaloGeometryBuilder") << "Writing out " << CastorGeometry::producerTag() << std::endl;
auto pGcast = es.getHandle(castGeomToken_);
}

DEFINE_FWK_MODULE(PCaloGeometryBuilder);
16 changes: 9 additions & 7 deletions CondTools/Geometry/plugins/PGeometricDetBuilder.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,16 @@ class PGeometricDetBuilder : public edm::one::EDAnalyzer<edm::one::WatchRuns> {
private:
void putOne(const GeometricDet* gd, PGeometricDet* pgd, int lev);
bool fromDD4hep_;
edm::ESGetToken<cms::DDCompactView, IdealGeometryRecord> dd4HepCompactViewToken_;
edm::ESGetToken<DDCompactView, IdealGeometryRecord> compactViewToken_;
edm::ESGetToken<GeometricDet, IdealGeometryRecord> geometricDetToken_;
};

PGeometricDetBuilder::PGeometricDetBuilder(const edm::ParameterSet& iConfig) {
fromDD4hep_ = iConfig.getParameter<bool>("fromDD4hep");
dd4HepCompactViewToken_ = esConsumes<edm::Transition::BeginRun>();
compactViewToken_ = esConsumes<edm::Transition::BeginRun>();
geometricDetToken_ = esConsumes<edm::Transition::BeginRun>();
}

void PGeometricDetBuilder::beginRun(const edm::Run&, edm::EventSetup const& es) {
Expand All @@ -46,15 +52,11 @@ void PGeometricDetBuilder::beginRun(const edm::Run&, edm::EventSetup const& es)
return;
}
if (!fromDD4hep_) {
edm::ESTransientHandle<DDCompactView> pDD;
es.get<IdealGeometryRecord>().get(pDD);
auto pDD = es.getTransientHandle(compactViewToken_);
} else {
edm::ESTransientHandle<cms::DDCompactView> pDD;
es.get<IdealGeometryRecord>().get(pDD);
auto pDD = es.getTransientHandle(dd4HepCompactViewToken_);
}
edm::ESHandle<GeometricDet> rDD;
es.get<IdealGeometryRecord>().get(rDD);
const GeometricDet* tracker = &(*rDD);
const GeometricDet* tracker = &es.getData(geometricDetToken_);

// so now I have the tracker itself. loop over all its components to store them.
putOne(tracker, pgd, 0);
Expand Down
11 changes: 7 additions & 4 deletions CondTools/Geometry/plugins/PHGCalParametersDBBuilder.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ class PHGCalParametersDBBuilder : public edm::one::EDAnalyzer<edm::one::WatchRun

std::string name_, name2_, namew_, namec_, namet_;
bool fromDD4Hep_;
edm::ESGetToken<cms::DDCompactView, IdealGeometryRecord> dd4HepCompactViewToken_;
edm::ESGetToken<DDCompactView, IdealGeometryRecord> compactViewToken_;
};

PHGCalParametersDBBuilder::PHGCalParametersDBBuilder(const edm::ParameterSet& iC) {
Expand All @@ -40,6 +42,9 @@ PHGCalParametersDBBuilder::PHGCalParametersDBBuilder(const edm::ParameterSet& iC
namec_ = iC.getParameter<std::string>("nameC");
namet_ = iC.getParameter<std::string>("nameT");
fromDD4Hep_ = iC.getParameter<bool>("fromDD4Hep");
dd4HepCompactViewToken_ = esConsumes<edm::Transition::BeginRun>();
compactViewToken_ = esConsumes<edm::Transition::BeginRun>();

#ifdef EDM_ML_DEBUG
edm::LogVerbatim("HGCalGeom") << "HGCalParametersESModule for " << name_ << ":" << name2_ << ":" << namew_ << ":"
<< namec_ << ":" << namet_ << " and fromDD4Hep flag " << fromDD4Hep_;
Expand Down Expand Up @@ -71,15 +76,13 @@ void PHGCalParametersDBBuilder::beginRun(const edm::Run&, edm::EventSetup const&
#ifdef EDM_ML_DEBUG
edm::LogVerbatim("HGCalGeom") << "PHGCalParametersDBBuilder::Try to access cm::DDCompactView";
#endif
edm::ESTransientHandle<cms::DDCompactView> cpv;
es.get<IdealGeometryRecord>().get(cpv);
auto cpv = es.getTransientHandle(dd4HepCompactViewToken_);
builder.build(cpv.product(), *ptp, name_, namew_, namec_, namet_, name2_);
} else {
#ifdef EDM_ML_DEBUG
edm::LogVerbatim("HGCalGeom") << "PHGCalParametersDBBuilder::Try to access DDCompactView";
#endif
edm::ESTransientHandle<DDCompactView> cpv;
es.get<IdealGeometryRecord>().get(cpv);
auto cpv = es.getTransientHandle(compactViewToken_);
builder.build(cpv.product(), *ptp, name_, namew_, namec_, namet_);
}
swapParameters(ptp, phgp);
Expand Down
10 changes: 6 additions & 4 deletions CondTools/Geometry/plugins/PTrackerParametersDBBuilder.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,14 @@ class PTrackerParametersDBBuilder : public edm::one::EDAnalyzer<edm::one::WatchR

private:
bool fromDD4hep_;
edm::ESGetToken<cms::DDCompactView, IdealGeometryRecord> dd4HepCompactViewToken_;
edm::ESGetToken<DDCompactView, IdealGeometryRecord> compactViewToken_;
};

PTrackerParametersDBBuilder::PTrackerParametersDBBuilder(const edm::ParameterSet& iConfig) {
fromDD4hep_ = iConfig.getParameter<bool>("fromDD4hep");
dd4HepCompactViewToken_ = esConsumes<edm::Transition::BeginRun>();
compactViewToken_ = esConsumes<edm::Transition::BeginRun>();
}

void PTrackerParametersDBBuilder::beginRun(const edm::Run&, edm::EventSetup const& es) {
Expand All @@ -37,12 +41,10 @@ void PTrackerParametersDBBuilder::beginRun(const edm::Run&, edm::EventSetup cons
TrackerParametersFromDD builder;

if (!fromDD4hep_) {
edm::ESTransientHandle<DDCompactView> cpv;
es.get<IdealGeometryRecord>().get(cpv);
auto cpv = es.getTransientHandle(compactViewToken_);
builder.build(&(*cpv), *ptp);
} else {
edm::ESTransientHandle<cms::DDCompactView> cpv;
es.get<IdealGeometryRecord>().get(cpv);
auto cpv = es.getTransientHandle(dd4HepCompactViewToken_);
builder.build(&(*cpv), *ptp);
}

Expand Down
Loading

0 comments on commit 311e964

Please sign in to comment.