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

[DD4hep] use DD4hep consistently in configurations #36004

Merged
merged 2 commits into from
Nov 5, 2021
Merged

[DD4hep] use DD4hep consistently in configurations #36004

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
806de2f
address issue 33373
ianna Nov 5, 2021
8cea020
rename DT geometry builder
ianna Nov 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Alignment/MuonAlignment/test/convertSQLitetoXML_cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
process.GEMGeometryAlInputDB = cms.ESProducer("GEMGeometryESModule",
appendToDataLabel = cms.string('idealForInputDB'),
fromDDD = cms.bool(True),
fromDD4Hep = cms.bool(False),
fromDD4hep = cms.bool(False),
alignmentsLabel = cms.string(''),
applyAlignment = cms.bool(False)
)
Expand Down Expand Up @@ -59,7 +59,7 @@
process.GEMGeometryAlOutputXML = cms.ESProducer("GEMGeometryESModule",
appendToDataLabel = cms.string('idealForOutputXML'),
fromDDD = cms.bool(True),
fromDD4Hep = cms.bool(False),
fromDD4hep = cms.bool(False),
alignmentsLabel = cms.string(''),
applyAlignment = cms.bool(False)
)
Expand Down
2 changes: 1 addition & 1 deletion Alignment/MuonAlignment/test/test-misalign_cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
process.GEMGeometryMisalignedMuonProducer = cms.ESProducer("GEMGeometryESModule",
appendToDataLabel = cms.string('idealForMuonMisalignedProducer'),
fromDDD = cms.bool(True),
fromDD4Hep = cms.bool(False),
fromDD4hep = cms.bool(False),
alignmentsLabel = cms.string(''),
applyAlignment = cms.bool(False)
)
Expand Down
4 changes: 2 additions & 2 deletions Alignment/OfflineValidation/plugins/TrackerGeometryCompare.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@

TrackerGeometryCompare::TrackerGeometryCompare(const edm::ParameterSet& cfg)
: cpvTokenDDD_(esConsumes()),
cpvTokenDD4Hep_(esConsumes()),
cpvTokenDD4hep_(esConsumes()),
topoToken_(esConsumes()),
geomDetToken_(esConsumes()),
ptpToken_(esConsumes()),
Expand Down Expand Up @@ -363,7 +363,7 @@ void TrackerGeometryCompare::createROOTGeometry(const edm::EventSetup& iSetup) {
if (!fromDD4hep_) {
edm::ESTransientHandle<DDCompactView> cpv = iSetup.getTransientHandle(cpvTokenDDD_);
} else {
edm::ESTransientHandle<cms::DDCompactView> cpv = iSetup.getTransientHandle(cpvTokenDD4Hep_);
edm::ESTransientHandle<cms::DDCompactView> cpv = iSetup.getTransientHandle(cpvTokenDD4hep_);
}

const GeometricDet* theGeometricDet = &iSetup.getData(geomDetToken_);
Expand Down
2 changes: 1 addition & 1 deletion Alignment/OfflineValidation/plugins/TrackerGeometryCompare.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ class TrackerGeometryCompare : public edm::one::EDAnalyzer<> {
bool passIdCut(uint32_t);

const edm::ESGetToken<DDCompactView, IdealGeometryRecord> cpvTokenDDD_;
const edm::ESGetToken<cms::DDCompactView, IdealGeometryRecord> cpvTokenDD4Hep_;
const edm::ESGetToken<cms::DDCompactView, IdealGeometryRecord> cpvTokenDD4hep_;
const edm::ESGetToken<TrackerTopology, TrackerTopologyRcd> topoToken_;
const edm::ESGetToken<GeometricDet, IdealGeometryRecord> geomDetToken_;
const edm::ESGetToken<PTrackerParameters, PTrackerParametersRcd> ptpToken_;
Expand Down
2 changes: 1 addition & 1 deletion CondTools/DT/test/dbgeom_dump.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
)
)

process.muonGeometryConstants.fromDD4Hep = True
process.muonGeometryConstants.fromDD4hep = True
process.DTGeometryESModule.applyAlignment = cms.bool(False)
process.DTGeometryESModule.fromDDD = cms.bool(True)
process.DTGeometryESModule.fromDD4hep = cms.bool(False)
Expand Down
6 changes: 3 additions & 3 deletions CondTools/Geometry/plugins/CSCRecoIdealDBLoader.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,14 @@ class CSCRecoIdealDBLoader : public edm::one::EDAnalyzer<edm::one::WatchRuns> {
void endRun(edm::Run const& iEvent, edm::EventSetup const&) override {}

private:
bool fromDD4Hep_;
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);
fromDD4hep_ = iC.getUntrackedParameter<bool>("fromDD4hep", false);
dd4HepCompactViewToken_ = esConsumes<edm::Transition::BeginRun>();
compactViewToken_ = esConsumes<edm::Transition::BeginRun>();
muonGeomConstantsToken_ = esConsumes<edm::Transition::BeginRun>();
Expand All @@ -54,7 +54,7 @@ void CSCRecoIdealDBLoader::beginRun(const edm::Run&, edm::EventSetup const& es)
auto pMNDC = es.getHandle(muonGeomConstantsToken_);
CSCGeometryParsFromDD cscgp;

if (fromDD4Hep_) {
if (fromDD4hep_) {
auto pDD = es.getTransientHandle(dd4HepCompactViewToken_);
const cms::DDCompactView& cpv = *pDD;
cscgp.build(&cpv, *pMNDC, *rig, *rdp);
Expand Down
6 changes: 3 additions & 3 deletions CondTools/Geometry/plugins/DTRecoIdealDBLoader.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,14 @@ class DTRecoIdealDBLoader : public edm::one::EDAnalyzer<edm::one::WatchRuns> {
void endRun(edm::Run const& iEvent, edm::EventSetup const&) override {}

private:
bool fromDD4Hep_;
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);
fromDD4hep_ = iC.getUntrackedParameter<bool>("fromDD4hep", false);
dd4HepCompactViewToken_ = esConsumes<edm::Transition::BeginRun>();
compactViewToken_ = esConsumes<edm::Transition::BeginRun>();
muonGeomConstantsToken_ = esConsumes<edm::Transition::BeginRun>();
Expand All @@ -52,7 +52,7 @@ void DTRecoIdealDBLoader::beginRun(const edm::Run&, edm::EventSetup const& es) {
auto pMNDC = es.getHandle(muonGeomConstantsToken_);
DTGeometryParsFromDD dtgp;

if (fromDD4Hep_) {
if (fromDD4hep_) {
auto pDD = es.getTransientHandle(dd4HepCompactViewToken_);
const cms::DDCompactView& cpv = *pDD;
dtgp.build(&cpv, *pMNDC, *rig);
Expand Down
6 changes: 3 additions & 3 deletions CondTools/Geometry/plugins/GEMRecoIdealDBLoader.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,14 @@ class GEMRecoIdealDBLoader : public edm::one::EDAnalyzer<edm::one::WatchRuns> {
void endRun(edm::Run const& iEvent, edm::EventSetup const&) override {}

private:
bool fromDD4Hep_;
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
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>();
Expand All @@ -57,7 +57,7 @@ void GEMRecoIdealDBLoader::beginRun(const edm::Run&, edm::EventSetup const& es)
GEMGeometryParsFromDD rpcpd;
RecoIdealGeometry* rig = new RecoIdealGeometry;

if (fromDD4Hep_) {
if (fromDD4hep_) {
edm::LogVerbatim("GEMRecoIdealDBLoader") << "(0) GEMRecoIdealDBLoader - DD4HEP ";
auto pDD = es.getTransientHandle(dd4HepCompactViewToken_);
const cms::DDCompactView& cpv = *pDD;
Expand Down
10 changes: 5 additions & 5 deletions CondTools/Geometry/plugins/HcalParametersDBBuilder.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,24 +25,24 @@ class HcalParametersDBBuilder : public edm::one::EDAnalyzer<edm::one::WatchRuns>
void endRun(edm::Run const& iEvent, edm::EventSetup const&) override {}

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

HcalParametersDBBuilder::HcalParametersDBBuilder(const edm::ParameterSet& ps)
: fromDD4Hep_(ps.getParameter<bool>("fromDD4Hep")) {
: fromDD4hep_(ps.getParameter<bool>("fromDD4hep")) {
#ifdef EDM_ML_DEBUG
edm::LogVerbatim("HCalGeom") << "HcalParametersDBBuilder::HcalParametersDBBuilder called with dd4hep: "
<< fromDD4Hep_;
<< fromDD4hep_;
#endif
dd4HepCompactViewToken_ = esConsumes<edm::Transition::BeginRun>();
compactViewToken_ = esConsumes<edm::Transition::BeginRun>();
}

void HcalParametersDBBuilder::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
edm::ParameterSetDescription desc;
desc.add<bool>("fromDD4Hep", false);
desc.add<bool>("fromDD4hep", false);
descriptions.add("HcalParametersWriter", desc);
}

Expand All @@ -56,7 +56,7 @@ void HcalParametersDBBuilder::beginRun(const edm::Run&, edm::EventSetup const& e

HcalParametersFromDD builder;

if (fromDD4Hep_) {
if (fromDD4hep_) {
#ifdef EDM_ML_DEBUG
edm::LogVerbatim("HCalGeom") << "HcalParametersDBBuilder::Try to access cms::DDCompactView";
#endif
Expand Down
6 changes: 3 additions & 3 deletions CondTools/Geometry/plugins/ME0RecoIdealDBLoader.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,14 @@ class ME0RecoIdealDBLoader : public edm::one::EDAnalyzer<edm::one::WatchRuns> {
void endRun(edm::Run const& iEvent, edm::EventSetup const&) override {}

private:
bool fromDD4Hep_;
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
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>();
Expand All @@ -53,7 +53,7 @@ void ME0RecoIdealDBLoader::beginRun(const edm::Run&, edm::EventSetup const& es)
auto pMNDC = es.getHandle(muonGeomConstantsToken_);
ME0GeometryParsFromDD me0pd;
RecoIdealGeometry* rig = new RecoIdealGeometry;
if (fromDD4Hep_) {
if (fromDD4hep_) {
edm::LogVerbatim("ME0RecoIdealDBLoader") << "(0) ME0RecoIdealDBLoader - DD4HEP ";
auto pDD = es.getTransientHandle(dd4HepCompactViewToken_);
const cms::DDCompactView& cpv = *pDD;
Expand Down
10 changes: 5 additions & 5 deletions CondTools/Geometry/plugins/PHGCalParametersDBBuilder.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class PHGCalParametersDBBuilder : public edm::one::EDAnalyzer<edm::one::WatchRun
void swapParameters(HGCalParameters*, PHGCalParameters*);

std::string name_, name2_, namew_, namec_, namet_;
bool fromDD4Hep_;
bool fromDD4hep_;
edm::ESGetToken<cms::DDCompactView, IdealGeometryRecord> dd4HepCompactViewToken_;
edm::ESGetToken<DDCompactView, IdealGeometryRecord> compactViewToken_;
};
Expand All @@ -41,13 +41,13 @@ PHGCalParametersDBBuilder::PHGCalParametersDBBuilder(const edm::ParameterSet& iC
namew_ = iC.getParameter<std::string>("nameW");
namec_ = iC.getParameter<std::string>("nameC");
namet_ = iC.getParameter<std::string>("nameT");
fromDD4Hep_ = iC.getParameter<bool>("fromDD4Hep");
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_;
<< namec_ << ":" << namet_ << " and fromDD4hep flag " << fromDD4hep_;
#endif
}

Expand All @@ -58,7 +58,7 @@ void PHGCalParametersDBBuilder::fillDescriptions(edm::ConfigurationDescriptions&
desc.add<std::string>("nameW", "HGCalEEWafer");
desc.add<std::string>("nameC", "HGCalEECell");
desc.add<std::string>("nameT", "HGCal");
desc.add<bool>("fromDD4Hep", false);
desc.add<bool>("fromDD4hep", false);
descriptions.add("HGCalEEParametersWriter", desc);
}

Expand All @@ -72,7 +72,7 @@ void PHGCalParametersDBBuilder::beginRun(const edm::Run&, edm::EventSetup const&

HGCalParameters* ptp = new HGCalParameters(name_);
HGCalParametersFromDD builder;
if (fromDD4Hep_) {
if (fromDD4hep_) {
#ifdef EDM_ML_DEBUG
edm::LogVerbatim("HGCalGeom") << "PHGCalParametersDBBuilder::Try to access cm::DDCompactView";
#endif
Expand Down
6 changes: 3 additions & 3 deletions CondTools/Geometry/plugins/RPCRecoIdealDBLoader.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,14 @@ class RPCRecoIdealDBLoader : public edm::one::EDAnalyzer<edm::one::WatchRuns> {
void endRun(edm::Run const& iEvent, edm::EventSetup const&) override {}

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

RPCRecoIdealDBLoader::RPCRecoIdealDBLoader(const edm::ParameterSet& iC) {
fromDD4Hep_ = iC.getUntrackedParameter<bool>("fromDD4Hep", false);
fromDD4hep_ = iC.getUntrackedParameter<bool>("fromDD4hep", false);
dd4HepCompactViewToken_ = esConsumes<edm::Transition::BeginRun>();
compactViewToken_ = esConsumes<edm::Transition::BeginRun>();
muonGeomConstantsToken_ = esConsumes<edm::Transition::BeginRun>();
Expand All @@ -51,7 +51,7 @@ void RPCRecoIdealDBLoader::beginRun(const edm::Run&, edm::EventSetup const& es)
auto pMNDC = es.getHandle(muonGeomConstantsToken_);
RPCGeometryParsFromDD rpcpd;

if (fromDD4Hep_) {
if (fromDD4hep_) {
auto pDD = es.getTransientHandle(dd4HepCompactViewToken_);
const cms::DDCompactView& cpv = *pDD;
rpcpd.build(&cpv, *pMNDC, *rig);
Expand Down
2 changes: 1 addition & 1 deletion CondTools/Geometry/python/HGCalParametersWriter_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
from Configuration.ProcessModifiers.dd4hep_cff import dd4hep

dd4hep.toModify(HGCalEEParametersWriter,
fromDD4Hep = cms.bool(True)
fromDD4hep = cms.bool(True)
)

HGCalHESiParametersWriter = HGCalEEParametersWriter.clone(
Expand Down
2 changes: 1 addition & 1 deletion CondTools/Geometry/python/HcalParametersWriter_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
from Configuration.ProcessModifiers.dd4hep_cff import dd4hep

dd4hep.toModify(HcalParametersWriter,
fromDD4Hep = cms.bool(True)
fromDD4hep = cms.bool(True)
)
2 changes: 1 addition & 1 deletion CondTools/Geometry/test/calogeometry2026writer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
EcalP = cms.untracked.bool(False),
HGCal = cms.untracked.bool(True))

process.HcalParametersWriter.fromDD4Hep = cms.bool(False)
process.HcalParametersWriter.fromDD4hep = cms.bool(False)
process.CondDB.timetype = cms.untracked.string('runnumber')
process.CondDB.connect = cms.string('sqlite_file:myfile.db')
process.PoolDBOutputService = cms.Service("PoolDBOutputService",
Expand Down
2 changes: 1 addition & 1 deletion CondTools/Geometry/test/calogeometrywriter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

process.CaloGeometryWriter = cms.EDAnalyzer("PCaloGeometryBuilder")

process.HcalParametersWriter.fromDD4Hep = cms.bool(False)
process.HcalParametersWriter.fromDD4hep = cms.bool(False)
process.CondDB.timetype = cms.untracked.string('runnumber')
process.CondDB.connect = cms.string('sqlite_file:myfile.db')
process.PoolDBOutputService = cms.Service("PoolDBOutputService",
Expand Down
2 changes: 1 addition & 1 deletion CondTools/Geometry/test/cscgeometrywriter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
)

process.CSCGeometryWriter = cms.EDAnalyzer("CSCRecoIdealDBLoader",
fromDD4Hep = cms.bool(False))
fromDD4hep = cms.bool(False))

process.CondDB.timetype = cms.untracked.string('runnumber')
process.CondDB.connect = cms.string('sqlite_file:myfile.db')
Expand Down
2 changes: 1 addition & 1 deletion CondTools/Geometry/test/dtgeometrywriter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
)

process.DTGeometryWriter = cms.EDAnalyzer("DTRecoIdealDBLoader",
fromDD4Hep = cms.untracked.bool(False))
fromDD4hep = cms.untracked.bool(False))

process.CondDB.timetype = cms.untracked.string('runnumber')
process.CondDB.connect = cms.string('sqlite_file:myfile.db')
Expand Down
2 changes: 1 addition & 1 deletion CondTools/Geometry/test/rpcgeometrywriter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
)

process.RPCGeometryWriter = cms.EDAnalyzer("RPCRecoIdealDBLoader",
fromDD4Hep = cms.untracked.bool(False))
fromDD4hep = cms.untracked.bool(False))

process.CondDB.timetype = cms.untracked.string('runnumber')
process.CondDB.connect = cms.string('sqlite_file:myfile.db')
Expand Down
10 changes: 5 additions & 5 deletions CondTools/Geometry/test/writehelpers/geometryExtended2021DD4hep_writer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,15 @@
process.TrackerGeometryWriter = cms.EDAnalyzer("PGeometricDetBuilder",fromDD4hep=cms.bool(True))
process.TrackerParametersWriter = cms.EDAnalyzer("PTrackerParametersDBBuilder",fromDD4hep=cms.bool(True))

process.CaloGeometryWriter = cms.EDAnalyzer("PCaloGeometryBuilder",fromDD4Hep = cms.untracked.bool(True))
process.CaloGeometryWriter = cms.EDAnalyzer("PCaloGeometryBuilder",fromDD4hep = cms.untracked.bool(True))

process.CSCGeometryWriter = cms.EDAnalyzer("CSCRecoIdealDBLoader",fromDD4Hep = cms.untracked.bool(True))
process.CSCGeometryWriter = cms.EDAnalyzer("CSCRecoIdealDBLoader",fromDD4hep = cms.untracked.bool(True))

process.DTGeometryWriter = cms.EDAnalyzer("DTRecoIdealDBLoader",fromDD4Hep = cms.untracked.bool(True))
process.DTGeometryWriter = cms.EDAnalyzer("DTRecoIdealDBLoader",fromDD4hep = cms.untracked.bool(True))

process.RPCGeometryWriter = cms.EDAnalyzer("RPCRecoIdealDBLoader",fromDD4Hep = cms.untracked.bool(True))
process.RPCGeometryWriter = cms.EDAnalyzer("RPCRecoIdealDBLoader",fromDD4hep = cms.untracked.bool(True))

process.GEMGeometryWriter = cms.EDAnalyzer("GEMRecoIdealDBLoader",fromDD4Hep = cms.untracked.bool(True))
process.GEMGeometryWriter = cms.EDAnalyzer("GEMRecoIdealDBLoader",fromDD4hep = cms.untracked.bool(True))

process.CondDB.timetype = cms.untracked.string('runnumber')
process.CondDB.connect = cms.string('sqlite_file:myfile.db')
Expand Down
6 changes: 3 additions & 3 deletions CondTools/Geometry/test/writehelpers/geometryExtended2021_writer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@

process.CaloGeometryWriter = cms.EDAnalyzer("PCaloGeometryBuilder")

process.CSCGeometryWriter = cms.EDAnalyzer("CSCRecoIdealDBLoader",fromDD4Hep = cms.untracked.bool(False))
process.CSCGeometryWriter = cms.EDAnalyzer("CSCRecoIdealDBLoader",fromDD4hep = cms.untracked.bool(False))

process.DTGeometryWriter = cms.EDAnalyzer("DTRecoIdealDBLoader",fromDD4Hep = cms.untracked.bool(False))
process.DTGeometryWriter = cms.EDAnalyzer("DTRecoIdealDBLoader",fromDD4hep = cms.untracked.bool(False))

process.RPCGeometryWriter = cms.EDAnalyzer("RPCRecoIdealDBLoader",fromDD4Hep = cms.untracked.bool(False))
process.RPCGeometryWriter = cms.EDAnalyzer("RPCRecoIdealDBLoader",fromDD4hep = cms.untracked.bool(False))

process.GEMGeometryWriter = cms.EDAnalyzer("GEMRecoIdealDBLoader")

Expand Down
6 changes: 3 additions & 3 deletions CondTools/Geometry/test/writehelpers/geometryExtended2026_writer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@
EcalP = cms.untracked.bool(False),
HGCal = cms.untracked.bool(False))

process.CSCGeometryWriter = cms.EDAnalyzer("CSCRecoIdealDBLoader",fromDD4Hep = cms.untracked.bool(False))
process.CSCGeometryWriter = cms.EDAnalyzer("CSCRecoIdealDBLoader",fromDD4hep = cms.untracked.bool(False))

process.DTGeometryWriter = cms.EDAnalyzer("DTRecoIdealDBLoader",fromDD4Hep = cms.untracked.bool(False))
process.DTGeometryWriter = cms.EDAnalyzer("DTRecoIdealDBLoader",fromDD4hep = cms.untracked.bool(False))

process.RPCGeometryWriter = cms.EDAnalyzer("RPCRecoIdealDBLoader",fromDD4Hep = cms.untracked.bool(False))
process.RPCGeometryWriter = cms.EDAnalyzer("RPCRecoIdealDBLoader",fromDD4hep = cms.untracked.bool(False))

process.GEMGeometryWriter = cms.EDAnalyzer("GEMRecoIdealDBLoader")

Expand Down
4 changes: 2 additions & 2 deletions Geometry/CMSCommonData/test/dd4hep/2026D35.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
)

process.hpa = cms.EDAnalyzer("HcalParametersAnalyzer")
process.hcalParameters.fromDD4Hep = cms.bool(True)
process.hcalSimulationParameters.fromDD4Hep = cms.bool(True)
process.hcalParameters.fromDD4hep = cms.bool(True)
process.hcalSimulationParameters.fromDD4hep = cms.bool(True)

process.Timing = cms.Service("Timing")
process.SimpleMemoryCheck = cms.Service("SimpleMemoryCheck")
Expand Down
Loading