diff --git a/Alignment/MuonAlignment/test/convertSQLitetoXML_cfg.py b/Alignment/MuonAlignment/test/convertSQLitetoXML_cfg.py index 3a3ac8ee39380..0059151a8f986 100644 --- a/Alignment/MuonAlignment/test/convertSQLitetoXML_cfg.py +++ b/Alignment/MuonAlignment/test/convertSQLitetoXML_cfg.py @@ -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) ) @@ -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) ) diff --git a/Alignment/MuonAlignment/test/test-misalign_cfg.py b/Alignment/MuonAlignment/test/test-misalign_cfg.py index 89ca87c3b2824..f114d8a21fdf1 100644 --- a/Alignment/MuonAlignment/test/test-misalign_cfg.py +++ b/Alignment/MuonAlignment/test/test-misalign_cfg.py @@ -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) ) diff --git a/Alignment/OfflineValidation/plugins/TrackerGeometryCompare.cc b/Alignment/OfflineValidation/plugins/TrackerGeometryCompare.cc index db2bb31492f23..7e18306f624bb 100644 --- a/Alignment/OfflineValidation/plugins/TrackerGeometryCompare.cc +++ b/Alignment/OfflineValidation/plugins/TrackerGeometryCompare.cc @@ -54,7 +54,7 @@ TrackerGeometryCompare::TrackerGeometryCompare(const edm::ParameterSet& cfg) : cpvTokenDDD_(esConsumes()), - cpvTokenDD4Hep_(esConsumes()), + cpvTokenDD4hep_(esConsumes()), topoToken_(esConsumes()), geomDetToken_(esConsumes()), ptpToken_(esConsumes()), @@ -363,7 +363,7 @@ void TrackerGeometryCompare::createROOTGeometry(const edm::EventSetup& iSetup) { if (!fromDD4hep_) { edm::ESTransientHandle cpv = iSetup.getTransientHandle(cpvTokenDDD_); } else { - edm::ESTransientHandle cpv = iSetup.getTransientHandle(cpvTokenDD4Hep_); + edm::ESTransientHandle cpv = iSetup.getTransientHandle(cpvTokenDD4hep_); } const GeometricDet* theGeometricDet = &iSetup.getData(geomDetToken_); diff --git a/Alignment/OfflineValidation/plugins/TrackerGeometryCompare.h b/Alignment/OfflineValidation/plugins/TrackerGeometryCompare.h index 33547a383fe6b..8dba3aab28c9b 100644 --- a/Alignment/OfflineValidation/plugins/TrackerGeometryCompare.h +++ b/Alignment/OfflineValidation/plugins/TrackerGeometryCompare.h @@ -85,7 +85,7 @@ class TrackerGeometryCompare : public edm::one::EDAnalyzer<> { bool passIdCut(uint32_t); const edm::ESGetToken cpvTokenDDD_; - const edm::ESGetToken cpvTokenDD4Hep_; + const edm::ESGetToken cpvTokenDD4hep_; const edm::ESGetToken topoToken_; const edm::ESGetToken geomDetToken_; const edm::ESGetToken ptpToken_; diff --git a/CondTools/DT/test/dbgeom_dump.py b/CondTools/DT/test/dbgeom_dump.py index 628a2c68f87a1..c99fbd6c151f3 100644 --- a/CondTools/DT/test/dbgeom_dump.py +++ b/CondTools/DT/test/dbgeom_dump.py @@ -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) diff --git a/CondTools/Geometry/plugins/CSCRecoIdealDBLoader.cc b/CondTools/Geometry/plugins/CSCRecoIdealDBLoader.cc index 885ca3858378a..13d58f7fe997a 100644 --- a/CondTools/Geometry/plugins/CSCRecoIdealDBLoader.cc +++ b/CondTools/Geometry/plugins/CSCRecoIdealDBLoader.cc @@ -27,14 +27,14 @@ class CSCRecoIdealDBLoader : public edm::one::EDAnalyzer { void endRun(edm::Run const& iEvent, edm::EventSetup const&) override {} private: - bool fromDD4Hep_; + bool fromDD4hep_; edm::ESGetToken dd4HepCompactViewToken_; edm::ESGetToken compactViewToken_; edm::ESGetToken muonGeomConstantsToken_; }; CSCRecoIdealDBLoader::CSCRecoIdealDBLoader(const edm::ParameterSet& iC) { - fromDD4Hep_ = iC.getUntrackedParameter("fromDD4Hep", false); + fromDD4hep_ = iC.getUntrackedParameter("fromDD4hep", false); dd4HepCompactViewToken_ = esConsumes(); compactViewToken_ = esConsumes(); muonGeomConstantsToken_ = esConsumes(); @@ -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); diff --git a/CondTools/Geometry/plugins/DTRecoIdealDBLoader.cc b/CondTools/Geometry/plugins/DTRecoIdealDBLoader.cc index c8f9dc2795fce..59ef334b2334f 100644 --- a/CondTools/Geometry/plugins/DTRecoIdealDBLoader.cc +++ b/CondTools/Geometry/plugins/DTRecoIdealDBLoader.cc @@ -28,14 +28,14 @@ class DTRecoIdealDBLoader : public edm::one::EDAnalyzer { void endRun(edm::Run const& iEvent, edm::EventSetup const&) override {} private: - bool fromDD4Hep_; + bool fromDD4hep_; edm::ESGetToken dd4HepCompactViewToken_; edm::ESGetToken compactViewToken_; edm::ESGetToken muonGeomConstantsToken_; }; DTRecoIdealDBLoader::DTRecoIdealDBLoader(const edm::ParameterSet& iC) { - fromDD4Hep_ = iC.getUntrackedParameter("fromDD4Hep", false); + fromDD4hep_ = iC.getUntrackedParameter("fromDD4hep", false); dd4HepCompactViewToken_ = esConsumes(); compactViewToken_ = esConsumes(); muonGeomConstantsToken_ = esConsumes(); @@ -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); diff --git a/CondTools/Geometry/plugins/GEMRecoIdealDBLoader.cc b/CondTools/Geometry/plugins/GEMRecoIdealDBLoader.cc index 7787aa61d5e33..94b202b17defe 100644 --- a/CondTools/Geometry/plugins/GEMRecoIdealDBLoader.cc +++ b/CondTools/Geometry/plugins/GEMRecoIdealDBLoader.cc @@ -29,14 +29,14 @@ class GEMRecoIdealDBLoader : public edm::one::EDAnalyzer { void endRun(edm::Run const& iEvent, edm::EventSetup const&) override {} private: - bool fromDD4Hep_; + bool fromDD4hep_; edm::ESGetToken dd4HepCompactViewToken_; edm::ESGetToken compactViewToken_; edm::ESGetToken muonGeomConstantsToken_; }; GEMRecoIdealDBLoader::GEMRecoIdealDBLoader(const edm::ParameterSet& iC) { - fromDD4Hep_ = iC.getUntrackedParameter("fromDD4Hep", false); // set true for DD4HEP + fromDD4hep_ = iC.getUntrackedParameter("fromDD4hep", false); // set true for DD4HEP dd4HepCompactViewToken_ = esConsumes(); compactViewToken_ = esConsumes(); muonGeomConstantsToken_ = esConsumes(); @@ -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; diff --git a/CondTools/Geometry/plugins/HcalParametersDBBuilder.cc b/CondTools/Geometry/plugins/HcalParametersDBBuilder.cc index 1a21df2ad7a8f..2f9daab65aa5c 100644 --- a/CondTools/Geometry/plugins/HcalParametersDBBuilder.cc +++ b/CondTools/Geometry/plugins/HcalParametersDBBuilder.cc @@ -25,16 +25,16 @@ class HcalParametersDBBuilder : public edm::one::EDAnalyzer void endRun(edm::Run const& iEvent, edm::EventSetup const&) override {} private: - bool fromDD4Hep_; + bool fromDD4hep_; edm::ESGetToken dd4HepCompactViewToken_; edm::ESGetToken compactViewToken_; }; HcalParametersDBBuilder::HcalParametersDBBuilder(const edm::ParameterSet& ps) - : fromDD4Hep_(ps.getParameter("fromDD4Hep")) { + : fromDD4hep_(ps.getParameter("fromDD4hep")) { #ifdef EDM_ML_DEBUG edm::LogVerbatim("HCalGeom") << "HcalParametersDBBuilder::HcalParametersDBBuilder called with dd4hep: " - << fromDD4Hep_; + << fromDD4hep_; #endif dd4HepCompactViewToken_ = esConsumes(); compactViewToken_ = esConsumes(); @@ -42,7 +42,7 @@ HcalParametersDBBuilder::HcalParametersDBBuilder(const edm::ParameterSet& ps) void HcalParametersDBBuilder::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { edm::ParameterSetDescription desc; - desc.add("fromDD4Hep", false); + desc.add("fromDD4hep", false); descriptions.add("HcalParametersWriter", desc); } @@ -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 diff --git a/CondTools/Geometry/plugins/ME0RecoIdealDBLoader.cc b/CondTools/Geometry/plugins/ME0RecoIdealDBLoader.cc index 84e71da6d2888..b1573895d1afe 100644 --- a/CondTools/Geometry/plugins/ME0RecoIdealDBLoader.cc +++ b/CondTools/Geometry/plugins/ME0RecoIdealDBLoader.cc @@ -27,14 +27,14 @@ class ME0RecoIdealDBLoader : public edm::one::EDAnalyzer { void endRun(edm::Run const& iEvent, edm::EventSetup const&) override {} private: - bool fromDD4Hep_; + bool fromDD4hep_; edm::ESGetToken dd4HepCompactViewToken_; edm::ESGetToken compactViewToken_; edm::ESGetToken muonGeomConstantsToken_; }; ME0RecoIdealDBLoader::ME0RecoIdealDBLoader(const edm::ParameterSet& iC) { - fromDD4Hep_ = iC.getUntrackedParameter("fromDD4Hep", false); // set true for DD4HEP + fromDD4hep_ = iC.getUntrackedParameter("fromDD4hep", false); // set true for DD4HEP dd4HepCompactViewToken_ = esConsumes(); compactViewToken_ = esConsumes(); muonGeomConstantsToken_ = esConsumes(); @@ -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; diff --git a/CondTools/Geometry/plugins/PHGCalParametersDBBuilder.cc b/CondTools/Geometry/plugins/PHGCalParametersDBBuilder.cc index 5468c050f6d70..f25221f3b4795 100644 --- a/CondTools/Geometry/plugins/PHGCalParametersDBBuilder.cc +++ b/CondTools/Geometry/plugins/PHGCalParametersDBBuilder.cc @@ -30,7 +30,7 @@ class PHGCalParametersDBBuilder : public edm::one::EDAnalyzer dd4HepCompactViewToken_; edm::ESGetToken compactViewToken_; }; @@ -41,13 +41,13 @@ PHGCalParametersDBBuilder::PHGCalParametersDBBuilder(const edm::ParameterSet& iC namew_ = iC.getParameter("nameW"); namec_ = iC.getParameter("nameC"); namet_ = iC.getParameter("nameT"); - fromDD4Hep_ = iC.getParameter("fromDD4Hep"); + fromDD4hep_ = iC.getParameter("fromDD4hep"); dd4HepCompactViewToken_ = esConsumes(); compactViewToken_ = esConsumes(); #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 } @@ -58,7 +58,7 @@ void PHGCalParametersDBBuilder::fillDescriptions(edm::ConfigurationDescriptions& desc.add("nameW", "HGCalEEWafer"); desc.add("nameC", "HGCalEECell"); desc.add("nameT", "HGCal"); - desc.add("fromDD4Hep", false); + desc.add("fromDD4hep", false); descriptions.add("HGCalEEParametersWriter", desc); } @@ -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 diff --git a/CondTools/Geometry/plugins/RPCRecoIdealDBLoader.cc b/CondTools/Geometry/plugins/RPCRecoIdealDBLoader.cc index 69332ef488c9e..82c596be75210 100644 --- a/CondTools/Geometry/plugins/RPCRecoIdealDBLoader.cc +++ b/CondTools/Geometry/plugins/RPCRecoIdealDBLoader.cc @@ -27,14 +27,14 @@ class RPCRecoIdealDBLoader : public edm::one::EDAnalyzer { void endRun(edm::Run const& iEvent, edm::EventSetup const&) override {} private: - bool fromDD4Hep_; + bool fromDD4hep_; edm::ESGetToken dd4HepCompactViewToken_; edm::ESGetToken compactViewToken_; edm::ESGetToken muonGeomConstantsToken_; }; RPCRecoIdealDBLoader::RPCRecoIdealDBLoader(const edm::ParameterSet& iC) { - fromDD4Hep_ = iC.getUntrackedParameter("fromDD4Hep", false); + fromDD4hep_ = iC.getUntrackedParameter("fromDD4hep", false); dd4HepCompactViewToken_ = esConsumes(); compactViewToken_ = esConsumes(); muonGeomConstantsToken_ = esConsumes(); @@ -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); diff --git a/CondTools/Geometry/python/HGCalParametersWriter_cff.py b/CondTools/Geometry/python/HGCalParametersWriter_cff.py index f64d58a53350e..59d8e06902d62 100644 --- a/CondTools/Geometry/python/HGCalParametersWriter_cff.py +++ b/CondTools/Geometry/python/HGCalParametersWriter_cff.py @@ -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( diff --git a/CondTools/Geometry/python/HcalParametersWriter_cff.py b/CondTools/Geometry/python/HcalParametersWriter_cff.py index 86daa0ce54349..e6a4ed4faa5a0 100644 --- a/CondTools/Geometry/python/HcalParametersWriter_cff.py +++ b/CondTools/Geometry/python/HcalParametersWriter_cff.py @@ -5,5 +5,5 @@ from Configuration.ProcessModifiers.dd4hep_cff import dd4hep dd4hep.toModify(HcalParametersWriter, - fromDD4Hep = cms.bool(True) + fromDD4hep = cms.bool(True) ) diff --git a/CondTools/Geometry/test/calogeometry2026writer.py b/CondTools/Geometry/test/calogeometry2026writer.py index bc71576f92cba..5ccd23807fa1f 100644 --- a/CondTools/Geometry/test/calogeometry2026writer.py +++ b/CondTools/Geometry/test/calogeometry2026writer.py @@ -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", diff --git a/CondTools/Geometry/test/calogeometrywriter.py b/CondTools/Geometry/test/calogeometrywriter.py index 52e67ba997e21..565de0b0458d9 100644 --- a/CondTools/Geometry/test/calogeometrywriter.py +++ b/CondTools/Geometry/test/calogeometrywriter.py @@ -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", diff --git a/CondTools/Geometry/test/cscgeometrywriter.py b/CondTools/Geometry/test/cscgeometrywriter.py index f601c334fce66..272a55057a2bd 100644 --- a/CondTools/Geometry/test/cscgeometrywriter.py +++ b/CondTools/Geometry/test/cscgeometrywriter.py @@ -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') diff --git a/CondTools/Geometry/test/dtgeometrywriter.py b/CondTools/Geometry/test/dtgeometrywriter.py index fb96947e7e2f9..f279a728ec607 100644 --- a/CondTools/Geometry/test/dtgeometrywriter.py +++ b/CondTools/Geometry/test/dtgeometrywriter.py @@ -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') diff --git a/CondTools/Geometry/test/rpcgeometrywriter.py b/CondTools/Geometry/test/rpcgeometrywriter.py index 639b1696a45ff..7bb9b7c1a6cb6 100644 --- a/CondTools/Geometry/test/rpcgeometrywriter.py +++ b/CondTools/Geometry/test/rpcgeometrywriter.py @@ -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') diff --git a/CondTools/Geometry/test/writehelpers/geometryExtended2021DD4hep_writer.py b/CondTools/Geometry/test/writehelpers/geometryExtended2021DD4hep_writer.py index 554423ee90704..9d4e15da9d629 100644 --- a/CondTools/Geometry/test/writehelpers/geometryExtended2021DD4hep_writer.py +++ b/CondTools/Geometry/test/writehelpers/geometryExtended2021DD4hep_writer.py @@ -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') diff --git a/CondTools/Geometry/test/writehelpers/geometryExtended2021_writer.py b/CondTools/Geometry/test/writehelpers/geometryExtended2021_writer.py index b1b29f2b3e191..8baf29ce5d289 100644 --- a/CondTools/Geometry/test/writehelpers/geometryExtended2021_writer.py +++ b/CondTools/Geometry/test/writehelpers/geometryExtended2021_writer.py @@ -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") diff --git a/CondTools/Geometry/test/writehelpers/geometryExtended2026_writer.py b/CondTools/Geometry/test/writehelpers/geometryExtended2026_writer.py index aec94dc15bc42..9573fa710fa19 100644 --- a/CondTools/Geometry/test/writehelpers/geometryExtended2026_writer.py +++ b/CondTools/Geometry/test/writehelpers/geometryExtended2026_writer.py @@ -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") diff --git a/Geometry/CMSCommonData/test/dd4hep/2026D35.py b/Geometry/CMSCommonData/test/dd4hep/2026D35.py index fcd71f1b6cde2..0ca47c0eb88e7 100644 --- a/Geometry/CMSCommonData/test/dd4hep/2026D35.py +++ b/Geometry/CMSCommonData/test/dd4hep/2026D35.py @@ -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") diff --git a/Geometry/CMSCommonData/test/dd4hep/2026D41.py b/Geometry/CMSCommonData/test/dd4hep/2026D41.py index a6cb043c3d5ce..d0312c60b8703 100644 --- a/Geometry/CMSCommonData/test/dd4hep/2026D41.py +++ b/Geometry/CMSCommonData/test/dd4hep/2026D41.py @@ -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") diff --git a/Geometry/CMSCommonData/test/dd4hep/2026D43.py b/Geometry/CMSCommonData/test/dd4hep/2026D43.py index dfd5cafdda6a3..c5f6283d35d79 100644 --- a/Geometry/CMSCommonData/test/dd4hep/2026D43.py +++ b/Geometry/CMSCommonData/test/dd4hep/2026D43.py @@ -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") diff --git a/Geometry/CMSCommonData/test/dd4hep/2026D45.py b/Geometry/CMSCommonData/test/dd4hep/2026D45.py index 2fc42b73252a8..62de05a3f127f 100644 --- a/Geometry/CMSCommonData/test/dd4hep/2026D45.py +++ b/Geometry/CMSCommonData/test/dd4hep/2026D45.py @@ -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") diff --git a/Geometry/CMSCommonData/test/dd4hep/2026D45NoSD.py b/Geometry/CMSCommonData/test/dd4hep/2026D45NoSD.py index b83e84ca4940b..7d7f8e473c5c0 100644 --- a/Geometry/CMSCommonData/test/dd4hep/2026D45NoSD.py +++ b/Geometry/CMSCommonData/test/dd4hep/2026D45NoSD.py @@ -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") diff --git a/Geometry/CMSCommonData/test/dd4hep/2026D46.py b/Geometry/CMSCommonData/test/dd4hep/2026D46.py index a779af5dfa77d..8f386cbabf8c0 100644 --- a/Geometry/CMSCommonData/test/dd4hep/2026D46.py +++ b/Geometry/CMSCommonData/test/dd4hep/2026D46.py @@ -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") diff --git a/Geometry/CMSCommonData/test/dd4hep/2026D47.py b/Geometry/CMSCommonData/test/dd4hep/2026D47.py index b7f4342ce9d87..7beed8ac661f8 100644 --- a/Geometry/CMSCommonData/test/dd4hep/2026D47.py +++ b/Geometry/CMSCommonData/test/dd4hep/2026D47.py @@ -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") diff --git a/Geometry/CMSCommonData/test/dd4hep/2026D48.py b/Geometry/CMSCommonData/test/dd4hep/2026D48.py index f3b1dc996b545..515e0f741302d 100644 --- a/Geometry/CMSCommonData/test/dd4hep/2026D48.py +++ b/Geometry/CMSCommonData/test/dd4hep/2026D48.py @@ -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") diff --git a/Geometry/CMSCommonData/test/dd4hep/2026D49.py b/Geometry/CMSCommonData/test/dd4hep/2026D49.py index cbfd32577e52a..5e3cdc59fd869 100644 --- a/Geometry/CMSCommonData/test/dd4hep/2026D49.py +++ b/Geometry/CMSCommonData/test/dd4hep/2026D49.py @@ -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") diff --git a/Geometry/CMSCommonData/test/dd4hep/2026D50.py b/Geometry/CMSCommonData/test/dd4hep/2026D50.py index 02c6117d40180..52519b2c78661 100644 --- a/Geometry/CMSCommonData/test/dd4hep/2026D50.py +++ b/Geometry/CMSCommonData/test/dd4hep/2026D50.py @@ -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") diff --git a/Geometry/CMSCommonData/test/dd4hep/2026D51.py b/Geometry/CMSCommonData/test/dd4hep/2026D51.py index bda3db71ccb8f..e27e87df9c964 100644 --- a/Geometry/CMSCommonData/test/dd4hep/2026D51.py +++ b/Geometry/CMSCommonData/test/dd4hep/2026D51.py @@ -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") diff --git a/Geometry/CMSCommonData/test/dd4hep/2026D52.py b/Geometry/CMSCommonData/test/dd4hep/2026D52.py index b09ac317b3762..c8d01d1b1c3b1 100644 --- a/Geometry/CMSCommonData/test/dd4hep/2026D52.py +++ b/Geometry/CMSCommonData/test/dd4hep/2026D52.py @@ -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") diff --git a/Geometry/CMSCommonData/test/dd4hep/run3.py b/Geometry/CMSCommonData/test/dd4hep/run3.py index d06e535288982..da077916f780b 100644 --- a/Geometry/CMSCommonData/test/dd4hep/run3.py +++ b/Geometry/CMSCommonData/test/dd4hep/run3.py @@ -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") diff --git a/Geometry/CMSCommonData/test/dd4hep/runlegacy.py b/Geometry/CMSCommonData/test/dd4hep/runlegacy.py index 047b05cad41e0..57c2029fda672 100644 --- a/Geometry/CMSCommonData/test/dd4hep/runlegacy.py +++ b/Geometry/CMSCommonData/test/dd4hep/runlegacy.py @@ -61,8 +61,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") diff --git a/Geometry/CaloEventSetup/interface/CaloGeometryLoader.h b/Geometry/CaloEventSetup/interface/CaloGeometryLoader.h index 5668ee52e35b6..cb68b8b1724db 100644 --- a/Geometry/CaloEventSetup/interface/CaloGeometryLoader.h +++ b/Geometry/CaloEventSetup/interface/CaloGeometryLoader.h @@ -27,7 +27,7 @@ class CaloGeometryLoader { using ParVecVec = CaloSubdetectorGeometry::ParVecVec; static constexpr double k_ScaleFromDDD = 0.1; - static constexpr double k_ScaleFromDD4Hep = (1.0 / dd4hep::cm); + static constexpr double k_ScaleFromDD4hep = (1.0 / dd4hep::cm); CaloGeometryLoader() {} @@ -48,7 +48,7 @@ class CaloGeometryLoader { void fillGeom(T* geom, const ParmVec& pv, const HepGeom::Transform3D& tr, const DetId& id, const double& scale); unsigned int getDetIdForDDDNode(const DDFilteredView& fv); - unsigned int getDetIdForDD4HepNode(const cms::DDFilteredView& fv); + unsigned int getDetIdForDD4hepNode(const cms::DDFilteredView& fv); typename T::NumberingScheme m_scheme; }; diff --git a/Geometry/CaloEventSetup/interface/CaloGeometryLoader.icc b/Geometry/CaloEventSetup/interface/CaloGeometryLoader.icc index 518229e4cc58a..97da757f9bcb9 100644 --- a/Geometry/CaloEventSetup/interface/CaloGeometryLoader.icc +++ b/Geometry/CaloEventSetup/interface/CaloGeometryLoader.icc @@ -149,9 +149,9 @@ void CaloGeometryLoader::makeGeometry(const cms::DDCompactView* cpv, const CLHEP::HepRotation hr(temp); const CLHEP::Hep3Vector h3v(fv.translation().X(), fv.translation().Y(), fv.translation().Z()); const HepGeom::Transform3D ht3d(hr, // only scale translation - k_ScaleFromDD4Hep * h3v); + k_ScaleFromDD4hep * h3v); - const DetId id(getDetIdForDD4HepNode(fv)); + const DetId id(getDetIdForDD4hepNode(fv)); const unsigned int which(geom->alignmentTransformIndexLocal(id)); @@ -170,7 +170,7 @@ void CaloGeometryLoader::makeGeometry(const cms::DDCompactView* cpv, nullptr == at ? ht3d : (nullptr == globalT ? at->transform() * ht3d : at->transform() * globalT->transform() * ht3d)); - fillGeom(geom, parameters, atr, id, k_ScaleFromDD4Hep); + fillGeom(geom, parameters, atr, id, k_ScaleFromDD4hep); } assert(counter <= T::k_NumberOfCellsForCorners); @@ -197,7 +197,7 @@ unsigned int CaloGeometryLoader::getDetIdForDDDNode(const DDFilteredView& fv) } template -unsigned int CaloGeometryLoader::getDetIdForDD4HepNode(const cms::DDFilteredView& fv) { +unsigned int CaloGeometryLoader::getDetIdForDD4hepNode(const cms::DDFilteredView& fv) { // perform some consistency checks // get the parents and grandparents of this node diff --git a/Geometry/DTGeometry/interface/DTGeometry.h b/Geometry/DTGeometry/interface/DTGeometry.h index 0b39355516c62..3c4f01c40cd0e 100644 --- a/Geometry/DTGeometry/interface/DTGeometry.h +++ b/Geometry/DTGeometry/interface/DTGeometry.h @@ -83,7 +83,7 @@ class DTGeometry : public TrackingGeometry { private: friend class cms::DTGeometryBuilder; friend class DTGeometryBuilderFromDDD; - friend class DTGeometryBuilderFromDD4Hep; + friend class DTGeometryBuilderFromDD4hep; friend class DTGeometryBuilderFromCondDB; friend class GeometryAligner; diff --git a/Geometry/DTGeometryBuilder/interface/DTGeometryParsFromDD.h b/Geometry/DTGeometryBuilder/interface/DTGeometryParsFromDD.h index 6ffc55685aa74..270ed2c7c8b3d 100644 --- a/Geometry/DTGeometryBuilder/interface/DTGeometryParsFromDD.h +++ b/Geometry/DTGeometryBuilder/interface/DTGeometryParsFromDD.h @@ -2,7 +2,7 @@ #define DTGeometryBuilder_DTGeometryParsFromDD_h /** \class DTGeometryParsFromDD * - * Build the RPCGeometry from the DDD and DD4Hep description + * Build the RPCGeometry from the DDD and DD4hep description * * DD4hep part added to the original old file (DD version) made by Stefano Lacaprara (INFN LNL) * \author: Sergio Lo Meo (sergio.lo.meo@cern.ch) @@ -15,7 +15,7 @@ class DTGeometry; class DDCompactView; class DDFilteredView; -namespace cms { // DD4Hep +namespace cms { // DD4hep class DDFilteredView; class DDCompactView; } // namespace cms @@ -37,7 +37,7 @@ class DTGeometryParsFromDD { // DD void build(const DDCompactView* cview, const MuonGeometryConstants& muonConstants, RecoIdealGeometry& rig); - // DD4Hep + // DD4hep void build(const cms::DDCompactView* cview, const MuonGeometryConstants& muonConstants, RecoIdealGeometry& rgeo); enum DTDetTag { DTChamberTag, DTSuperLayerTag, DTLayerTag }; @@ -71,7 +71,7 @@ class DTGeometryParsFromDD { void buildGeometry(DDFilteredView& fv, const MuonGeometryConstants& muonConstants, RecoIdealGeometry& rig) const; - // DD4Hep + // DD4hep void buildGeometry(cms::DDFilteredView& fv, const MuonGeometryConstants& muonConstants, RecoIdealGeometry& rig) const; diff --git a/Geometry/DTGeometryBuilder/plugins/DTGeometryESModule.cc b/Geometry/DTGeometryBuilder/plugins/DTGeometryESModule.cc index 60ae01c215351..524ce302a34b0 100644 --- a/Geometry/DTGeometryBuilder/plugins/DTGeometryESModule.cc +++ b/Geometry/DTGeometryBuilder/plugins/DTGeometryESModule.cc @@ -36,7 +36,7 @@ #include "Geometry/Records/interface/IdealGeometryRecord.h" #include "Geometry/DTGeometry/interface/DTGeometry.h" #include "Geometry/DTGeometryBuilder/src/DTGeometryBuilderFromDDD.h" -#include "Geometry/DTGeometryBuilder/src/DTGeometryBuilderFromDD4Hep.h" +#include "Geometry/DTGeometryBuilder/src/DTGeometryBuilderFromDD4hep.h" #include "Geometry/DTGeometryBuilder/src/DTGeometryBuilderFromCondDB.h" #include @@ -194,7 +194,7 @@ void DTGeometryESModule::setupDD4hepGeometry(const MuonNumberingRecord& record, cms::DDSpecParRefs myReg; registry->filter(myReg, m_attribute, m_value); - DTGeometryBuilderFromDD4Hep builder; + DTGeometryBuilderFromDD4hep builder; builder.build(*host, cpv.product(), mdc, myReg); } diff --git a/Geometry/DTGeometryBuilder/plugins/dd4hep/DTGeometryBuilder.cc b/Geometry/DTGeometryBuilder/plugins/dd4hep/DTGeometryBuilder.cc index 0392759972018..ca5506b52bf53 100644 --- a/Geometry/DTGeometryBuilder/plugins/dd4hep/DTGeometryBuilder.cc +++ b/Geometry/DTGeometryBuilder/plugins/dd4hep/DTGeometryBuilder.cc @@ -51,7 +51,7 @@ using namespace std; using namespace cms; void DTGeometryBuilder::buildGeometry(DDFilteredView& fview, DTGeometry& geom, const MuonGeometryConstants& num) const { - edm::LogVerbatim("DTGeometryBuilder") << "(0) DTGeometryBuilder - DD4Hep "; + edm::LogVerbatim("DTGeometryBuilder") << "(0) DTGeometryBuilder - DD4hep "; bool doChamber = fview.firstChild(); diff --git a/Geometry/DTGeometryBuilder/src/DTGeometryBuilderFromDD4Hep.cc b/Geometry/DTGeometryBuilder/src/DTGeometryBuilderFromDD4hep.cc similarity index 92% rename from Geometry/DTGeometryBuilder/src/DTGeometryBuilderFromDD4Hep.cc rename to Geometry/DTGeometryBuilder/src/DTGeometryBuilderFromDD4hep.cc index f8a3e58dd3f94..69177ed7b0144 100644 --- a/Geometry/DTGeometryBuilder/src/DTGeometryBuilderFromDD4Hep.cc +++ b/Geometry/DTGeometryBuilder/src/DTGeometryBuilderFromDD4hep.cc @@ -1,9 +1,9 @@ // -*- C++ -*- // // Package: Geometry/DTGeometryBuilder -// Class: DTGeometryBuilderFromDD4Hep +// Class: DTGeometryBuilderFromDD4hep // -/**\class DTGeometryBuilderFromDD4Hep +/**\class DTGeometryBuilderFromDD4hep Description: DT Geometry builder from DD4hep @@ -36,7 +36,7 @@ #include "Geometry/DTGeometry/interface/DTGeometry.h" #include "Geometry/MuonNumbering/interface/MuonBaseNumber.h" #include "Geometry/MuonNumbering/interface/DTNumberingScheme.h" -#include "DTGeometryBuilderFromDD4Hep.h" +#include "DTGeometryBuilderFromDD4hep.h" #include "DD4hep/Detector.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" @@ -47,10 +47,10 @@ using namespace edm; using namespace std; -void DTGeometryBuilderFromDD4Hep::buildGeometry(cms::DDFilteredView& fview, +void DTGeometryBuilderFromDD4hep::buildGeometry(cms::DDFilteredView& fview, DTGeometry& geom, const MuonGeometryConstants& num) const { - edm::LogVerbatim("DTGeometryBuilder") << "(0) DTGeometryBuilder - DD4Hep "; + edm::LogVerbatim("DTGeometryBuilder") << "(0) DTGeometryBuilder - DD4hep "; bool doChamber = fview.firstChild(); @@ -80,7 +80,7 @@ void DTGeometryBuilderFromDD4Hep::buildGeometry(cms::DDFilteredView& fview, } } -DTGeometryBuilderFromDD4Hep::RCPPlane DTGeometryBuilderFromDD4Hep::plane(const cms::DDFilteredView& fview, +DTGeometryBuilderFromDD4hep::RCPPlane DTGeometryBuilderFromDD4hep::plane(const cms::DDFilteredView& fview, Bounds* bounds) const { const Double_t* tr = fview.trans(); const Double_t* rot = fview.rot(); @@ -91,7 +91,7 @@ DTGeometryBuilderFromDD4Hep::RCPPlane DTGeometryBuilderFromDD4Hep::plane(const c bounds)); } -DTChamber* DTGeometryBuilderFromDD4Hep::buildChamber(cms::DDFilteredView& fview, +DTChamber* DTGeometryBuilderFromDD4hep::buildChamber(cms::DDFilteredView& fview, const MuonGeometryConstants& muonConstants) const { MuonGeometryNumbering mdddnum(muonConstants); DTNumberingScheme dtnum(muonConstants); @@ -111,7 +111,7 @@ DTChamber* DTGeometryBuilderFromDD4Hep::buildChamber(cms::DDFilteredView& fview, return chamber; } -DTSuperLayer* DTGeometryBuilderFromDD4Hep::buildSuperLayer(cms::DDFilteredView& fview, +DTSuperLayer* DTGeometryBuilderFromDD4hep::buildSuperLayer(cms::DDFilteredView& fview, DTChamber* chamber, const MuonGeometryConstants& muonConstants) const { MuonGeometryNumbering mdddnum(muonConstants); @@ -135,7 +135,7 @@ DTSuperLayer* DTGeometryBuilderFromDD4Hep::buildSuperLayer(cms::DDFilteredView& return slayer; } -DTLayer* DTGeometryBuilderFromDD4Hep::buildLayer(cms::DDFilteredView& fview, +DTLayer* DTGeometryBuilderFromDD4hep::buildLayer(cms::DDFilteredView& fview, DTSuperLayer* sl, const MuonGeometryConstants& muonConstants) const { MuonGeometryNumbering mdddnum(muonConstants); @@ -178,7 +178,7 @@ DTLayer* DTGeometryBuilderFromDD4Hep::buildLayer(cms::DDFilteredView& fview, return layer; } -void DTGeometryBuilderFromDD4Hep::build(DTGeometry& geom, +void DTGeometryBuilderFromDD4hep::build(DTGeometry& geom, const cms::DDDetector* det, const MuonGeometryConstants& num, const dd4hep::SpecParRefs& refs) { diff --git a/Geometry/DTGeometryBuilder/src/DTGeometryBuilderFromDD4Hep.h b/Geometry/DTGeometryBuilder/src/DTGeometryBuilderFromDD4hep.h similarity index 85% rename from Geometry/DTGeometryBuilder/src/DTGeometryBuilderFromDD4Hep.h rename to Geometry/DTGeometryBuilder/src/DTGeometryBuilderFromDD4hep.h index ba5c84764c1f0..36f188d6b0ce9 100644 --- a/Geometry/DTGeometryBuilder/src/DTGeometryBuilderFromDD4Hep.h +++ b/Geometry/DTGeometryBuilder/src/DTGeometryBuilderFromDD4hep.h @@ -1,11 +1,11 @@ -#ifndef DTGeometryBuilder_DTGeometryBuilderFromDD4Hep_h -#define DTGeometryBuilder_DTGeometryBuilderFromDD4Hep_h +#ifndef DTGeometryBuilder_DTGeometryBuilderFromDD4hep_h +#define DTGeometryBuilder_DTGeometryBuilderFromDD4hep_h // -*- C++ -*- // // Package: Gemetry/DTGeometryBuilder -// Class: DTGeometryBuilderFromDD4Hep +// Class: DTGeometryBuilderFromDD4hep // -/**\class DTGeometryBuilderFromDD4Hep +/**\class DTGeometryBuilderFromDD4hep Description: DT Geometry builder from DD4hep @@ -39,9 +39,9 @@ class DTLayer; class MuonGeometryConstants; class MuonGeometryNumbering; -class DTGeometryBuilderFromDD4Hep { +class DTGeometryBuilderFromDD4hep { public: - DTGeometryBuilderFromDD4Hep() {} + DTGeometryBuilderFromDD4hep() {} void build(DTGeometry&, const cms::DDDetector*, const MuonGeometryConstants&, const dd4hep::SpecParRefs&); diff --git a/Geometry/DTGeometryBuilder/src/DTGeometryParsFromDD.cc b/Geometry/DTGeometryBuilder/src/DTGeometryParsFromDD.cc index d234a63f45d99..acd84916444ad 100644 --- a/Geometry/DTGeometryBuilder/src/DTGeometryParsFromDD.cc +++ b/Geometry/DTGeometryBuilder/src/DTGeometryParsFromDD.cc @@ -1,6 +1,6 @@ /** \class DTGeometryParsFromDD * - * Build the RPCGeometry from the DDD and DD4Hep description + * Build the RPCGeometry from the DDD and DD4hep description * * DD4hep part added to the original old file (DD version) made by Stefano Lacaprara (INFN LNL) * \author: Sergio Lo Meo (sergio.lo.meo@cern.ch) @@ -56,7 +56,7 @@ void DTGeometryParsFromDD::build(const DDCompactView* cview, //cout << "RecoIdealGeometry " << rig.size() << endl; } -// DD4Hep +// DD4hep void DTGeometryParsFromDD::build(const cms::DDCompactView* cview, const MuonGeometryConstants& muonConstants, @@ -259,7 +259,7 @@ DTGeometryParsFromDD::PosRotPair DTGeometryParsFromDD::plane(const DDFilteredVie return pair, std::vector >(gtran, grmat); } -// DD4Hep +// DD4hep void DTGeometryParsFromDD::buildGeometry(cms::DDFilteredView& fv, const MuonGeometryConstants& muonConstants, diff --git a/Geometry/DTGeometryBuilder/test/python/testDTGeometry.py b/Geometry/DTGeometryBuilder/test/python/testDTGeometry.py index 8a69aad9a725d..321b16b526352 100644 --- a/Geometry/DTGeometryBuilder/test/python/testDTGeometry.py +++ b/Geometry/DTGeometryBuilder/test/python/testDTGeometry.py @@ -67,7 +67,7 @@ appendToDataLabel = cms.string('') ) -process.muonGeometryConstants.fromDD4Hep = True +process.muonGeometryConstants.fromDD4hep = True process.test = cms.EDAnalyzer("DTGeometryTest", diff --git a/Geometry/DTGeometryBuilder/test/python/validateDTGeometry_cfg.py b/Geometry/DTGeometryBuilder/test/python/validateDTGeometry_cfg.py index 1a5b07744c3cf..2a37123761aed 100644 --- a/Geometry/DTGeometryBuilder/test/python/validateDTGeometry_cfg.py +++ b/Geometry/DTGeometryBuilder/test/python/validateDTGeometry_cfg.py @@ -42,7 +42,7 @@ appendToDataLabel = cms.string('') ) -process.muonGeometryConstants.fromDD4Hep = True +process.muonGeometryConstants.fromDD4hep = True process.valid = cms.EDAnalyzer("DTGeometryValidate", diff --git a/Geometry/EcalAlgo/plugins/BuildFile.xml b/Geometry/EcalAlgo/plugins/BuildFile.xml index 59d6c8dc69aa2..a4805a072a970 100644 --- a/Geometry/EcalAlgo/plugins/BuildFile.xml +++ b/Geometry/EcalAlgo/plugins/BuildFile.xml @@ -7,6 +7,6 @@ - + diff --git a/Geometry/EcalCommonData/plugins/EcalSimParametersESModule.cc b/Geometry/EcalCommonData/plugins/EcalSimParametersESModule.cc index 5e6048a37b3d6..829f89abe686f 100644 --- a/Geometry/EcalCommonData/plugins/EcalSimParametersESModule.cc +++ b/Geometry/EcalCommonData/plugins/EcalSimParametersESModule.cc @@ -25,29 +25,29 @@ class EcalSimParametersESModule : public edm::ESProducer { private: edm::ESGetToken cpvTokenDDD_; - edm::ESGetToken cpvTokenDD4Hep_; - const bool fromDD4Hep_; + edm::ESGetToken cpvTokenDD4hep_; + const bool fromDD4hep_; const std::string name_; }; EcalSimParametersESModule::EcalSimParametersESModule(const edm::ParameterSet& ps) - : fromDD4Hep_(ps.getParameter("fromDD4Hep")), name_(ps.getParameter("name")) { + : fromDD4hep_(ps.getParameter("fromDD4hep")), name_(ps.getParameter("name")) { auto cc = setWhatProduced(this, name_); - if (fromDD4Hep_) { - cpvTokenDD4Hep_ = cc.consumesFrom(edm::ESInputTag()); + if (fromDD4hep_) { + cpvTokenDD4hep_ = cc.consumesFrom(edm::ESInputTag()); } else { cpvTokenDDD_ = cc.consumesFrom(edm::ESInputTag()); } #ifdef EDM_ML_DEBUG edm::LogVerbatim("EcalGeom") << "EcalSimParametersESModule::EcalSimParametersESModule called with dd4hep: " - << fromDD4Hep_ << " for " << name_; + << fromDD4hep_ << " for " << name_; #endif } void EcalSimParametersESModule::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { edm::ParameterSetDescription desc; - desc.add("fromDD4Hep", false); + desc.add("fromDD4hep", false); desc.add("name", "EcalHitsEB"); descriptions.add("ecalSimulationParametersEB", desc); } @@ -59,11 +59,11 @@ EcalSimParametersESModule::ReturnType EcalSimParametersESModule::produce(const I auto ptp = std::make_unique(); EcalSimParametersFromDD builder; - if (fromDD4Hep_) { + if (fromDD4hep_) { #ifdef EDM_ML_DEBUG edm::LogVerbatim("EcalGeom") << "EcalSimParametersESModule::Try to access cms::DDCompactView"; #endif - edm::ESTransientHandle cpv = iRecord.getTransientHandle(cpvTokenDD4Hep_); + edm::ESTransientHandle cpv = iRecord.getTransientHandle(cpvTokenDD4hep_); builder.build(&(*cpv), name_, *ptp); } else { #ifdef EDM_ML_DEBUG diff --git a/Geometry/EcalCommonData/python/ecalSimulationParameters_cff.py b/Geometry/EcalCommonData/python/ecalSimulationParameters_cff.py index 3e4f7aeaee99a..f2ae8e09250b6 100644 --- a/Geometry/EcalCommonData/python/ecalSimulationParameters_cff.py +++ b/Geometry/EcalCommonData/python/ecalSimulationParameters_cff.py @@ -5,7 +5,7 @@ from Configuration.ProcessModifiers.dd4hep_cff import dd4hep dd4hep.toModify(ecalSimulationParametersEB, - fromDD4Hep = cms.bool(True) + fromDD4hep = cms.bool(True) ) ecalSimulationParametersEE = ecalSimulationParametersEB.clone( diff --git a/Geometry/EcalCommonData/test/python/dumpECDD4Hep_cfg.py b/Geometry/EcalCommonData/test/python/dumpECDD4Hep_cfg.py index 9ebfe5adac08f..184d07d4b5599 100644 --- a/Geometry/EcalCommonData/test/python/dumpECDD4Hep_cfg.py +++ b/Geometry/EcalCommonData/test/python/dumpECDD4Hep_cfg.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -process = cms.Process("DumpECDD4Hep") +process = cms.Process("DumpECDD4hep") process.load('FWCore.MessageService.MessageLogger_cfi') process.source = cms.Source("EmptySource") @@ -18,7 +18,7 @@ ) process.testDump = cms.EDAnalyzer("DDTestDumpFile", - outputFileName = cms.untracked.string('ecalDD4Hep.root'), + outputFileName = cms.untracked.string('ecalDD4hep.root'), DDDetector = cms.ESInputTag('','DDEcal') ) diff --git a/Geometry/EcalCommonData/test/python/runEcalSimParameterDD4Hep_cfg.py b/Geometry/EcalCommonData/test/python/runEcalSimParameterDD4Hep_cfg.py index 1b4b6cba9bf78..a7d14e60544cc 100644 --- a/Geometry/EcalCommonData/test/python/runEcalSimParameterDD4Hep_cfg.py +++ b/Geometry/EcalCommonData/test/python/runEcalSimParameterDD4Hep_cfg.py @@ -25,9 +25,9 @@ input = cms.untracked.int32(1) ) -process.ecalSimulationParametersEB.fromDD4Hep = cms.bool(True) -process.ecalSimulationParametersEE.fromDD4Hep = cms.bool(True) -process.ecalSimulationParametersES.fromDD4Hep = cms.bool(True) +process.ecalSimulationParametersEB.fromDD4hep = cms.bool(True) +process.ecalSimulationParametersEE.fromDD4hep = cms.bool(True) +process.ecalSimulationParametersES.fromDD4hep = cms.bool(True) process.load('Geometry.EcalCommonData.ecalSimulationParametersAnalyzer_cff') diff --git a/Geometry/ForwardCommonData/python/hfnoseParametersInitialization_cfi.py b/Geometry/ForwardCommonData/python/hfnoseParametersInitialization_cfi.py index c589884e80b74..9a0769e7fbc9c 100644 --- a/Geometry/ForwardCommonData/python/hfnoseParametersInitialization_cfi.py +++ b/Geometry/ForwardCommonData/python/hfnoseParametersInitialization_cfi.py @@ -15,6 +15,6 @@ from Configuration.ProcessModifiers.dd4hep_cff import dd4hep dd4hep.toModify(hfnoseParametersInitialize, - fromDD4Hep = cms.bool(True) + fromDD4hep = cms.bool(True) ) diff --git a/Geometry/ForwardCommonData/test/testTotemT2Geometry_cfg.py b/Geometry/ForwardCommonData/test/testTotemT2Geometry_cfg.py index d24ebd7be157f..d314bf5169c26 100644 --- a/Geometry/ForwardCommonData/test/testTotemT2Geometry_cfg.py +++ b/Geometry/ForwardCommonData/test/testTotemT2Geometry_cfg.py @@ -18,7 +18,7 @@ ) process.testDump = cms.EDAnalyzer("DDTestDumpFile", - outputFileName = cms.untracked.string('totemT2DD4Hep.root'), + outputFileName = cms.untracked.string('totemT2DD4hep.root'), DDDetector = cms.ESInputTag('','DDTotemT2') ) diff --git a/Geometry/GEMGeometryBuilder/interface/GEMGeometryParsFromDD.h b/Geometry/GEMGeometryBuilder/interface/GEMGeometryParsFromDD.h index a51263a643054..e4bd217ec17f1 100644 --- a/Geometry/GEMGeometryBuilder/interface/GEMGeometryParsFromDD.h +++ b/Geometry/GEMGeometryBuilder/interface/GEMGeometryParsFromDD.h @@ -2,7 +2,7 @@ #define Geometry_GEMGeometry_GEMGeometryParsFromDD_H /* Implementation of the GEMGeometryParsFromDD Class - * Build the GEMGeometry from the DDD and DD4Hep description + * Build the GEMGeometry from the DDD and DD4hep description * * DD4hep part added to the original old file (DD version) made by M. Maggi (INFN Bari) * Author: Sergio Lo Meo (sergio.lo.meo@cern.ch) @@ -17,7 +17,7 @@ class DDCompactView; class DDFilteredView; -namespace cms { // DD4Hep +namespace cms { // DD4hep class DDFilteredView; class DDCompactView; } // namespace cms @@ -33,7 +33,7 @@ class GEMGeometryParsFromDD { // DD void build(const DDCompactView* cview, const MuonGeometryConstants& muonConstants, RecoIdealGeometry& rgeo); - // DD4Hep + // DD4hep void build(const cms::DDCompactView* cview, const MuonGeometryConstants& muonConstants, RecoIdealGeometry& rgeo); private: @@ -46,7 +46,7 @@ class GEMGeometryParsFromDD { std::vector getTranslation(DDFilteredView& fv); std::vector getRotation(DDFilteredView& fv); - // DD4Hep + // DD4hep void buildGeometry(cms::DDFilteredView& fview, const MuonGeometryConstants& muonConstants, RecoIdealGeometry& rgeo); void buildSuperChamber(cms::DDFilteredView& fv, GEMDetId detId, RecoIdealGeometry& rgeo); diff --git a/Geometry/GEMGeometryBuilder/interface/ME0GeometryParsFromDD.h b/Geometry/GEMGeometryBuilder/interface/ME0GeometryParsFromDD.h index dc142dc9edb94..1c70ad8b9f0f3 100644 --- a/Geometry/GEMGeometryBuilder/interface/ME0GeometryParsFromDD.h +++ b/Geometry/GEMGeometryBuilder/interface/ME0GeometryParsFromDD.h @@ -2,7 +2,7 @@ #define Geometry_GEMGeometry_ME0GeometryParsFromDD_H /* Implementation of the ME0GeometryParsFromDD Class - * Build the ME0Geometry from the DDD and DD4Hep description + * Build the ME0Geometry from the DDD and DD4hep description * * DD4hep part added to the original old file (DD version) made by M. Maggi (INFN Bari) * Author: Sergio Lo Meo (sergio.lo.meo@cern.ch) @@ -14,7 +14,7 @@ class DDCompactView; class DDFilteredView; -namespace cms { // DD4Hep +namespace cms { // DD4hep class DDFilteredView; class DDCompactView; } // namespace cms diff --git a/Geometry/GEMGeometryBuilder/plugins/GEMGeometryESModule.cc b/Geometry/GEMGeometryBuilder/plugins/GEMGeometryESModule.cc index 109b880c50fa9..b1721a6b7812d 100644 --- a/Geometry/GEMGeometryBuilder/plugins/GEMGeometryESModule.cc +++ b/Geometry/GEMGeometryBuilder/plugins/GEMGeometryESModule.cc @@ -65,7 +65,7 @@ class GEMGeometryESModule : public edm::ESProducer { GEMGeometryESModule::GEMGeometryESModule(const edm::ParameterSet& p) : fromDDD_{p.getParameter("fromDDD")}, - fromDD4hep_{p.getParameter("fromDD4Hep")}, + fromDD4hep_{p.getParameter("fromDD4hep")}, applyAlignment_(p.getParameter("applyAlignment")), alignmentsLabel_(p.getParameter("alignmentsLabel")) { auto cc = setWhatProduced(this); @@ -89,7 +89,7 @@ GEMGeometryESModule::GEMGeometryESModule(const edm::ParameterSet& p) void GEMGeometryESModule::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { edm::ParameterSetDescription desc; desc.add("fromDDD", true); - desc.add("fromDD4Hep", false); + desc.add("fromDD4hep", false); desc.add("applyAlignment", false); desc.add("alignmentsLabel", ""); descriptions.add("gemGeometry", desc); diff --git a/Geometry/GEMGeometryBuilder/python/gemGeometryDB_cfi.py b/Geometry/GEMGeometryBuilder/python/gemGeometryDB_cfi.py index 0adbce82c1146..2f8af38715446 100644 --- a/Geometry/GEMGeometryBuilder/python/gemGeometryDB_cfi.py +++ b/Geometry/GEMGeometryBuilder/python/gemGeometryDB_cfi.py @@ -5,7 +5,7 @@ # GEMGeometryESModule = cms.ESProducer("GEMGeometryESModule", fromDDD = cms.bool(False), - fromDD4Hep = cms.bool(False), + fromDD4hep = cms.bool(False), appendToDataLabel = cms.string(''), alignmentsLabel = cms.string(''), applyAlignment = cms.bool(False) diff --git a/Geometry/GEMGeometryBuilder/python/gemGeometry_cff.py b/Geometry/GEMGeometryBuilder/python/gemGeometry_cff.py index c8b02c08b82be..48ca00b76e161 100644 --- a/Geometry/GEMGeometryBuilder/python/gemGeometry_cff.py +++ b/Geometry/GEMGeometryBuilder/python/gemGeometry_cff.py @@ -2,4 +2,4 @@ from Configuration.ProcessModifiers.dd4hep_cff import dd4hep -dd4hep.toModify(gemGeometry, fromDDD = False, fromDD4Hep = True) +dd4hep.toModify(gemGeometry, fromDDD = False, fromDD4hep = True) diff --git a/Geometry/GEMGeometryBuilder/src/GEMGeometryBuilder.cc b/Geometry/GEMGeometryBuilder/src/GEMGeometryBuilder.cc index e19c8d57d55d7..161d18934ffc9 100644 --- a/Geometry/GEMGeometryBuilder/src/GEMGeometryBuilder.cc +++ b/Geometry/GEMGeometryBuilder/src/GEMGeometryBuilder.cc @@ -386,17 +386,17 @@ GEMSuperChamber* GEMGeometryBuilder::buildSuperChamber(cms::DDFilteredView& fv, auto solidA = solid.solidA(); std::vector dpar = solidA.dimensions(); - double dy = k_ScaleFromDD4Hep * dpar[3]; //length is along local Y - double dz = k_ScaleFromDD4Hep * dpar[2]; // thickness is long local Z - double dx1 = k_ScaleFromDD4Hep * dpar[0]; // bottom width is along local X - double dx2 = k_ScaleFromDD4Hep * dpar[1]; // top width is along loc + double dy = k_ScaleFromDD4hep * dpar[3]; //length is along local Y + double dz = k_ScaleFromDD4hep * dpar[2]; // thickness is long local Z + double dx1 = k_ScaleFromDD4hep * dpar[0]; // bottom width is along local X + double dx2 = k_ScaleFromDD4hep * dpar[1]; // top width is along loc auto solidB = solid.solidB(); dpar = solidB.dimensions(); const int nch = 2; const double chgap = 2.105; - dz += (k_ScaleFromDD4Hep * dpar[2]); // chamber thickness + dz += (k_ScaleFromDD4hep * dpar[2]); // chamber thickness dz *= nch; // 2 chambers in superchamber dz += chgap; // gap between chambers @@ -412,15 +412,15 @@ GEMChamber* GEMGeometryBuilder::buildChamber(cms::DDFilteredView& fv, GEMDetId d auto solidA = solid.solidA(); std::vector dpar = solidA.dimensions(); - double dy = k_ScaleFromDD4Hep * dpar[3]; //length is along local Y - double dz = k_ScaleFromDD4Hep * dpar[2]; // thickness is long local Z - double dx1 = k_ScaleFromDD4Hep * dpar[0]; // bottom width is along local X - double dx2 = k_ScaleFromDD4Hep * dpar[1]; // top width is along local X + double dy = k_ScaleFromDD4hep * dpar[3]; //length is along local Y + double dz = k_ScaleFromDD4hep * dpar[2]; // thickness is long local Z + double dx1 = k_ScaleFromDD4hep * dpar[0]; // bottom width is along local X + double dx2 = k_ScaleFromDD4hep * dpar[1]; // top width is along local X auto solidB = solid.solidB(); dpar = solidB.dimensions(); - dz += (k_ScaleFromDD4Hep * dpar[2]); // chamber thickness + dz += (k_ScaleFromDD4hep * dpar[2]); // chamber thickness bool isOdd = detId.chamber() % 2; RCPBoundPlane surf(boundPlane(fv, new TrapezoidalPlaneBounds(dx1, dx2, dy, dz), isOdd)); @@ -441,9 +441,9 @@ GEMEtaPartition* GEMGeometryBuilder::buildEtaPartition(cms::DDFilteredView& fv, double ti = 0.4; // half thickness - const std::vector pars{float(k_ScaleFromDD4Hep * dpar[0]), - float(k_ScaleFromDD4Hep * dpar[1]), - float(k_ScaleFromDD4Hep * dpar[3]), + const std::vector pars{float(k_ScaleFromDD4hep * dpar[0]), + float(k_ScaleFromDD4hep * dpar[1]), + float(k_ScaleFromDD4hep * dpar[3]), float(nStrips), float(nPads), float(dPhi)}; @@ -452,7 +452,7 @@ GEMEtaPartition* GEMGeometryBuilder::buildEtaPartition(cms::DDFilteredView& fv, RCPBoundPlane surf( boundPlane(fv, new TrapezoidalPlaneBounds( - k_ScaleFromDD4Hep * dpar[0], k_ScaleFromDD4Hep * dpar[1], k_ScaleFromDD4Hep * dpar[3], ti), + k_ScaleFromDD4hep * dpar[0], k_ScaleFromDD4hep * dpar[1], k_ScaleFromDD4hep * dpar[3], ti), isOdd)); std::string_view name = fv.name(); @@ -469,7 +469,7 @@ GEMGeometryBuilder::RCPBoundPlane GEMGeometryBuilder::boundPlane(const cms::DDFi // extract the position const Double_t* tran = fv.trans(); Surface::PositionType posResult( - k_ScaleFromDD4Hep * tran[0], k_ScaleFromDD4Hep * tran[1], k_ScaleFromDD4Hep * tran[2]); + k_ScaleFromDD4hep * tran[0], k_ScaleFromDD4hep * tran[1], k_ScaleFromDD4hep * tran[2]); // now the rotation DDRotationMatrix rota; diff --git a/Geometry/GEMGeometryBuilder/src/GEMGeometryBuilder.h b/Geometry/GEMGeometryBuilder/src/GEMGeometryBuilder.h index 074133c665dd0..38658f42a83e2 100644 --- a/Geometry/GEMGeometryBuilder/src/GEMGeometryBuilder.h +++ b/Geometry/GEMGeometryBuilder/src/GEMGeometryBuilder.h @@ -68,7 +68,7 @@ class GEMGeometryBuilder { // Common void buildRegions(GEMGeometry&, const std::vector&); - static constexpr double k_ScaleFromDD4Hep = (1.0 / dd4hep::cm); + static constexpr double k_ScaleFromDD4hep = (1.0 / dd4hep::cm); }; #endif diff --git a/Geometry/GEMGeometryBuilder/src/GEMGeometryParsFromDD.cc b/Geometry/GEMGeometryBuilder/src/GEMGeometryParsFromDD.cc index 0b459bd835496..e05aad346742b 100644 --- a/Geometry/GEMGeometryBuilder/src/GEMGeometryParsFromDD.cc +++ b/Geometry/GEMGeometryBuilder/src/GEMGeometryParsFromDD.cc @@ -1,5 +1,5 @@ /* Implementation of the GEMGeometryParsFromDD Class - * Build the GEMGeometry from the DDD and DD4Hep description + * Build the GEMGeometry from the DDD and DD4hep description * * DD4hep part added to the original old file (DD version) made by M. Maggi (INFN Bari) * Author: Sergio Lo Meo (sergio.lo.meo@cern.ch) @@ -219,7 +219,7 @@ std::vector GEMGeometryParsFromDD::getRotation(DDFilteredView& fv) { return {x.X(), x.Y(), x.Z(), y.X(), y.Y(), y.Z(), z.X(), z.Y(), z.Z()}; } -// DD4Hep +// DD4hep void GEMGeometryParsFromDD::build(const cms::DDCompactView* cview, const MuonGeometryConstants& muonConstants, diff --git a/Geometry/GEMGeometryBuilder/src/ME0GeometryBuilder.cc b/Geometry/GEMGeometryBuilder/src/ME0GeometryBuilder.cc index d674a8ac6c584..21cd2c4eb57b7 100644 --- a/Geometry/GEMGeometryBuilder/src/ME0GeometryBuilder.cc +++ b/Geometry/GEMGeometryBuilder/src/ME0GeometryBuilder.cc @@ -4,7 +4,7 @@ Description: ME0 Geometry builder from DD & DD4hep DD4hep part added to the original old file (DD version) made by M. Maggi (INFN Bari) Sergio Lo Meo (sergio.lo.meo@cern.ch) following what Ianna Osborne made for DTs (DD4HEP migration) - Updated by Sunanda Banerjee (Fermilab) to make it work for DDD/DD4Hep + Updated by Sunanda Banerjee (Fermilab) to make it work for DDD/DD4hep Updated: 7 August 2020 */ #include "Geometry/GEMGeometryBuilder/src/ME0GeometryBuilder.h" @@ -434,10 +434,10 @@ ME0Geometry* ME0GeometryBuilder::buildGeometry(cms::DDFilteredView& fv, const Mu ME0Chamber* ME0GeometryBuilder::buildChamber(cms::DDFilteredView& fv, ME0DetId detId) const { std::vector dpar = fv.parameters(); - double L = k_ScaleFromDD4Hep * dpar[3]; - double T = k_ScaleFromDD4Hep * dpar[2]; - double b = k_ScaleFromDD4Hep * dpar[0]; - double B = k_ScaleFromDD4Hep * dpar[1]; + double L = k_ScaleFromDD4hep * dpar[3]; + double T = k_ScaleFromDD4hep * dpar[2]; + double b = k_ScaleFromDD4hep * dpar[0]; + double B = k_ScaleFromDD4hep * dpar[1]; bool isOdd = false; ME0BoundPlane surf(boundPlane(fv, new TrapezoidalPlaneBounds(b, B, L, T), isOdd)); ME0Chamber* chamber = new ME0Chamber(detId.chamberId(), surf); @@ -448,10 +448,10 @@ ME0Chamber* ME0GeometryBuilder::buildChamber(cms::DDFilteredView& fv, ME0DetId d ME0Layer* ME0GeometryBuilder::buildLayer(cms::DDFilteredView& fv, ME0DetId detId) const { std::vector dpar = fv.parameters(); - double L = k_ScaleFromDD4Hep * dpar[3]; - double t = k_ScaleFromDD4Hep * dpar[2]; - double b = k_ScaleFromDD4Hep * dpar[0]; - double B = k_ScaleFromDD4Hep * dpar[1]; + double L = k_ScaleFromDD4hep * dpar[3]; + double t = k_ScaleFromDD4hep * dpar[2]; + double b = k_ScaleFromDD4hep * dpar[0]; + double B = k_ScaleFromDD4hep * dpar[1]; bool isOdd = false; ME0BoundPlane surf(boundPlane(fv, new TrapezoidalPlaneBounds(b, B, L, t), isOdd)); ME0Layer* layer = new ME0Layer(detId.layerId(), surf); @@ -468,10 +468,10 @@ ME0EtaPartition* ME0GeometryBuilder::buildEtaPartition(cms::DDFilteredView& fv, std::vector dpar = fv.parameters(); - double b = k_ScaleFromDD4Hep * dpar[0]; - double B = k_ScaleFromDD4Hep * dpar[1]; - double L = k_ScaleFromDD4Hep * dpar[3]; - double t = k_ScaleFromDD4Hep * dpar[2]; + double b = k_ScaleFromDD4hep * dpar[0]; + double B = k_ScaleFromDD4hep * dpar[1]; + double L = k_ScaleFromDD4hep * dpar[3]; + double t = k_ScaleFromDD4hep * dpar[2]; const std::vector pars{float(dpar[0]), float(dpar[1]), float(dpar[3]), float(nStrips), float(nPads)}; @@ -493,7 +493,7 @@ ME0GeometryBuilder::ME0BoundPlane ME0GeometryBuilder::boundPlane(const cms::DDFi // extract the position const Double_t* trans = fv.trans(); Surface::PositionType posResult( - k_ScaleFromDD4Hep * trans[0], k_ScaleFromDD4Hep * trans[1], k_ScaleFromDD4Hep * trans[2]); + k_ScaleFromDD4hep * trans[0], k_ScaleFromDD4hep * trans[1], k_ScaleFromDD4hep * trans[2]); // now the rotation DDRotationMatrix rotation; diff --git a/Geometry/GEMGeometryBuilder/src/ME0GeometryBuilder.h b/Geometry/GEMGeometryBuilder/src/ME0GeometryBuilder.h index a7ea75dc41911..4625d2b2a3f81 100644 --- a/Geometry/GEMGeometryBuilder/src/ME0GeometryBuilder.h +++ b/Geometry/GEMGeometryBuilder/src/ME0GeometryBuilder.h @@ -63,7 +63,7 @@ class ME0GeometryBuilder { ME0EtaPartition* buildEtaPartition(cms::DDFilteredView& fv, ME0DetId detId) const; - static constexpr double k_ScaleFromDD4Hep = (1.0 / dd4hep::cm); + static constexpr double k_ScaleFromDD4hep = (1.0 / dd4hep::cm); }; #endif diff --git a/Geometry/GEMGeometryBuilder/src/ME0GeometryParsFromDD.cc b/Geometry/GEMGeometryBuilder/src/ME0GeometryParsFromDD.cc index fc07ee4c59295..4f0149364bd25 100644 --- a/Geometry/GEMGeometryBuilder/src/ME0GeometryParsFromDD.cc +++ b/Geometry/GEMGeometryBuilder/src/ME0GeometryParsFromDD.cc @@ -1,5 +1,5 @@ /* Implementation of the ME0GeometryParsFromDD Class - * Build the ME0Geometry from the DDD and DD4Hep description + * Build the ME0Geometry from the DDD and DD4hep description * * DD4hep part added to the original old file (DD version) made by M. Maggi (INFN Bari) * Author: Sergio Lo Meo (sergio.lo.meo@cern.ch) diff --git a/Geometry/GEMGeometryBuilder/test/python/dumpGEMGeometryDD4Hep_cfg.py b/Geometry/GEMGeometryBuilder/test/python/dumpGEMGeometryDD4Hep_cfg.py index bc9613250a309..76fef824ea9fe 100644 --- a/Geometry/GEMGeometryBuilder/test/python/dumpGEMGeometryDD4Hep_cfg.py +++ b/Geometry/GEMGeometryBuilder/test/python/dumpGEMGeometryDD4Hep_cfg.py @@ -27,9 +27,9 @@ input = cms.untracked.int32(1) ) -process.muonGeometryConstants.fromDD4Hep = True +process.muonGeometryConstants.fromDD4hep = True process.gemGeometry.fromDDD = False -process.gemGeometry.fromDD4Hep = True +process.gemGeometry.fromDD4hep = True #process.gemGeometryDump.verbose = True process.p = cms.Path(process.gemGeometryDump) diff --git a/Geometry/GEMGeometryBuilder/test/python/dumpME0GeometryDD4Hep_cfg.py b/Geometry/GEMGeometryBuilder/test/python/dumpME0GeometryDD4Hep_cfg.py index b43f4bcfa0e57..d58d47f57b085 100644 --- a/Geometry/GEMGeometryBuilder/test/python/dumpME0GeometryDD4Hep_cfg.py +++ b/Geometry/GEMGeometryBuilder/test/python/dumpME0GeometryDD4Hep_cfg.py @@ -28,7 +28,7 @@ input = cms.untracked.int32(1) ) -process.muonGeometryConstants.fromDD4Hep = True +process.muonGeometryConstants.fromDD4hep = True process.me0Geometry.fromDDD = False process.me0Geometry.fromDD4hep = True #process.me0GeometryDump.verbose = True diff --git a/Geometry/GEMGeometryBuilder/test/python/validateGEMGeometryDD4Hep_cfg.py b/Geometry/GEMGeometryBuilder/test/python/validateGEMGeometryDD4Hep_cfg.py index be9f02e3e22f8..4af0f4b6f6d2b 100644 --- a/Geometry/GEMGeometryBuilder/test/python/validateGEMGeometryDD4Hep_cfg.py +++ b/Geometry/GEMGeometryBuilder/test/python/validateGEMGeometryDD4Hep_cfg.py @@ -32,8 +32,8 @@ tolerance = cms.untracked.int32(7) ) -process.muonGeometryConstants.fromDD4Hep = True +process.muonGeometryConstants.fromDD4hep = True process.gemGeometry.fromDDD = False -process.gemGeometry.fromDD4Hep = True +process.gemGeometry.fromDD4hep = True process.p = cms.Path(process.valid) diff --git a/Geometry/GEMGeometryBuilder/test/python/validateME0GeometryDD4hep_cfg.py b/Geometry/GEMGeometryBuilder/test/python/validateME0GeometryDD4hep_cfg.py index 35b7f6dc9c06c..9936ab44d3678 100644 --- a/Geometry/GEMGeometryBuilder/test/python/validateME0GeometryDD4hep_cfg.py +++ b/Geometry/GEMGeometryBuilder/test/python/validateME0GeometryDD4hep_cfg.py @@ -27,8 +27,8 @@ tolerance = cms.untracked.int32(7) ) -process.muonGeometryConstants.fromDD4Hep = True +process.muonGeometryConstants.fromDD4hep = True process.me0Geometry.fromDDD = False -process.me0Geometry.fromDD4Hep = True +process.me0Geometry.fromDD4hep = True process.p = cms.Path(process.valid) diff --git a/Geometry/HGCalCommonData/interface/HGCalParameters.h b/Geometry/HGCalCommonData/interface/HGCalParameters.h index 859761d098a77..c8d79ef63fa1f 100644 --- a/Geometry/HGCalCommonData/interface/HGCalParameters.h +++ b/Geometry/HGCalCommonData/interface/HGCalParameters.h @@ -37,10 +37,10 @@ class HGCalParameters { static constexpr double k_ScaleToDDD = 10.0; static constexpr double k_ScaleFromDDDToG4 = 1.0; static constexpr double k_ScaleToDDDFromG4 = 1.0; - static constexpr double k_ScaleFromDD4Hep = (1.0 / dd4hep::cm); - static constexpr double k_ScaleToDD4Hep = dd4hep::cm; - static constexpr double k_ScaleFromDD4HepToG4 = (1.0 / dd4hep::mm); - static constexpr double k_ScaleToDD4HepFromG4 = dd4hep::mm; + static constexpr double k_ScaleFromDD4hep = (1.0 / dd4hep::cm); + static constexpr double k_ScaleToDD4hep = dd4hep::cm; + static constexpr double k_ScaleFromDD4hepToG4 = (1.0 / dd4hep::mm); + static constexpr double k_ScaleToDD4hepFromG4 = dd4hep::mm; static constexpr uint32_t k_CornerSize = 6; static constexpr double tol = 1.0e-12; diff --git a/Geometry/HGCalCommonData/plugins/HGCalParametersESModule.cc b/Geometry/HGCalCommonData/plugins/HGCalParametersESModule.cc index ee388195778da..fded90c0a74e6 100644 --- a/Geometry/HGCalCommonData/plugins/HGCalParametersESModule.cc +++ b/Geometry/HGCalCommonData/plugins/HGCalParametersESModule.cc @@ -25,9 +25,9 @@ class HGCalParametersESModule : public edm::ESProducer { private: std::string name_, name2_, namew_, namec_, namet_, namex_; - bool fromDD4Hep_; + bool fromDD4hep_; edm::ESGetToken cpvTokenDDD_; - edm::ESGetToken cpvTokenDD4Hep_; + edm::ESGetToken cpvTokenDD4hep_; }; HGCalParametersESModule::HGCalParametersESModule(const edm::ParameterSet& iC) { @@ -37,14 +37,14 @@ HGCalParametersESModule::HGCalParametersESModule(const edm::ParameterSet& iC) { namec_ = iC.getParameter("nameC"); namet_ = iC.getParameter("nameT"); namex_ = iC.getParameter("nameX"); - fromDD4Hep_ = iC.getParameter("fromDD4Hep"); + fromDD4hep_ = iC.getParameter("fromDD4hep"); #ifdef EDM_ML_DEBUG edm::LogVerbatim("HGCalGeom") << "HGCalParametersESModule for " << name_ << ":" << namew_ << ":" << namec_ << ":" - << namet_ << " and fromDD4Hep flag " << fromDD4Hep_; + << namet_ << " and fromDD4hep flag " << fromDD4hep_; #endif auto cc = setWhatProduced(this, namex_); - if (fromDD4Hep_) - cpvTokenDD4Hep_ = cc.consumesFrom(edm::ESInputTag()); + if (fromDD4hep_) + cpvTokenDD4hep_ = cc.consumesFrom(edm::ESInputTag()); else cpvTokenDDD_ = cc.consumes(edm::ESInputTag()); } @@ -57,7 +57,7 @@ void HGCalParametersESModule::fillDescriptions(edm::ConfigurationDescriptions& d desc.add("nameC", "HGCalEECell"); desc.add("nameT", "HGCal"); desc.add("nameX", "HGCalEESensitive"); - desc.add("fromDD4Hep", false); + desc.add("fromDD4hep", false); descriptions.add("hgcalEEParametersInitialize", desc); } @@ -67,11 +67,11 @@ HGCalParametersESModule::ReturnType HGCalParametersESModule::produce(const Ideal #endif auto ptp = std::make_unique(name_); HGCalParametersFromDD builder; - if (fromDD4Hep_) { + if (fromDD4hep_) { #ifdef EDM_ML_DEBUG edm::LogVerbatim("HGCalGeom") << "HGCalParametersESModule::Try to access cms::DDCompactView"; #endif - edm::ESTransientHandle cpv = iRecord.getTransientHandle(cpvTokenDD4Hep_); + edm::ESTransientHandle cpv = iRecord.getTransientHandle(cpvTokenDD4hep_); builder.build(cpv.product(), *ptp, name_, namew_, namec_, namet_, name2_); } else { #ifdef EDM_ML_DEBUG diff --git a/Geometry/HGCalCommonData/python/hgcalEEParametersInitialization_cfi.py b/Geometry/HGCalCommonData/python/hgcalEEParametersInitialization_cfi.py index a48ddd730586a..76ec3be700e7f 100644 --- a/Geometry/HGCalCommonData/python/hgcalEEParametersInitialization_cfi.py +++ b/Geometry/HGCalCommonData/python/hgcalEEParametersInitialization_cfi.py @@ -7,12 +7,12 @@ nameC = cms.string('HGCalEESensitive'), nameT = cms.string('HGCal'), nameX = cms.string('HGCalEESensitive'), - fromDD4Hep = cms.bool(False), + fromDD4hep = cms.bool(False), appendToDataLabel = cms.string('') ) from Configuration.ProcessModifiers.dd4hep_cff import dd4hep dd4hep.toModify(hgcalEEParametersInitialize, - fromDD4Hep = cms.bool(True) + fromDD4hep = cms.bool(True) ) diff --git a/Geometry/HGCalCommonData/python/hgcalParametersInitialization_cfi.py b/Geometry/HGCalCommonData/python/hgcalParametersInitialization_cfi.py index f3b1524bc3ca1..6af3726adf221 100644 --- a/Geometry/HGCalCommonData/python/hgcalParametersInitialization_cfi.py +++ b/Geometry/HGCalCommonData/python/hgcalParametersInitialization_cfi.py @@ -5,7 +5,7 @@ from Configuration.ProcessModifiers.dd4hep_cff import dd4hep dd4hep.toModify(hgcalEEParametersInitialize, - fromDD4Hep = cms.bool(True) + fromDD4hep = cms.bool(True) ) hgcalHESiParametersInitialize = hgcalEEParametersInitialize.clone( diff --git a/Geometry/HGCalCommonData/python/hgcalV15ParametersInitialization_cfi.py b/Geometry/HGCalCommonData/python/hgcalV15ParametersInitialization_cfi.py index a058e0a4a5cc7..2080a7aef33f5 100644 --- a/Geometry/HGCalCommonData/python/hgcalV15ParametersInitialization_cfi.py +++ b/Geometry/HGCalCommonData/python/hgcalV15ParametersInitialization_cfi.py @@ -7,14 +7,14 @@ nameC = cms.string('HGCalEESensitive'), nameT = cms.string('HGCal'), nameX = cms.string('HGCalEESensitive'), - fromDD4Hep = cms.bool(False), + fromDD4hep = cms.bool(False), appendToDataLabel = cms.string('') ) from Configuration.ProcessModifiers.dd4hep_cff import dd4hep dd4hep.toModify(hgcalEEParametersInitialize, - fromDD4Hep = cms.bool(True) + fromDD4hep = cms.bool(True) ) hgcalHESiParametersInitialize = hgcalEEParametersInitialize.clone( diff --git a/Geometry/HGCalCommonData/python/hgcalV6ParametersInitialization_cfi.py b/Geometry/HGCalCommonData/python/hgcalV6ParametersInitialization_cfi.py index d8948826904fa..2fb16a7dd8cb7 100644 --- a/Geometry/HGCalCommonData/python/hgcalV6ParametersInitialization_cfi.py +++ b/Geometry/HGCalCommonData/python/hgcalV6ParametersInitialization_cfi.py @@ -5,7 +5,7 @@ from Configuration.ProcessModifiers.dd4hep_cff import dd4hep dd4hep.toModify(hgcalEEParametersInitialize, - fromDD4Hep = cms.bool(True) + fromDD4hep = cms.bool(True) ) hgcalHESiParametersInitialize = hgcalEEParametersInitialize.clone( diff --git a/Geometry/HGCalCommonData/src/HGCalGeomParameters.cc b/Geometry/HGCalCommonData/src/HGCalGeomParameters.cc index f7b5fa0f94a44..75019519e3495 100644 --- a/Geometry/HGCalCommonData/src/HGCalGeomParameters.cc +++ b/Geometry/HGCalCommonData/src/HGCalGeomParameters.cc @@ -296,16 +296,16 @@ void HGCalGeomParameters::loadGeometryHexagon(const cms::DDCompactView* cpv, if (std::find(php.layer_.begin(), php.layer_.end(), lay) == php.layer_.end()) php.layer_.emplace_back(lay); auto itr = layers.find(lay); - double zz = HGCalParameters::k_ScaleFromDD4Hep * fv.translation().Z(); + double zz = HGCalParameters::k_ScaleFromDD4hep * fv.translation().Z(); if (itr == layers.end()) { double rin(0), rout(0); if (dd4hep::isA(fv.solid())) { - rin = 0.5 * HGCalParameters::k_ScaleFromDD4Hep * (pars[5] + pars[8]); - rout = 0.5 * HGCalParameters::k_ScaleFromDD4Hep * (pars[6] + pars[9]); + rin = 0.5 * HGCalParameters::k_ScaleFromDD4hep * (pars[5] + pars[8]); + rout = 0.5 * HGCalParameters::k_ScaleFromDD4hep * (pars[6] + pars[9]); } else if (dd4hep::isA(fv.solid())) { dd4hep::Tube tubeSeg(fv.solid()); - rin = HGCalParameters::k_ScaleFromDD4Hep * tubeSeg.rMin(); - rout = HGCalParameters::k_ScaleFromDD4Hep * tubeSeg.rMax(); + rin = HGCalParameters::k_ScaleFromDD4hep * tubeSeg.rMin(); + rout = HGCalParameters::k_ScaleFromDD4hep * tubeSeg.rMax(); } HGCalGeomParameters::layerParameters laypar(rin, rout, zz); layers[lay] = laypar; @@ -317,13 +317,13 @@ void HGCalGeomParameters::loadGeometryHexagon(const cms::DDCompactView* cpv, fv.rotation().GetComponents(x, y, z); const CLHEP::HepRep3x3 rotation(x.X(), y.X(), z.X(), x.Y(), y.Y(), z.Y(), x.Z(), y.Z(), z.Z()); const CLHEP::HepRotation hr(rotation); - double xx = HGCalParameters::k_ScaleFromDD4Hep * fv.translation().X(); + double xx = HGCalParameters::k_ScaleFromDD4hep * fv.translation().X(); if (std::abs(xx) < tolerance) xx = 0; - double yy = HGCalParameters::k_ScaleFromDD4Hep * fv.translation().Y(); + double yy = HGCalParameters::k_ScaleFromDD4hep * fv.translation().Y(); if (std::abs(yy) < tolerance) yy = 0; - double zz = HGCalParameters::k_ScaleFromDD4Hep * fv.translation().Z(); + double zz = HGCalParameters::k_ScaleFromDD4hep * fv.translation().Z(); const CLHEP::Hep3Vector h3v(xx, yy, zz); HGCalParameters::hgtrform mytrf; mytrf.zp = zp; @@ -374,14 +374,14 @@ void HGCalGeomParameters::loadGeometryHexagon(const cms::DDCompactView* cpv, if (itr == copies.end()) { copies[wafer] = wafer2copy.size(); copiesInLayers[layer][wafer] = wafer2copy.size(); - double xx = HGCalParameters::k_ScaleFromDD4Hep * fv1.translation().X(); + double xx = HGCalParameters::k_ScaleFromDD4hep * fv1.translation().X(); if (std::abs(xx) < tolerance) xx = 0; - double yy = HGCalParameters::k_ScaleFromDD4Hep * fv1.translation().Y(); + double yy = HGCalParameters::k_ScaleFromDD4hep * fv1.translation().Y(); if (std::abs(yy) < tolerance) yy = 0; wafer2copy.emplace_back(wafer); - GlobalPoint p(xx, yy, HGCalParameters::k_ScaleFromDD4Hep * fv1.translation().Z()); + GlobalPoint p(xx, yy, HGCalParameters::k_ScaleFromDD4hep * fv1.translation().Z()); HGCalGeomParameters::cellParameters cell(false, wafer, p); wafers.emplace_back(cell); if (names.count(name) == 0) { @@ -396,9 +396,9 @@ void HGCalGeomParameters::loadGeometryHexagon(const cms::DDCompactView* cpv, zv[1] = pars[9]; rv = pars[4]; } - php.waferR_ = 2.0 * HGCalParameters::k_ScaleFromDD4HepToG4 * rv * tan30deg_; - php.waferSize_ = HGCalParameters::k_ScaleFromDD4Hep * rv; - double dz = 0.5 * HGCalParameters::k_ScaleFromDD4HepToG4 * (zv[1] - zv[0]); + php.waferR_ = 2.0 * HGCalParameters::k_ScaleFromDD4hepToG4 * rv * tan30deg_; + php.waferSize_ = HGCalParameters::k_ScaleFromDD4hep * rv; + double dz = 0.5 * HGCalParameters::k_ScaleFromDD4hepToG4 * (zv[1] - zv[0]); #ifdef EDM_ML_DEBUG edm::LogVerbatim("HGCalGeom") << "Mode " << mode << " R " << php.waferSize_ << ":" << php.waferR_ << " z " << dz; @@ -458,8 +458,8 @@ void HGCalGeomParameters::loadGeometryHexagon(const cms::DDCompactView* cpv, } if (newc) { bool half = (name.find("Half") != std::string::npos); - double xx = HGCalParameters::k_ScaleFromDD4Hep * fv2.translation().X(); - double yy = HGCalParameters::k_ScaleFromDD4Hep * fv2.translation().Y(); + double xx = HGCalParameters::k_ScaleFromDD4hep * fv2.translation().X(); + double yy = HGCalParameters::k_ScaleFromDD4hep * fv2.translation().Y(); if (half) { math::XYZPointD p1(-2.0 * cellsize / 9.0, 0, 0); math::XYZPointD p2 = fv2.rotation()(p1); @@ -789,11 +789,11 @@ void HGCalGeomParameters::loadGeometryHexagon8(const cms::DDCompactView* cpv, if (std::find(php.layer_.begin(), php.layer_.end(), lay) == php.layer_.end()) php.layer_.emplace_back(lay); const std::vector& pars = fv.parameters(); - double rin = HGCalParameters::k_ScaleFromDD4Hep * pars[0]; - double rout = HGCalParameters::k_ScaleFromDD4Hep * pars[1]; + double rin = HGCalParameters::k_ScaleFromDD4hep * pars[0]; + double rout = HGCalParameters::k_ScaleFromDD4hep * pars[1]; auto itr = layers.find(lay); if (itr == layers.end()) { - double zp = HGCalParameters::k_ScaleFromDD4Hep * fv.translation().Z(); + double zp = HGCalParameters::k_ScaleFromDD4hep * fv.translation().Z(); HGCalGeomParameters::layerParameters laypar(rin, rout, zp); layers[lay] = laypar; } else { @@ -807,11 +807,11 @@ void HGCalGeomParameters::loadGeometryHexagon8(const cms::DDCompactView* cpv, const CLHEP::HepRotation hr(rotation); double xx = ((std::abs(fv.translation().X()) < tolerance) ? 0 - : HGCalParameters::k_ScaleFromDD4Hep * fv.translation().X()); + : HGCalParameters::k_ScaleFromDD4hep * fv.translation().X()); double yy = ((std::abs(fv.translation().Y()) < tolerance) ? 0 - : HGCalParameters::k_ScaleFromDD4Hep * fv.translation().Y()); - const CLHEP::Hep3Vector h3v(xx, yy, HGCalParameters::k_ScaleFromDD4Hep * fv.translation().Z()); + : HGCalParameters::k_ScaleFromDD4hep * fv.translation().Y()); + const CLHEP::Hep3Vector h3v(xx, yy, HGCalParameters::k_ScaleFromDD4hep * fv.translation().Z()); HGCalParameters::hgtrform mytrf; mytrf.zp = zside; mytrf.lay = lay; @@ -972,7 +972,7 @@ void HGCalGeomParameters::loadGeometryHexagonModule(const cms::DDCompactView* cp const std::string& sdTag2, int firstLayer) { #ifdef EDM_ML_DEBUG - edm::LogVerbatim("HGCalGeom") << "HGCalGeomParameters (DD4Hep)::loadGeometryHexagonModule called with tags " << sdTag1 + edm::LogVerbatim("HGCalGeom") << "HGCalGeomParameters (DD4hep)::loadGeometryHexagonModule called with tags " << sdTag1 << ":" << sdTag2 << " firstLayer " << firstLayer; int ntot1(0), ntot2(0); #endif @@ -999,7 +999,7 @@ void HGCalGeomParameters::loadGeometryHexagonModule(const cms::DDCompactView* cp << "Funny layer # " << lay << " zp " << zside << " in " << nsiz << " components"; } else { if (zvals.find(std::make_pair(lay, zside)) == zvals.end()) { - zvals[std::make_pair(lay, zside)] = HGCalParameters::k_ScaleFromDD4Hep * fv1.translation().Z(); + zvals[std::make_pair(lay, zside)] = HGCalParameters::k_ScaleFromDD4hep * fv1.translation().Z(); #ifdef EDM_ML_DEBUG std::ostringstream st1; st1 << "Name0 " << fv1.name() << " LTop " << levelTop << ":" << lay << " ZSide " << zside << " # of levels " @@ -1046,10 +1046,10 @@ void HGCalGeomParameters::loadGeometryHexagonModule(const cms::DDCompactView* cp auto itr = layers.find(lay); if (itr == layers.end()) { const std::vector& pars = fv2.parameters(); - double rin = HGCalParameters::k_ScaleFromDD4Hep * pars[0]; + double rin = HGCalParameters::k_ScaleFromDD4hep * pars[0]; double rout = (php.firstMixedLayer_ > 0 && lay >= php.firstMixedLayer_) ? php.radiusMixBoundary_[lay - php.firstMixedLayer_] - : HGCalParameters::k_ScaleFromDD4Hep * pars[1]; + : HGCalParameters::k_ScaleFromDD4hep * pars[1]; double zp = zvals[std::make_pair(lay, 1)]; HGCalGeomParameters::layerParameters laypar(rin, rout, zp); layers[lay] = laypar; @@ -1071,10 +1071,10 @@ void HGCalGeomParameters::loadGeometryHexagonModule(const cms::DDCompactView* cp const CLHEP::HepRotation hr(rotation); double xx = ((std::abs(fv2.translation().X()) < tolerance) ? 0 - : HGCalParameters::k_ScaleFromDD4Hep * fv2.translation().X()); + : HGCalParameters::k_ScaleFromDD4hep * fv2.translation().X()); double yy = ((std::abs(fv2.translation().Y()) < tolerance) ? 0 - : HGCalParameters::k_ScaleFromDD4Hep * fv2.translation().Y()); + : HGCalParameters::k_ScaleFromDD4hep * fv2.translation().Y()); const CLHEP::Hep3Vector h3v(xx, yy, zvals[std::make_pair(lay, zside)]); HGCalParameters::hgtrform mytrf; mytrf.zp = zside; @@ -1202,9 +1202,9 @@ void HGCalGeomParameters::loadSpecParsHexagon(const cms::DDFilteredView& fv, const std::string& sdTag3, const std::string& sdTag4) { php.boundR_ = fv.get >(sdTag4, "RadiusBound"); - rescale(php.boundR_, HGCalParameters::k_ScaleFromDD4Hep); + rescale(php.boundR_, HGCalParameters::k_ScaleFromDD4hep); php.rLimit_ = fv.get >(sdTag4, "RadiusLimits"); - rescale(php.rLimit_, HGCalParameters::k_ScaleFromDD4Hep); + rescale(php.rLimit_, HGCalParameters::k_ScaleFromDD4hep); php.levelT_ = dbl_to_int(fv.get >(sdTag4, "LevelTop")); // Grouping of layers @@ -1217,11 +1217,11 @@ void HGCalGeomParameters::loadSpecParsHexagon(const cms::DDFilteredView& fv, // Wafer size const auto& dummy = fv.get >(sdTag2, "WaferSize"); - waferSize_ = dummy[0] * HGCalParameters::k_ScaleFromDD4HepToG4; + waferSize_ = dummy[0] * HGCalParameters::k_ScaleFromDD4hepToG4; // Cell size php.cellSize_ = fv.get >(sdTag3, "CellSize"); - rescale(php.cellSize_, HGCalParameters::k_ScaleFromDD4HepToG4); + rescale(php.cellSize_, HGCalParameters::k_ScaleFromDD4hepToG4); loadSpecParsHexagon(php); } @@ -1317,10 +1317,10 @@ void HGCalGeomParameters::loadSpecParsHexagon8(const cms::DDFilteredView& fv, HGCalParameters& php, const std::string& sdTag1) { php.cellThickness_ = fv.get >(sdTag1, "CellThickness"); - rescale(php.cellThickness_, HGCalParameters::k_ScaleFromDD4Hep); + rescale(php.cellThickness_, HGCalParameters::k_ScaleFromDD4hep); if (php.mode_ == HGCalGeometryMode::Hexagon8Module) { php.waferThickness_ = fv.get >(sdTag1, "WaferThickness"); - rescale(php.waferThickness_, HGCalParameters::k_ScaleFromDD4Hep); + rescale(php.waferThickness_, HGCalParameters::k_ScaleFromDD4hep); } else { for (unsigned int k = 0; k < php.cellThickness_.size(); ++k) php.waferThickness_.emplace_back(php.waferThick_); @@ -1334,22 +1334,22 @@ void HGCalGeomParameters::loadSpecParsHexagon8(const cms::DDFilteredView& fv, php.choiceType_ = static_cast(dummy[0]); php.nCornerCut_ = static_cast(dummy[1]); php.fracAreaMin_ = dummy[2]; - php.zMinForRad_ = HGCalParameters::k_ScaleFromDD4Hep * dummy[3]; + php.zMinForRad_ = HGCalParameters::k_ScaleFromDD4hep * dummy[3]; } else { php.choiceType_ = php.nCornerCut_ = php.fracAreaMin_ = php.zMinForRad_ = 0; } php.slopeMin_ = fv.get >(sdTag1, "SlopeBottom"); php.zFrontMin_ = fv.get >(sdTag1, "ZFrontBottom"); - rescale(php.zFrontMin_, HGCalParameters::k_ScaleFromDD4Hep); + rescale(php.zFrontMin_, HGCalParameters::k_ScaleFromDD4hep); php.rMinFront_ = fv.get >(sdTag1, "RMinFront"); - rescale(php.rMinFront_, HGCalParameters::k_ScaleFromDD4Hep); + rescale(php.rMinFront_, HGCalParameters::k_ScaleFromDD4hep); php.slopeTop_ = fv.get >(sdTag1, "SlopeTop"); php.zFrontTop_ = fv.get >(sdTag1, "ZFrontTop"); - rescale(php.zFrontTop_, HGCalParameters::k_ScaleFromDD4Hep); + rescale(php.zFrontTop_, HGCalParameters::k_ScaleFromDD4hep); php.rMaxFront_ = fv.get >(sdTag1, "RMaxFront"); - rescale(php.rMaxFront_, HGCalParameters::k_ScaleFromDD4Hep); + rescale(php.rMaxFront_, HGCalParameters::k_ScaleFromDD4hep); unsigned int kmax = (php.zFrontTop_.size() - php.slopeTop_.size()); for (unsigned int k = 0; k < kmax; ++k) php.slopeTop_.emplace_back(0); @@ -1364,10 +1364,10 @@ void HGCalGeomParameters::loadSpecParsHexagon8(const cms::DDFilteredView& fv, for (auto const& it : vmap) { if (dd4hep::dd::compareEqual(dd4hep::dd::noNamespace(it.first), "RadiusMixBoundary")) { for (const auto& i : it.second) - php.radiusMixBoundary_.emplace_back(HGCalParameters::k_ScaleFromDD4Hep * i); + php.radiusMixBoundary_.emplace_back(HGCalParameters::k_ScaleFromDD4hep * i); } else if (dd4hep::dd::compareEqual(dd4hep::dd::noNamespace(it.first), "ZRanges")) { for (const auto& i : it.second) - php.zRanges_.emplace_back(HGCalParameters::k_ScaleFromDD4Hep * i); + php.zRanges_.emplace_back(HGCalParameters::k_ScaleFromDD4hep * i); } else if (dd4hep::dd::compareEqual(dd4hep::dd::noNamespace(it.first), "LayerCenter")) { for (const auto& i : it.second) php.layerCenter_.emplace_back(std::round(i)); @@ -1575,10 +1575,10 @@ void HGCalGeomParameters::loadSpecParsTrapezoid(const cms::DDFilteredView& fv, for (auto const& it : vmap) { if (dd4hep::dd::compareEqual(dd4hep::dd::noNamespace(it.first), "RadiusMixBoundary")) { for (const auto& i : it.second) - php.radiusMixBoundary_.emplace_back(HGCalParameters::k_ScaleFromDD4Hep * i); + php.radiusMixBoundary_.emplace_back(HGCalParameters::k_ScaleFromDD4hep * i); } else if (dd4hep::dd::compareEqual(dd4hep::dd::noNamespace(it.first), "ZRanges")) { for (const auto& i : it.second) - php.zRanges_.emplace_back(HGCalParameters::k_ScaleFromDD4Hep * i); + php.zRanges_.emplace_back(HGCalParameters::k_ScaleFromDD4hep * i); } else if (dd4hep::dd::compareEqual(dd4hep::dd::noNamespace(it.first), "LayerCenter")) { for (const auto& i : it.second) php.layerCenter_.emplace_back(std::round(i)); @@ -1588,7 +1588,7 @@ void HGCalGeomParameters::loadSpecParsTrapezoid(const cms::DDFilteredView& fv, php.nPhiBinBH_ = dbl_to_int(fv.get >(sdTag1, "NPhiBinBH")); php.layerFrontBH_ = dbl_to_int(fv.get >(sdTag1, "LayerFrontBH")); php.rMinLayerBH_ = fv.get >(sdTag1, "RMinLayerBH"); - rescale(php.rMinLayerBH_, HGCalParameters::k_ScaleFromDD4Hep); + rescale(php.rMinLayerBH_, HGCalParameters::k_ScaleFromDD4hep); php.nCellsFine_ = php.nPhiBinBH_[0]; php.nCellsCoarse_ = php.nPhiBinBH_[1]; php.cellSize_.emplace_back(2.0 * M_PI / php.nCellsFine_); @@ -1596,15 +1596,15 @@ void HGCalGeomParameters::loadSpecParsTrapezoid(const cms::DDFilteredView& fv, php.slopeMin_ = fv.get >(sdTag1, "SlopeBottom"); php.zFrontMin_ = fv.get >(sdTag1, "ZFrontBottom"); - rescale(php.zFrontMin_, HGCalParameters::k_ScaleFromDD4Hep); + rescale(php.zFrontMin_, HGCalParameters::k_ScaleFromDD4hep); php.rMinFront_ = fv.get >(sdTag1, "RMinFront"); - rescale(php.rMinFront_, HGCalParameters::k_ScaleFromDD4Hep); + rescale(php.rMinFront_, HGCalParameters::k_ScaleFromDD4hep); php.slopeTop_ = fv.get >(sdTag1, "SlopeTop"); php.zFrontTop_ = fv.get >(sdTag1, "ZFrontTop"); - rescale(php.zFrontTop_, HGCalParameters::k_ScaleFromDD4Hep); + rescale(php.zFrontTop_, HGCalParameters::k_ScaleFromDD4hep); php.rMaxFront_ = fv.get >(sdTag1, "RMaxFront"); - rescale(php.rMaxFront_, HGCalParameters::k_ScaleFromDD4Hep); + rescale(php.rMaxFront_, HGCalParameters::k_ScaleFromDD4hep); unsigned int kmax = (php.zFrontTop_.size() - php.slopeTop_.size()); for (unsigned int k = 0; k < kmax; ++k) php.slopeTop_.emplace_back(0); @@ -1641,10 +1641,10 @@ void HGCalGeomParameters::loadSpecParsTrapezoid(const cms::DDFilteredView& fv, tileHEX4.emplace_back(std::round(i)); } else if (dd4hep::dd::compareEqual(dd4hep::dd::noNamespace(it.first), "TileRMin")) { for (const auto& i : it.second) - tileRMin.emplace_back(HGCalParameters::k_ScaleFromDD4Hep * i); + tileRMin.emplace_back(HGCalParameters::k_ScaleFromDD4hep * i); } else if (dd4hep::dd::compareEqual(dd4hep::dd::noNamespace(it.first), "TileRMax")) { for (const auto& i : it.second) - tileRMax.emplace_back(HGCalParameters::k_ScaleFromDD4Hep * i); + tileRMax.emplace_back(HGCalParameters::k_ScaleFromDD4hep * i); } else if (dd4hep::dd::compareEqual(dd4hep::dd::noNamespace(it.first), "TileRingMin")) { for (const auto& i : it.second) tileRingMin.emplace_back(std::round(i)); diff --git a/Geometry/HGCalCommonData/src/HGCalParametersFromDD.cc b/Geometry/HGCalCommonData/src/HGCalParametersFromDD.cc index 1184800cd27f4..baa9ef1de4ec0 100644 --- a/Geometry/HGCalCommonData/src/HGCalParametersFromDD.cc +++ b/Geometry/HGCalCommonData/src/HGCalParametersFromDD.cc @@ -258,7 +258,7 @@ bool HGCalParametersFromDD::build(const cms::DDCompactView* cpv, const std::string& namet, const std::string& name2) { #ifdef EDM_ML_DEBUG - edm::LogVerbatim("HGCalGeom") << "HGCalParametersFromDD (DD4Hep)::build called with " + edm::LogVerbatim("HGCalGeom") << "HGCalParametersFromDD (DD4hep)::build called with " << "names " << name << ":" << namew << ":" << namec << ":" << namet << ":" << name2; #endif cms::DDVectorsMap vmap = cpv->detector()->vectors(); @@ -337,13 +337,13 @@ bool HGCalParametersFromDD::build(const cms::DDCompactView* cpv, tempD = fv.get >(namet, "NumberOfCellsCoarse"); php.nCellsCoarse_ = static_cast(tempD[0]); tempD = fv.get >(namet, "WaferSize"); - php.waferSize_ = HGCalParameters::k_ScaleFromDD4Hep * tempD[0]; + php.waferSize_ = HGCalParameters::k_ScaleFromDD4hep * tempD[0]; tempD = fv.get >(namet, "WaferThickness"); - php.waferThick_ = HGCalParameters::k_ScaleFromDD4Hep * tempD[0]; + php.waferThick_ = HGCalParameters::k_ScaleFromDD4hep * tempD[0]; tempD = fv.get >(namet, "SensorSeparation"); - php.sensorSeparation_ = HGCalParameters::k_ScaleFromDD4Hep * tempD[0]; + php.sensorSeparation_ = HGCalParameters::k_ScaleFromDD4hep * tempD[0]; tempD = fv.get >(namet, "MouseBite"); - php.mouseBite_ = HGCalParameters::k_ScaleFromDD4Hep * tempD[0]; + php.mouseBite_ = HGCalParameters::k_ScaleFromDD4hep * tempD[0]; php.waferR_ = HGCalParameters::k_ScaleToDDD * php.waferSize_ * tan30deg_; php.cellSize_.emplace_back(HGCalParameters::k_ScaleToDDD * php.waferSize_ / php.nCellsFine_); php.cellSize_.emplace_back(HGCalParameters::k_ScaleToDDD * php.waferSize_ / php.nCellsCoarse_); @@ -421,9 +421,9 @@ bool HGCalParametersFromDD::build(const cms::DDCompactView* cpv, tempD = fv.get >(name, "DetectorType"); php.detectorType_ = static_cast(tempD[0]); tempD = fv.get >(name, "WaferThickness"); - php.waferThick_ = HGCalParameters::k_ScaleFromDD4Hep * tempD[0]; + php.waferThick_ = HGCalParameters::k_ScaleFromDD4hep * tempD[0]; tempD = fv.get >(name, "MinimumTileSize"); - php.minTileSize_ = HGCalParameters::k_ScaleFromDD4Hep * tempD[0]; + php.minTileSize_ = HGCalParameters::k_ScaleFromDD4hep * tempD[0]; php.waferSize_ = php.waferR_ = 0; php.sensorSeparation_ = php.mouseBite_ = 0; tempD = fv.get >(name, "WaferMaskMode"); diff --git a/Geometry/HGCalCommonData/test/python/dumpAHcalModuleDD4Hep_cfg.py b/Geometry/HGCalCommonData/test/python/dumpAHcalModuleDD4Hep_cfg.py index 2016cf6a095b1..66b691cda85a9 100644 --- a/Geometry/HGCalCommonData/test/python/dumpAHcalModuleDD4Hep_cfg.py +++ b/Geometry/HGCalCommonData/test/python/dumpAHcalModuleDD4Hep_cfg.py @@ -18,7 +18,7 @@ ) process.testDump = cms.EDAnalyzer("DDTestDumpFile", - outputFileName = cms.untracked.string('ahcalModuleDD4Hep.root'), + outputFileName = cms.untracked.string('ahcalModuleDD4hep.root'), DDDetector = cms.ESInputTag('','DDAHcalModuleAlgo') ) diff --git a/Geometry/HGCalCommonData/test/python/dumpExtendedHGCalGeometryDD4Hep_cfg.py b/Geometry/HGCalCommonData/test/python/dumpExtendedHGCalGeometryDD4Hep_cfg.py index 05094f8646864..e91967b0b759d 100644 --- a/Geometry/HGCalCommonData/test/python/dumpExtendedHGCalGeometryDD4Hep_cfg.py +++ b/Geometry/HGCalCommonData/test/python/dumpExtendedHGCalGeometryDD4Hep_cfg.py @@ -18,7 +18,7 @@ ) process.testDump = cms.EDAnalyzer("DDTestDumpFile", - outputFileName = cms.untracked.string('CMS2026D46DD4Hep.root'), + outputFileName = cms.untracked.string('CMS2026D46DD4hep.root'), DDDetector = cms.ESInputTag('','DDHGCal') ) diff --git a/Geometry/HGCalCommonData/test/python/dumpHGCalCellDD4Hep_cfg.py b/Geometry/HGCalCommonData/test/python/dumpHGCalCellDD4Hep_cfg.py index dcf3a1f464dcb..8988bab3e2873 100644 --- a/Geometry/HGCalCommonData/test/python/dumpHGCalCellDD4Hep_cfg.py +++ b/Geometry/HGCalCommonData/test/python/dumpHGCalCellDD4Hep_cfg.py @@ -18,7 +18,7 @@ ) process.testDump = cms.EDAnalyzer("DDTestDumpFile", - outputFileName = cms.untracked.string('hgcalcellDD4Hep.root'), + outputFileName = cms.untracked.string('hgcalcellDD4hep.root'), DDDetector = cms.ESInputTag('','DDHGCalCell') ) diff --git a/Geometry/HGCalCommonData/test/python/dumpHGCalEEDD4Hep_cfg.py b/Geometry/HGCalCommonData/test/python/dumpHGCalEEDD4Hep_cfg.py index 5eb3d88d6e9bb..d391a6659bd09 100644 --- a/Geometry/HGCalCommonData/test/python/dumpHGCalEEDD4Hep_cfg.py +++ b/Geometry/HGCalCommonData/test/python/dumpHGCalEEDD4Hep_cfg.py @@ -18,7 +18,7 @@ ) process.testDump = cms.EDAnalyzer("DDTestDumpFile", - outputFileName = cms.untracked.string('hgcalEEDD4Hep.root'), + outputFileName = cms.untracked.string('hgcalEEDD4hep.root'), DDDetector = cms.ESInputTag('','DDHGCalEE') ) diff --git a/Geometry/HGCalCommonData/test/python/dumpHGCalEEFileDD4Hep_cfg.py b/Geometry/HGCalCommonData/test/python/dumpHGCalEEFileDD4Hep_cfg.py index 8173beab93f31..485117e6fdff6 100644 --- a/Geometry/HGCalCommonData/test/python/dumpHGCalEEFileDD4Hep_cfg.py +++ b/Geometry/HGCalCommonData/test/python/dumpHGCalEEFileDD4Hep_cfg.py @@ -18,7 +18,7 @@ ) process.testDump = cms.EDAnalyzer("DDTestDumpFile", - outputFileName = cms.untracked.string('hgcalEEDD4Hep.root'), + outputFileName = cms.untracked.string('hgcalEEDD4hep.root'), DDDetector = cms.ESInputTag('','DDHGCalEE') ) diff --git a/Geometry/HGCalCommonData/test/python/dumpHGCalEEV15DD4Hep_cfg.py b/Geometry/HGCalCommonData/test/python/dumpHGCalEEV15DD4Hep_cfg.py index 4237f46370ff0..8b866f0754d56 100644 --- a/Geometry/HGCalCommonData/test/python/dumpHGCalEEV15DD4Hep_cfg.py +++ b/Geometry/HGCalCommonData/test/python/dumpHGCalEEV15DD4Hep_cfg.py @@ -18,7 +18,7 @@ ) process.testDump = cms.EDAnalyzer("DDTestDumpFile", - outputFileName = cms.untracked.string('hgcalEEV15DD4Hep.root'), + outputFileName = cms.untracked.string('hgcalEEV15DD4hep.root'), DDDetector = cms.ESInputTag('','DDHGCalEE') ) diff --git a/Geometry/HGCalCommonData/test/python/dumpHGCalEEV16DD4Hep_cfg.py b/Geometry/HGCalCommonData/test/python/dumpHGCalEEV16DD4Hep_cfg.py index feaaae5c3f3a3..34868ece44155 100644 --- a/Geometry/HGCalCommonData/test/python/dumpHGCalEEV16DD4Hep_cfg.py +++ b/Geometry/HGCalCommonData/test/python/dumpHGCalEEV16DD4Hep_cfg.py @@ -18,7 +18,7 @@ ) process.testDump = cms.EDAnalyzer("DDTestDumpFile", - outputFileName = cms.untracked.string('hgcalEEV16DD4Hep.root'), + outputFileName = cms.untracked.string('hgcalEEV16DD4hep.root'), DDDetector = cms.ESInputTag('','DDHGCalEE') ) diff --git a/Geometry/HGCalCommonData/test/python/dumpHGCalGeometryDD4Hep_cfg.py b/Geometry/HGCalCommonData/test/python/dumpHGCalGeometryDD4Hep_cfg.py index cfa1262aa6dbe..d6347af8141eb 100644 --- a/Geometry/HGCalCommonData/test/python/dumpHGCalGeometryDD4Hep_cfg.py +++ b/Geometry/HGCalCommonData/test/python/dumpHGCalGeometryDD4Hep_cfg.py @@ -18,7 +18,7 @@ ) process.testDump = cms.EDAnalyzer("DDTestDumpFile", - outputFileName = cms.untracked.string('HGCalDD4Hep.root'), + outputFileName = cms.untracked.string('HGCalDD4hep.root'), DDDetector = cms.ESInputTag('','DDHGCal') ) diff --git a/Geometry/HGCalCommonData/test/python/dumpHGCalHEmixDD4Hep_cfg.py b/Geometry/HGCalCommonData/test/python/dumpHGCalHEmixDD4Hep_cfg.py index 31eb60f0ce8f9..e5249418a3a6a 100644 --- a/Geometry/HGCalCommonData/test/python/dumpHGCalHEmixDD4Hep_cfg.py +++ b/Geometry/HGCalCommonData/test/python/dumpHGCalHEmixDD4Hep_cfg.py @@ -18,7 +18,7 @@ ) process.testDump = cms.EDAnalyzer("DDTestDumpFile", - outputFileName = cms.untracked.string('hgcalHEmixDD4Hep.root'), + outputFileName = cms.untracked.string('hgcalHEmixDD4hep.root'), DDDetector = cms.ESInputTag('','DDHGCalHEmix') ) diff --git a/Geometry/HGCalCommonData/test/python/dumpHGCalHEmixFileDD4Hep_cfg.py b/Geometry/HGCalCommonData/test/python/dumpHGCalHEmixFileDD4Hep_cfg.py index 420e921d7da6f..1bbe70cc82145 100644 --- a/Geometry/HGCalCommonData/test/python/dumpHGCalHEmixFileDD4Hep_cfg.py +++ b/Geometry/HGCalCommonData/test/python/dumpHGCalHEmixFileDD4Hep_cfg.py @@ -18,7 +18,7 @@ ) process.testDump = cms.EDAnalyzer("DDTestDumpFile", - outputFileName = cms.untracked.string('hgcalHEmixDD4Hep.root'), + outputFileName = cms.untracked.string('hgcalHEmixDD4hep.root'), DDDetector = cms.ESInputTag('','DDHGCalHEmix') ) diff --git a/Geometry/HGCalCommonData/test/python/dumpHGCalHEmixV15DD4Hep_cfg.py b/Geometry/HGCalCommonData/test/python/dumpHGCalHEmixV15DD4Hep_cfg.py index 43d5852ddd11b..11713e0d267cf 100644 --- a/Geometry/HGCalCommonData/test/python/dumpHGCalHEmixV15DD4Hep_cfg.py +++ b/Geometry/HGCalCommonData/test/python/dumpHGCalHEmixV15DD4Hep_cfg.py @@ -18,7 +18,7 @@ ) process.testDump = cms.EDAnalyzer("DDTestDumpFile", - outputFileName = cms.untracked.string('hgcalHEmixV15DD4Hep.root'), + outputFileName = cms.untracked.string('hgcalHEmixV15DD4hep.root'), DDDetector = cms.ESInputTag('','DDHGCalHEmix') ) diff --git a/Geometry/HGCalCommonData/test/python/dumpHGCalHEmixV16DD4Hep_cfg.py b/Geometry/HGCalCommonData/test/python/dumpHGCalHEmixV16DD4Hep_cfg.py index 27732c75124d0..98a99f46b6b44 100644 --- a/Geometry/HGCalCommonData/test/python/dumpHGCalHEmixV16DD4Hep_cfg.py +++ b/Geometry/HGCalCommonData/test/python/dumpHGCalHEmixV16DD4Hep_cfg.py @@ -18,7 +18,7 @@ ) process.testDump = cms.EDAnalyzer("DDTestDumpFile", - outputFileName = cms.untracked.string('hgcalHEmixV16DD4Hep.root'), + outputFileName = cms.untracked.string('hgcalHEmixV16DD4hep.root'), DDDetector = cms.ESInputTag('','DDHGCalHEmix') ) diff --git a/Geometry/HGCalCommonData/test/python/dumpHGCalHEsilDD4Hep_cfg.py b/Geometry/HGCalCommonData/test/python/dumpHGCalHEsilDD4Hep_cfg.py index ce81051ff531d..0b71de4ef5dff 100644 --- a/Geometry/HGCalCommonData/test/python/dumpHGCalHEsilDD4Hep_cfg.py +++ b/Geometry/HGCalCommonData/test/python/dumpHGCalHEsilDD4Hep_cfg.py @@ -18,7 +18,7 @@ ) process.testDump = cms.EDAnalyzer("DDTestDumpFile", - outputFileName = cms.untracked.string('hgcalHEsilDD4Hep.root'), + outputFileName = cms.untracked.string('hgcalHEsilDD4hep.root'), DDDetector = cms.ESInputTag('','DDHGCalHEsil') ) diff --git a/Geometry/HGCalCommonData/test/python/dumpHGCalHEsilV15DD4Hep_cfg.py b/Geometry/HGCalCommonData/test/python/dumpHGCalHEsilV15DD4Hep_cfg.py index b2cf432736377..d9351b17d5ed5 100644 --- a/Geometry/HGCalCommonData/test/python/dumpHGCalHEsilV15DD4Hep_cfg.py +++ b/Geometry/HGCalCommonData/test/python/dumpHGCalHEsilV15DD4Hep_cfg.py @@ -18,7 +18,7 @@ ) process.testDump = cms.EDAnalyzer("DDTestDumpFile", - outputFileName = cms.untracked.string('hgcalHEsilV15DD4Hep.root'), + outputFileName = cms.untracked.string('hgcalHEsilV15DD4hep.root'), DDDetector = cms.ESInputTag('','DDHGCalHEsilV15') ) diff --git a/Geometry/HGCalCommonData/test/python/dumpHGCalHEsilV16DD4Hep_cfg.py b/Geometry/HGCalCommonData/test/python/dumpHGCalHEsilV16DD4Hep_cfg.py index 1f6dcb016cc53..b12cf78f902dc 100644 --- a/Geometry/HGCalCommonData/test/python/dumpHGCalHEsilV16DD4Hep_cfg.py +++ b/Geometry/HGCalCommonData/test/python/dumpHGCalHEsilV16DD4Hep_cfg.py @@ -18,7 +18,7 @@ ) process.testDump = cms.EDAnalyzer("DDTestDumpFile", - outputFileName = cms.untracked.string('hgcalHEsilV16DD4Hep.root'), + outputFileName = cms.untracked.string('hgcalHEsilV16DD4hep.root'), DDDetector = cms.ESInputTag('','DDHGCalHEsilV16') ) diff --git a/Geometry/HGCalCommonData/test/python/dumpHGCalModuleAlgoDD4Hep_cfg.py b/Geometry/HGCalCommonData/test/python/dumpHGCalModuleAlgoDD4Hep_cfg.py index 1d6cbc8f63fcd..541743169000e 100644 --- a/Geometry/HGCalCommonData/test/python/dumpHGCalModuleAlgoDD4Hep_cfg.py +++ b/Geometry/HGCalCommonData/test/python/dumpHGCalModuleAlgoDD4Hep_cfg.py @@ -18,7 +18,7 @@ ) process.testDump = cms.EDAnalyzer("DDTestDumpFile", - outputFileName = cms.untracked.string('hgcalModuleAlgoDD4Hep.root'), + outputFileName = cms.untracked.string('hgcalModuleAlgoDD4hep.root'), DDDetector = cms.ESInputTag('','DDHGCalModuleAlgo') ) diff --git a/Geometry/HGCalCommonData/test/python/dumpHGCalModuleDD4Hep_cfg.py b/Geometry/HGCalCommonData/test/python/dumpHGCalModuleDD4Hep_cfg.py index 1fe41c1510a75..f10f7cf1ddf55 100644 --- a/Geometry/HGCalCommonData/test/python/dumpHGCalModuleDD4Hep_cfg.py +++ b/Geometry/HGCalCommonData/test/python/dumpHGCalModuleDD4Hep_cfg.py @@ -18,7 +18,7 @@ ) process.testDump = cms.EDAnalyzer("DDTestDumpFile", - outputFileName = cms.untracked.string('hgcalModuleDD4Hep.root'), + outputFileName = cms.untracked.string('hgcalModuleDD4hep.root'), DDDetector = cms.ESInputTag('','DDHGCalModule') ) diff --git a/Geometry/HGCalCommonData/test/python/dumpHGCalNoTaperEndcapDD4Hep_cfg.py b/Geometry/HGCalCommonData/test/python/dumpHGCalNoTaperEndcapDD4Hep_cfg.py index 2c10049b39846..ff4fca8218576 100644 --- a/Geometry/HGCalCommonData/test/python/dumpHGCalNoTaperEndcapDD4Hep_cfg.py +++ b/Geometry/HGCalCommonData/test/python/dumpHGCalNoTaperEndcapDD4Hep_cfg.py @@ -18,7 +18,7 @@ ) process.testDump = cms.EDAnalyzer("DDTestDumpFile", - outputFileName = cms.untracked.string('NoTaperEndcapDD4Hep.root'), + outputFileName = cms.untracked.string('NoTaperEndcapDD4hep.root'), DDDetector = cms.ESInputTag('','DDHGCalNoTaperEndcap') ) diff --git a/Geometry/HGCalCommonData/test/python/dumpHGCalTBModuleDD4Hep_cfg.py b/Geometry/HGCalCommonData/test/python/dumpHGCalTBModuleDD4Hep_cfg.py index e7e812a7bc18b..8731afae5be7f 100644 --- a/Geometry/HGCalCommonData/test/python/dumpHGCalTBModuleDD4Hep_cfg.py +++ b/Geometry/HGCalCommonData/test/python/dumpHGCalTBModuleDD4Hep_cfg.py @@ -18,7 +18,7 @@ ) process.testDump = cms.EDAnalyzer("DDTestDumpFile", - outputFileName = cms.untracked.string('hgcalTBModuleDD4Hep.root'), + outputFileName = cms.untracked.string('hgcalTBModuleDD4hep.root'), DDDetector = cms.ESInputTag('','DDHGCalTBModule') ) diff --git a/Geometry/HGCalCommonData/test/python/dumpHGCalTBModuleXDD4Hep_cfg.py b/Geometry/HGCalCommonData/test/python/dumpHGCalTBModuleXDD4Hep_cfg.py index 8a2dff75a44a5..10711bc8e5e53 100644 --- a/Geometry/HGCalCommonData/test/python/dumpHGCalTBModuleXDD4Hep_cfg.py +++ b/Geometry/HGCalCommonData/test/python/dumpHGCalTBModuleXDD4Hep_cfg.py @@ -18,7 +18,7 @@ ) process.testDump = cms.EDAnalyzer("DDTestDumpFile", - outputFileName = cms.untracked.string('hgcalTBModuleXDD4Hep.root'), + outputFileName = cms.untracked.string('hgcalTBModuleXDD4hep.root'), DDDetector = cms.ESInputTag('','DDHGCalTBModuleX') ) diff --git a/Geometry/HGCalCommonData/test/python/dumpHGCalWafer8DD4Hep_cfg.py b/Geometry/HGCalCommonData/test/python/dumpHGCalWafer8DD4Hep_cfg.py index d97ce4b4c76a3..9af4870dd9666 100644 --- a/Geometry/HGCalCommonData/test/python/dumpHGCalWafer8DD4Hep_cfg.py +++ b/Geometry/HGCalCommonData/test/python/dumpHGCalWafer8DD4Hep_cfg.py @@ -18,7 +18,7 @@ ) process.testDump = cms.EDAnalyzer("DDTestDumpFile", - outputFileName = cms.untracked.string('hgcalWafer8DD4Hep.root'), + outputFileName = cms.untracked.string('hgcalWafer8DD4hep.root'), DDDetector = cms.ESInputTag('','DDHGCalWafer8') ) diff --git a/Geometry/HGCalCommonData/test/python/dumpHGCalWaferAlgoDD4Hep_cfg.py b/Geometry/HGCalCommonData/test/python/dumpHGCalWaferAlgoDD4Hep_cfg.py index 6936d22d10f21..dba44f0aaccbb 100644 --- a/Geometry/HGCalCommonData/test/python/dumpHGCalWaferAlgoDD4Hep_cfg.py +++ b/Geometry/HGCalCommonData/test/python/dumpHGCalWaferAlgoDD4Hep_cfg.py @@ -18,7 +18,7 @@ ) process.testDump = cms.EDAnalyzer("DDTestDumpFile", - outputFileName = cms.untracked.string('hgcalWaferAlgoDD4Hep.root'), + outputFileName = cms.untracked.string('hgcalWaferAlgoDD4hep.root'), DDDetector = cms.ESInputTag('','DDHGCalWaferAlgo') ) diff --git a/Geometry/HGCalCommonData/test/python/dumpHGCalWaferDD4Hep_cfg.py b/Geometry/HGCalCommonData/test/python/dumpHGCalWaferDD4Hep_cfg.py index 951e493b3772c..8f4844a449544 100644 --- a/Geometry/HGCalCommonData/test/python/dumpHGCalWaferDD4Hep_cfg.py +++ b/Geometry/HGCalCommonData/test/python/dumpHGCalWaferDD4Hep_cfg.py @@ -18,7 +18,7 @@ ) process.testDump = cms.EDAnalyzer("DDTestDumpFile", - outputFileName = cms.untracked.string('hgcalWaferDD4Hep.root'), + outputFileName = cms.untracked.string('hgcalWaferDD4hep.root'), DDDetector = cms.ESInputTag('','DDHGCalWafer') ) diff --git a/Geometry/HGCalCommonData/test/python/dumpHGCalWaferFDD4Hep_cfg.py b/Geometry/HGCalCommonData/test/python/dumpHGCalWaferFDD4Hep_cfg.py index 0109e530faa82..c036bac3ff97b 100644 --- a/Geometry/HGCalCommonData/test/python/dumpHGCalWaferFDD4Hep_cfg.py +++ b/Geometry/HGCalCommonData/test/python/dumpHGCalWaferFDD4Hep_cfg.py @@ -18,7 +18,7 @@ ) process.testDump = cms.EDAnalyzer("DDTestDumpFile", - outputFileName = cms.untracked.string('hgcalWaferFDD4Hep.root'), + outputFileName = cms.untracked.string('hgcalWaferFDD4hep.root'), DDDetector = cms.ESInputTag('','DDHGCalWaferF') ) diff --git a/Geometry/HGCalCommonData/test/python/dumpHGCalWaferPDD4Hep_cfg.py b/Geometry/HGCalCommonData/test/python/dumpHGCalWaferPDD4Hep_cfg.py index b2a2c0f5c6466..d7ed3621b147e 100644 --- a/Geometry/HGCalCommonData/test/python/dumpHGCalWaferPDD4Hep_cfg.py +++ b/Geometry/HGCalCommonData/test/python/dumpHGCalWaferPDD4Hep_cfg.py @@ -18,7 +18,7 @@ ) process.testDump = cms.EDAnalyzer("DDTestDumpFile", - outputFileName = cms.untracked.string('hgcalWaferPDD4Hep.root'), + outputFileName = cms.untracked.string('hgcalWaferPDD4hep.root'), DDDetector = cms.ESInputTag('','DDHGCalWaferP') ) diff --git a/Geometry/HGCalCommonData/test/python/testHGCalParametersV16DD4Hep_cfg.py b/Geometry/HGCalCommonData/test/python/testHGCalParametersV16DD4Hep_cfg.py index 44cbf451edfc8..d8b3fa9ac2231 100644 --- a/Geometry/HGCalCommonData/test/python/testHGCalParametersV16DD4Hep_cfg.py +++ b/Geometry/HGCalCommonData/test/python/testHGCalParametersV16DD4Hep_cfg.py @@ -42,9 +42,9 @@ firstRun = cms.untracked.uint32(1) ) -process.hgcalEEParametersInitialize.fromDD4Hep = cms.bool(True) -process.hgcalHESiParametersInitialize.fromDD4Hep = cms.bool(True) -process.hgcalHEScParametersInitialize.fromDD4Hep = cms.bool(True) +process.hgcalEEParametersInitialize.fromDD4hep = cms.bool(True) +process.hgcalHESiParametersInitialize.fromDD4hep = cms.bool(True) +process.hgcalHEScParametersInitialize.fromDD4hep = cms.bool(True) process.load("Geometry.HGCalCommonData.hgcParameterTesterEE_cfi") diff --git a/Geometry/HGCalCommonData/test/python/testHGCalTBParametersDD4Hep_cfg.py b/Geometry/HGCalCommonData/test/python/testHGCalTBParametersDD4Hep_cfg.py index c8ac6d6ad5d48..065151859f5ce 100644 --- a/Geometry/HGCalCommonData/test/python/testHGCalTBParametersDD4Hep_cfg.py +++ b/Geometry/HGCalCommonData/test/python/testHGCalTBParametersDD4Hep_cfg.py @@ -41,9 +41,9 @@ firstRun = cms.untracked.uint32(1) ) -process.hgcalEEParametersInitialize.fromDD4Hep = cms.bool(True) -process.hgcalHESiParametersInitialize.fromDD4Hep = cms.bool(True) -process.hgcalHEScParametersInitialize.fromDD4Hep = cms.bool(True) +process.hgcalEEParametersInitialize.fromDD4hep = cms.bool(True) +process.hgcalHESiParametersInitialize.fromDD4hep = cms.bool(True) +process.hgcalHEScParametersInitialize.fromDD4hep = cms.bool(True) process.load("Geometry.HGCalCommonData.hgcParameterTesterEE_cfi") process.hgcParameterTesterEE.Mode = 0 diff --git a/Geometry/HcalAlgo/test/python/testForwardShield_cfg.py b/Geometry/HcalAlgo/test/python/testForwardShield_cfg.py index 231d442ea62fc..152bdd78948b0 100644 --- a/Geometry/HcalAlgo/test/python/testForwardShield_cfg.py +++ b/Geometry/HcalAlgo/test/python/testForwardShield_cfg.py @@ -18,7 +18,7 @@ ) process.testDump = cms.EDAnalyzer("DDTestDumpFile", - outputFileName = cms.untracked.string('forwardShieldDD4Hep.root'), + outputFileName = cms.untracked.string('forwardShieldDD4hep.root'), DDDetector = cms.ESInputTag('','DDHCalFibreBundle') ) diff --git a/Geometry/HcalAlgo/test/python/testHBGeom_cfg.py b/Geometry/HcalAlgo/test/python/testHBGeom_cfg.py index 6a09066f84c36..c8794090c3a3c 100644 --- a/Geometry/HcalAlgo/test/python/testHBGeom_cfg.py +++ b/Geometry/HcalAlgo/test/python/testHBGeom_cfg.py @@ -18,7 +18,7 @@ ) process.testDump = cms.EDAnalyzer("DDTestDumpFile", - outputFileName = cms.untracked.string('hbDD4Hep.root'), + outputFileName = cms.untracked.string('hbDD4hep.root'), DDDetector = cms.ESInputTag('','DDHCalHB') ) diff --git a/Geometry/HcalAlgo/test/python/testHEPhase0Geom_cfg.py b/Geometry/HcalAlgo/test/python/testHEPhase0Geom_cfg.py index 68b40b225ebf3..160ad5e36f6f2 100644 --- a/Geometry/HcalAlgo/test/python/testHEPhase0Geom_cfg.py +++ b/Geometry/HcalAlgo/test/python/testHEPhase0Geom_cfg.py @@ -18,7 +18,7 @@ ) process.testDump = cms.EDAnalyzer("DDTestDumpFile", - outputFileName = cms.untracked.string('hePhase0DD4Hep.root'), + outputFileName = cms.untracked.string('hePhase0DD4hep.root'), DDDetector = cms.ESInputTag('','DDHCalHEPhase0') ) diff --git a/Geometry/HcalAlgo/test/python/testHEPhase1Geom_cfg.py b/Geometry/HcalAlgo/test/python/testHEPhase1Geom_cfg.py index ebbaad4abbd78..0f97fad7287b7 100644 --- a/Geometry/HcalAlgo/test/python/testHEPhase1Geom_cfg.py +++ b/Geometry/HcalAlgo/test/python/testHEPhase1Geom_cfg.py @@ -18,7 +18,7 @@ ) process.testDump = cms.EDAnalyzer("DDTestDumpFile", - outputFileName = cms.untracked.string('hePhase1DD4Hep.root'), + outputFileName = cms.untracked.string('hePhase1DD4hep.root'), DDDetector = cms.ESInputTag('','DDHCalHEPhase1') ) diff --git a/Geometry/HcalAlgo/test/python/testHFGeom_cfg.py b/Geometry/HcalAlgo/test/python/testHFGeom_cfg.py index 0caeb30a25558..1dc7d74c84169 100644 --- a/Geometry/HcalAlgo/test/python/testHFGeom_cfg.py +++ b/Geometry/HcalAlgo/test/python/testHFGeom_cfg.py @@ -18,7 +18,7 @@ ) process.testDump = cms.EDAnalyzer("DDTestDumpFile", - outputFileName = cms.untracked.string('hfDD4Hep.root'), + outputFileName = cms.untracked.string('hfDD4hep.root'), DDDetector = cms.ESInputTag('','DDHCalHF') ) diff --git a/Geometry/HcalAlgo/test/python/testHOGeom_cfg.py b/Geometry/HcalAlgo/test/python/testHOGeom_cfg.py index 747827472af31..42b60b32936ea 100644 --- a/Geometry/HcalAlgo/test/python/testHOGeom_cfg.py +++ b/Geometry/HcalAlgo/test/python/testHOGeom_cfg.py @@ -18,7 +18,7 @@ ) process.testDump = cms.EDAnalyzer("DDTestDumpFile", - outputFileName = cms.untracked.string('hoDD4Hep.root'), + outputFileName = cms.untracked.string('hoDD4hep.root'), DDDetector = cms.ESInputTag('','DDHCalHO') ) diff --git a/Geometry/HcalAlgo/test/python/testHcalXtal_cfg.py b/Geometry/HcalAlgo/test/python/testHcalXtal_cfg.py index 8520a7952e95c..423aa8714f90f 100644 --- a/Geometry/HcalAlgo/test/python/testHcalXtal_cfg.py +++ b/Geometry/HcalAlgo/test/python/testHcalXtal_cfg.py @@ -18,7 +18,7 @@ ) process.testDump = cms.EDAnalyzer("DDTestDumpFile", - outputFileName = cms.untracked.string('hcalXtalDD4Hep.root'), + outputFileName = cms.untracked.string('hcalXtalDD4hep.root'), DDDetector = cms.ESInputTag('','DDHCalXtalAlgo') ) diff --git a/Geometry/HcalAlgo/test/python/testTBCable_cfg.py b/Geometry/HcalAlgo/test/python/testTBCable_cfg.py index d21ccd084cca5..f5ad735a41e43 100644 --- a/Geometry/HcalAlgo/test/python/testTBCable_cfg.py +++ b/Geometry/HcalAlgo/test/python/testTBCable_cfg.py @@ -18,7 +18,7 @@ ) process.testDump = cms.EDAnalyzer("DDTestDumpFile", - outputFileName = cms.untracked.string('tbCableDD4Hep.root'), + outputFileName = cms.untracked.string('tbCableDD4hep.root'), DDDetector = cms.ESInputTag('','DDHCalTBCable') ) diff --git a/Geometry/HcalAlgo/test/python/testTBHOGeom_cfg.py b/Geometry/HcalAlgo/test/python/testTBHOGeom_cfg.py index 8545dcdb12499..c68a9c60be1f6 100644 --- a/Geometry/HcalAlgo/test/python/testTBHOGeom_cfg.py +++ b/Geometry/HcalAlgo/test/python/testTBHOGeom_cfg.py @@ -18,7 +18,7 @@ ) process.testDump = cms.EDAnalyzer("DDTestDumpFile", - outputFileName = cms.untracked.string('tbHODD4Hep.root'), + outputFileName = cms.untracked.string('tbHODD4hep.root'), DDDetector = cms.ESInputTag('','DDHCalTBHO') ) diff --git a/Geometry/HcalAlgo/test/python/testTestBeam_cfg.py b/Geometry/HcalAlgo/test/python/testTestBeam_cfg.py index 4e5d6124eb476..4ab9cd5a7a6d8 100644 --- a/Geometry/HcalAlgo/test/python/testTestBeam_cfg.py +++ b/Geometry/HcalAlgo/test/python/testTestBeam_cfg.py @@ -18,7 +18,7 @@ ) process.testDump = cms.EDAnalyzer("DDTestDumpFile", - outputFileName = cms.untracked.string('testBeamDD4Hep.root'), + outputFileName = cms.untracked.string('testBeamDD4hep.root'), DDDetector = cms.ESInputTag('','DDHCalTestBeam') ) diff --git a/Geometry/HcalCommonData/interface/HcalGeomParameters.h b/Geometry/HcalCommonData/interface/HcalGeomParameters.h index 912486a1ea59f..0b1f4f0a04d63 100644 --- a/Geometry/HcalCommonData/interface/HcalGeomParameters.h +++ b/Geometry/HcalCommonData/interface/HcalGeomParameters.h @@ -30,10 +30,10 @@ class HcalGeomParameters { static constexpr double k_ScaleToDDD = 10.0; static constexpr double k_ScaleFromDDDToG4 = 1.0; static constexpr double k_ScaleToDDDFromG4 = 1.0; - static constexpr double k_ScaleFromDD4Hep = (1.0 / dd4hep::cm); - static constexpr double k_ScaleToDD4Hep = dd4hep::cm; - static constexpr double k_ScaleFromDD4HepToG4 = (1.0 / dd4hep::mm); - static constexpr double k_ScaleToDD4HepFromG4 = dd4hep::mm; + static constexpr double k_ScaleFromDD4hep = (1.0 / dd4hep::cm); + static constexpr double k_ScaleToDD4hep = dd4hep::cm; + static constexpr double k_ScaleFromDD4hepToG4 = (1.0 / dd4hep::mm); + static constexpr double k_ScaleToDD4hepFromG4 = dd4hep::mm; HcalGeomParameters() = default; diff --git a/Geometry/HcalCommonData/interface/HcalSimParametersFromDD.h b/Geometry/HcalCommonData/interface/HcalSimParametersFromDD.h index abcc2efa1844b..cd19b25e81ae0 100644 --- a/Geometry/HcalCommonData/interface/HcalSimParametersFromDD.h +++ b/Geometry/HcalCommonData/interface/HcalSimParametersFromDD.h @@ -27,8 +27,8 @@ class HcalSimParametersFromDD { std::vector getNames(cms::DDFilteredView& fv); std::vector getDDDArray(const std::string& str, const DDsvalues_type& sv, int& nmin); - static constexpr double k_ScaleFromDD4Hep = (1.0 / dd4hep::mm); - static constexpr double k_ScaleFromDD4HepInv = dd4hep::mm; + static constexpr double k_ScaleFromDD4hep = (1.0 / dd4hep::mm); + static constexpr double k_ScaleFromDD4hepInv = dd4hep::mm; }; #endif diff --git a/Geometry/HcalCommonData/plugins/CaloSimParametersESModule.cc b/Geometry/HcalCommonData/plugins/CaloSimParametersESModule.cc index df9c5bd32a7c3..a279341ca664c 100644 --- a/Geometry/HcalCommonData/plugins/CaloSimParametersESModule.cc +++ b/Geometry/HcalCommonData/plugins/CaloSimParametersESModule.cc @@ -28,21 +28,21 @@ class CaloSimParametersESModule : public edm::ESProducer { private: edm::ESGetToken cpvTokenDDD_; - edm::ESGetToken cpvTokenDD4Hep_; - bool fromDD4Hep_; + edm::ESGetToken cpvTokenDD4hep_; + bool fromDD4hep_; }; CaloSimParametersESModule::CaloSimParametersESModule(const edm::ParameterSet& ps) { - fromDD4Hep_ = ps.getParameter("fromDD4Hep"); + fromDD4hep_ = ps.getParameter("fromDD4hep"); auto cc = setWhatProduced(this); - if (fromDD4Hep_) - cpvTokenDD4Hep_ = cc.consumesFrom(edm::ESInputTag()); + if (fromDD4hep_) + cpvTokenDD4hep_ = cc.consumesFrom(edm::ESInputTag()); else cpvTokenDDD_ = cc.consumesFrom(edm::ESInputTag()); #ifdef EDM_ML_DEBUG edm::LogVerbatim("HCalGeom") << "CaloSimParametersESModule::CaloSimParametersESModule called with dd4hep: " - << fromDD4Hep_; + << fromDD4hep_; #endif } @@ -50,7 +50,7 @@ CaloSimParametersESModule::~CaloSimParametersESModule() {} void CaloSimParametersESModule::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { edm::ParameterSetDescription desc; - desc.add("fromDD4Hep", false); + desc.add("fromDD4hep", false); descriptions.add("caloSimulationParameters", desc); } @@ -61,11 +61,11 @@ CaloSimParametersESModule::ReturnType CaloSimParametersESModule::produce(const H auto ptp = std::make_unique(); CaloSimParametersFromDD builder; - if (fromDD4Hep_) { + if (fromDD4hep_) { #ifdef EDM_ML_DEBUG edm::LogVerbatim("HCalGeom") << "CaloSimParametersESModule::Try to access cms::DDCompactView"; #endif - edm::ESTransientHandle cpv = iRecord.getTransientHandle(cpvTokenDD4Hep_); + edm::ESTransientHandle cpv = iRecord.getTransientHandle(cpvTokenDD4hep_); builder.build(&(*cpv), *ptp); } else { #ifdef EDM_ML_DEBUG diff --git a/Geometry/HcalCommonData/plugins/HcalParametersESModule.cc b/Geometry/HcalCommonData/plugins/HcalParametersESModule.cc index 30706d36fa083..9371d26d20de9 100644 --- a/Geometry/HcalCommonData/plugins/HcalParametersESModule.cc +++ b/Geometry/HcalCommonData/plugins/HcalParametersESModule.cc @@ -26,26 +26,26 @@ class HcalParametersESModule : public edm::ESProducer { private: edm::ESGetToken cpvTokenDDD_; - edm::ESGetToken cpvTokenDD4Hep_; - bool fromDD4Hep_; + edm::ESGetToken cpvTokenDD4hep_; + bool fromDD4hep_; }; HcalParametersESModule::HcalParametersESModule(const edm::ParameterSet& ps) { - fromDD4Hep_ = ps.getParameter("fromDD4Hep"); + fromDD4hep_ = ps.getParameter("fromDD4hep"); auto cc = setWhatProduced(this); - if (fromDD4Hep_) - cpvTokenDD4Hep_ = cc.consumesFrom(edm::ESInputTag()); + if (fromDD4hep_) + cpvTokenDD4hep_ = cc.consumesFrom(edm::ESInputTag()); else cpvTokenDDD_ = cc.consumesFrom(edm::ESInputTag()); #ifdef EDM_ML_DEBUG - edm::LogVerbatim("HCalGeom") << "HcalParametersESModule::HcalParametersESModule called with dd4hep: " << fromDD4Hep_; + edm::LogVerbatim("HCalGeom") << "HcalParametersESModule::HcalParametersESModule called with dd4hep: " << fromDD4hep_; #endif } void HcalParametersESModule::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { edm::ParameterSetDescription desc; - desc.add("fromDD4Hep", false); + desc.add("fromDD4hep", false); descriptions.add("hcalParameters", desc); } @@ -55,11 +55,11 @@ HcalParametersESModule::ReturnType HcalParametersESModule::produce(const HcalPar auto ptp = std::make_unique(); HcalParametersFromDD builder; - if (fromDD4Hep_) { + if (fromDD4hep_) { #ifdef EDM_ML_DEBUG edm::LogVerbatim("HCalGeom") << "HcalParametersESModule::Try to access cms::DDCompactView"; #endif - edm::ESTransientHandle cpv = iRecord.getTransientHandle(cpvTokenDD4Hep_); + edm::ESTransientHandle cpv = iRecord.getTransientHandle(cpvTokenDD4hep_); builder.build(*cpv, *ptp); } else { #ifdef EDM_ML_DEBUG diff --git a/Geometry/HcalCommonData/plugins/HcalSimParametersESModule.cc b/Geometry/HcalCommonData/plugins/HcalSimParametersESModule.cc index 105b773be2174..bcd43a5051a69 100644 --- a/Geometry/HcalCommonData/plugins/HcalSimParametersESModule.cc +++ b/Geometry/HcalCommonData/plugins/HcalSimParametersESModule.cc @@ -26,27 +26,27 @@ class HcalSimParametersESModule : public edm::ESProducer { private: edm::ESGetToken cpvTokenDDD_; - edm::ESGetToken cpvTokenDD4Hep_; - bool fromDD4Hep_; + edm::ESGetToken cpvTokenDD4hep_; + bool fromDD4hep_; }; HcalSimParametersESModule::HcalSimParametersESModule(const edm::ParameterSet& ps) { - fromDD4Hep_ = ps.getParameter("fromDD4Hep"); + fromDD4hep_ = ps.getParameter("fromDD4hep"); auto cc = setWhatProduced(this); - if (fromDD4Hep_) - cpvTokenDD4Hep_ = cc.consumesFrom(edm::ESInputTag()); + if (fromDD4hep_) + cpvTokenDD4hep_ = cc.consumesFrom(edm::ESInputTag()); else cpvTokenDDD_ = cc.consumesFrom(edm::ESInputTag()); #ifdef EDM_ML_DEBUG edm::LogVerbatim("HCalGeom") << "HcalSimParametersESModule::HcalSimParametersESModule called with dd4hep: " - << fromDD4Hep_; + << fromDD4hep_; #endif } void HcalSimParametersESModule::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { edm::ParameterSetDescription desc; - desc.add("fromDD4Hep", false); + desc.add("fromDD4hep", false); descriptions.add("hcalSimulationParameters", desc); } @@ -58,11 +58,11 @@ HcalSimParametersESModule::ReturnType HcalSimParametersESModule::produce(const H auto ptp = std::make_unique(); HcalSimParametersFromDD builder; - if (fromDD4Hep_) { + if (fromDD4hep_) { #ifdef EDM_ML_DEBUG edm::LogVerbatim("HCalGeom") << "HcalSimParametersESModule::Try to access cms::DDCompactView"; #endif - edm::ESTransientHandle cpv = iRecord.getTransientHandle(cpvTokenDD4Hep_); + edm::ESTransientHandle cpv = iRecord.getTransientHandle(cpvTokenDD4hep_); builder.build(*cpv, *ptp); } else { edm::ESTransientHandle cpv = iRecord.getTransientHandle(cpvTokenDDD_); diff --git a/Geometry/HcalCommonData/python/caloSimulationParameters_cff.py b/Geometry/HcalCommonData/python/caloSimulationParameters_cff.py index 7136506d27424..df806a04cc135 100644 --- a/Geometry/HcalCommonData/python/caloSimulationParameters_cff.py +++ b/Geometry/HcalCommonData/python/caloSimulationParameters_cff.py @@ -5,5 +5,5 @@ from Configuration.ProcessModifiers.dd4hep_cff import dd4hep dd4hep.toModify(caloSimulationParameters, - fromDD4Hep = cms.bool(True) + fromDD4hep = cms.bool(True) ) diff --git a/Geometry/HcalCommonData/python/hcalParameters_cff.py b/Geometry/HcalCommonData/python/hcalParameters_cff.py index 697b034578b84..6a10611b03cb7 100644 --- a/Geometry/HcalCommonData/python/hcalParameters_cff.py +++ b/Geometry/HcalCommonData/python/hcalParameters_cff.py @@ -5,5 +5,5 @@ from Configuration.ProcessModifiers.dd4hep_cff import dd4hep dd4hep.toModify(hcalParameters, - fromDD4Hep = cms.bool(True), + fromDD4hep = cms.bool(True), ) diff --git a/Geometry/HcalCommonData/python/hcalSimulationParameters_cff.py b/Geometry/HcalCommonData/python/hcalSimulationParameters_cff.py index c4ba26aafd4ab..d1898edc44f81 100644 --- a/Geometry/HcalCommonData/python/hcalSimulationParameters_cff.py +++ b/Geometry/HcalCommonData/python/hcalSimulationParameters_cff.py @@ -5,5 +5,5 @@ from Configuration.ProcessModifiers.dd4hep_cff import dd4hep dd4hep.toModify(hcalSimulationParameters, - fromDD4Hep = cms.bool(True), + fromDD4hep = cms.bool(True), ) diff --git a/Geometry/HcalCommonData/src/HcalGeomParameters.cc b/Geometry/HcalCommonData/src/HcalGeomParameters.cc index 7c881a0545e50..72d294840d366 100644 --- a/Geometry/HcalCommonData/src/HcalGeomParameters.cc +++ b/Geometry/HcalCommonData/src/HcalGeomParameters.cc @@ -261,20 +261,20 @@ void HcalGeomParameters::loadGeometry(const cms::DDCompactView& cpv, HcalParamet double dx = 0, dy = 0, dz = 0, dx1 = 0, dx2 = 0; double alp(0); if (dd4hep::isA(fv.solid())) { - dx = HcalGeomParameters::k_ScaleFromDD4HepToG4 * paras[0]; - dy = HcalGeomParameters::k_ScaleFromDD4HepToG4 * paras[1]; - dz = HcalGeomParameters::k_ScaleFromDD4HepToG4 * paras[2]; + dx = HcalGeomParameters::k_ScaleFromDD4hepToG4 * paras[0]; + dy = HcalGeomParameters::k_ScaleFromDD4hepToG4 * paras[1]; + dz = HcalGeomParameters::k_ScaleFromDD4hepToG4 * paras[2]; } else if (dd4hep::isA(fv.solid())) { - dx1 = HcalGeomParameters::k_ScaleFromDD4HepToG4 * paras[4]; - dx2 = HcalGeomParameters::k_ScaleFromDD4HepToG4 * paras[5]; - dx = 0.25 * HcalGeomParameters::k_ScaleFromDD4HepToG4 * (paras[4] + paras[5] + paras[8] + paras[9]); - dy = 0.5 * HcalGeomParameters::k_ScaleFromDD4HepToG4 * (paras[3] + paras[7]); - dz = HcalGeomParameters::k_ScaleFromDD4HepToG4 * paras[0]; + dx1 = HcalGeomParameters::k_ScaleFromDD4hepToG4 * paras[4]; + dx2 = HcalGeomParameters::k_ScaleFromDD4hepToG4 * paras[5]; + dx = 0.25 * HcalGeomParameters::k_ScaleFromDD4hepToG4 * (paras[4] + paras[5] + paras[8] + paras[9]); + dy = 0.5 * HcalGeomParameters::k_ScaleFromDD4hepToG4 * (paras[3] + paras[7]); + dz = HcalGeomParameters::k_ScaleFromDD4hepToG4 * paras[0]; alp = 0.5 * (paras[6] + paras[10]); } else if (dd4hep::isA(fv.solid())) { - dx = HcalGeomParameters::k_ScaleFromDD4HepToG4 * paras[0]; - dy = HcalGeomParameters::k_ScaleFromDD4HepToG4 * paras[1]; - dz = HcalGeomParameters::k_ScaleFromDD4HepToG4 * paras[2]; + dx = HcalGeomParameters::k_ScaleFromDD4hepToG4 * paras[0]; + dy = HcalGeomParameters::k_ScaleFromDD4hepToG4 * paras[1]; + dz = HcalGeomParameters::k_ScaleFromDD4hepToG4 * paras[2]; } if (idet == 3) { // HB @@ -284,7 +284,7 @@ void HcalGeomParameters::loadGeometry(const cms::DDCompactView& cpv, HcalParamet #endif if (lay >= 0 && lay < maxLayer_) { ib_[lay]++; - rb_[lay] += (HcalGeomParameters::k_ScaleFromDD4HepToG4 * t.Rho()); + rb_[lay] += (HcalGeomParameters::k_ScaleFromDD4hepToG4 * t.Rho()); if (thkb_[lay] <= 0) { if (lay < 17) thkb_[lay] = dx; @@ -294,15 +294,15 @@ void HcalGeomParameters::loadGeometry(const cms::DDCompactView& cpv, HcalParamet if (lay < 17) { bool found = false; for (double k : rxb_) { - if (std::abs(k - (HcalGeomParameters::k_ScaleFromDD4HepToG4 * t.Rho())) < 0.01) { + if (std::abs(k - (HcalGeomParameters::k_ScaleFromDD4hepToG4 * t.Rho())) < 0.01) { found = true; break; } } if (!found) { - rxb_.emplace_back(HcalGeomParameters::k_ScaleFromDD4HepToG4 * t.Rho()); - php.rhoxHB.emplace_back(HcalGeomParameters::k_ScaleFromDD4HepToG4 * t.Rho() * std::cos(t.phi())); - php.zxHB.emplace_back(std::abs(HcalGeomParameters::k_ScaleFromDD4HepToG4 * t.z())); + rxb_.emplace_back(HcalGeomParameters::k_ScaleFromDD4hepToG4 * t.Rho()); + php.rhoxHB.emplace_back(HcalGeomParameters::k_ScaleFromDD4hepToG4 * t.Rho() * std::cos(t.phi())); + php.zxHB.emplace_back(std::abs(HcalGeomParameters::k_ScaleFromDD4hepToG4 * t.z())); php.dyHB.emplace_back(2. * dy); php.dxHB.emplace_back(2. * dz); php.layHB.emplace_back(lay); @@ -325,8 +325,8 @@ void HcalGeomParameters::loadGeometry(const cms::DDCompactView& cpv, HcalParamet ifi = copy[2]; if (nsiz > 3) ich = copy[3]; - double z1 = std::abs((HcalGeomParameters::k_ScaleFromDD4HepToG4 * t.z()) + dz); - double z2 = std::abs((HcalGeomParameters::k_ScaleFromDD4HepToG4 * t.z()) - dz); + double z1 = std::abs((HcalGeomParameters::k_ScaleFromDD4hepToG4 * t.z()) + dz); + double z2 = std::abs((HcalGeomParameters::k_ScaleFromDD4hepToG4 * t.z()) - dz); if (std::abs(z1 - z2) < 0.01) z1 = 0; if (ifi == 1 && ich == 4) { @@ -370,26 +370,26 @@ void HcalGeomParameters::loadGeometry(const cms::DDCompactView& cpv, HcalParamet #endif if (lay >= 0 && lay < maxLayer_) { ie_[lay]++; - ze_[lay] += std::abs(HcalGeomParameters::k_ScaleFromDD4HepToG4 * t.z()); + ze_[lay] += std::abs(HcalGeomParameters::k_ScaleFromDD4hepToG4 * t.z()); if (thke_[lay] <= 0) thke_[lay] = dz; - double rinHE = HcalGeomParameters::k_ScaleFromDD4HepToG4 * t.Rho() * cos(alp) - dy; - double routHE = HcalGeomParameters::k_ScaleFromDD4HepToG4 * t.Rho() * cos(alp) + dy; + double rinHE = HcalGeomParameters::k_ScaleFromDD4hepToG4 * t.Rho() * cos(alp) - dy; + double routHE = HcalGeomParameters::k_ScaleFromDD4hepToG4 * t.Rho() * cos(alp) + dy; rminHE_[lay] += rinHE; rmaxHE_[lay] += routHE; bool found = false; for (double k : php.zxHE) { - if (std::abs(k - std::abs(HcalGeomParameters::k_ScaleFromDD4HepToG4 * t.z())) < 0.01) { + if (std::abs(k - std::abs(HcalGeomParameters::k_ScaleFromDD4hepToG4 * t.z())) < 0.01) { found = true; break; } } if (!found) { - php.zxHE.emplace_back(std::abs(HcalGeomParameters::k_ScaleFromDD4HepToG4 * t.z())); - php.rhoxHE.emplace_back(HcalGeomParameters::k_ScaleFromDD4HepToG4 * t.Rho() * std::cos(t.phi())); + php.zxHE.emplace_back(std::abs(HcalGeomParameters::k_ScaleFromDD4hepToG4 * t.z())); + php.rhoxHE.emplace_back(HcalGeomParameters::k_ScaleFromDD4hepToG4 * t.Rho() * std::cos(t.phi())); php.dyHE.emplace_back(dy * std::cos(t.phi())); - dx1 -= 0.5 * (HcalGeomParameters::k_ScaleFromDD4HepToG4 * t.Rho() - dy) * std::cos(t.phi()) * tan10deg; - dx2 -= 0.5 * (HcalGeomParameters::k_ScaleFromDD4HepToG4 * t.Rho() + dy) * std::cos(t.phi()) * tan10deg; + dx1 -= 0.5 * (HcalGeomParameters::k_ScaleFromDD4hepToG4 * t.Rho() - dy) * std::cos(t.phi()) * tan10deg; + dx2 -= 0.5 * (HcalGeomParameters::k_ScaleFromDD4hepToG4 * t.Rho() + dy) * std::cos(t.phi()) * tan10deg; php.dx1HE.emplace_back(-dx1); php.dx2HE.emplace_back(-dx2); php.layHE.emplace_back(lay); @@ -411,17 +411,17 @@ void HcalGeomParameters::loadGeometry(const cms::DDCompactView& cpv, HcalParamet #ifdef EDM_ML_DEBUG edm::LogVerbatim("HCalGeom") << "HF " << fv.name() << " Shape " << cms::dd::name(cms::DDSolidShapeMap, fv.shape()) << " Z " - << HcalGeomParameters::k_ScaleFromDD4HepToG4 * t.z() << " with " << paras.size() + << HcalGeomParameters::k_ScaleFromDD4hepToG4 * t.z() << " with " << paras.size() << " Parameters"; for (unsigned j = 0; j < paras.size(); j++) edm::LogVerbatim("HCalGeom") << "HF Parameter[" << j << "] = " << paras[j]; #endif if (dd4hep::isA(fv.solid())) { int nz = (int)(paras.size()) - 3; - dzVcal_ = 0.5 * HcalGeomParameters::k_ScaleFromDD4HepToG4 * (paras[nz] - paras[3]); + dzVcal_ = 0.5 * HcalGeomParameters::k_ScaleFromDD4hepToG4 * (paras[nz] - paras[3]); hf = true; } else if (dd4hep::isA(fv.solid()) || dd4hep::isA(fv.solid())) { - dzVcal_ = HcalGeomParameters::k_ScaleFromDD4HepToG4 * paras[2]; + dzVcal_ = HcalGeomParameters::k_ScaleFromDD4hepToG4 * paras[2]; hf = true; } } @@ -429,8 +429,8 @@ void HcalGeomParameters::loadGeometry(const cms::DDCompactView& cpv, HcalParamet } else { edm::LogVerbatim("HCalGeom") << "Unknown Detector " << idet << " for " << fv.name() << " Shape " << cms::dd::name(cms::DDSolidShapeMap, fv.shape()) << " R " - << (HcalGeomParameters::k_ScaleFromDD4HepToG4 * t.Rho()) << " Z " - << (HcalGeomParameters::k_ScaleFromDD4HepToG4 * t.z()); + << (HcalGeomParameters::k_ScaleFromDD4hepToG4 * t.Rho()) << " Z " + << (HcalGeomParameters::k_ScaleFromDD4hepToG4 * t.z()); #endif } } diff --git a/Geometry/HcalCommonData/src/HcalParametersFromDD.cc b/Geometry/HcalCommonData/src/HcalParametersFromDD.cc index 7173c11e98f4f..db5c365f196bd 100644 --- a/Geometry/HcalCommonData/src/HcalParametersFromDD.cc +++ b/Geometry/HcalCommonData/src/HcalParametersFromDD.cc @@ -171,8 +171,8 @@ bool HcalParametersFromDD::build(const cms::DDCompactView& cpv, HcalParameters& php.HFShift = cpv.getVector("HFShift"); php.maxDepth = cpv.getVector("MaxDepth"); - rescale(php.rTable, HcalGeomParameters::k_ScaleFromDD4HepToG4); - rescale(php.gparHF, HcalGeomParameters::k_ScaleFromDD4HepToG4); + rescale(php.rTable, HcalGeomParameters::k_ScaleFromDD4hepToG4); + rescale(php.gparHF, HcalGeomParameters::k_ScaleFromDD4hepToG4); for (unsigned int i = 1; i <= nEtaMax; ++i) { HcalParameters::LayerItem layerGroupEta; layerGroupEta.layer = i; diff --git a/Geometry/HcalCommonData/src/HcalSimParametersFromDD.cc b/Geometry/HcalCommonData/src/HcalSimParametersFromDD.cc index de142cd9f33b3..2ab2a51df2392 100644 --- a/Geometry/HcalCommonData/src/HcalSimParametersFromDD.cc +++ b/Geometry/HcalCommonData/src/HcalSimParametersFromDD.cc @@ -119,17 +119,17 @@ bool HcalSimParametersFromDD::build(const cms::DDCompactView& cpv, HcalSimulatio // Attenuation length php.attenuationLength_ = fv.get >("hf", "attl"); std::for_each( - php.attenuationLength_.begin(), php.attenuationLength_.end(), [](double& n) { n *= k_ScaleFromDD4HepInv; }); + php.attenuationLength_.begin(), php.attenuationLength_.end(), [](double& n) { n *= k_ScaleFromDD4hepInv; }); // Limits on Lambda php.lambdaLimits_ = fv.get >("hf", "lambLim"); // Fibre Lengths php.longFiberLength_ = fv.get >("hf", "LongFL"); - std::for_each(php.longFiberLength_.begin(), php.longFiberLength_.end(), [](double& n) { n *= k_ScaleFromDD4Hep; }); + std::for_each(php.longFiberLength_.begin(), php.longFiberLength_.end(), [](double& n) { n *= k_ScaleFromDD4hep; }); php.shortFiberLength_ = fv.get >("hf", "ShortFL"); std::for_each( - php.shortFiberLength_.begin(), php.shortFiberLength_.end(), [](double& n) { n *= k_ScaleFromDD4Hep; }); + php.shortFiberLength_.begin(), php.shortFiberLength_.end(), [](double& n) { n *= k_ScaleFromDD4hep; }); //Parameters for the PMT std::vector neta = fv.get >("hfpmt", "indexPMTR"); diff --git a/Geometry/HcalTestBeamData/interface/HcalTB02ParametersFromDD.h b/Geometry/HcalTestBeamData/interface/HcalTB02ParametersFromDD.h index 2f3dc3106c40f..a71c7448f31b1 100644 --- a/Geometry/HcalTestBeamData/interface/HcalTB02ParametersFromDD.h +++ b/Geometry/HcalTestBeamData/interface/HcalTB02ParametersFromDD.h @@ -18,7 +18,7 @@ class HcalTB02ParametersFromDD { private: static constexpr double k_ScaleFromDDDToG4 = 1.0; - static constexpr double k_ScaleFromDD4HepToG4 = 10.0; + static constexpr double k_ScaleFromDD4hepToG4 = 10.0; }; #endif diff --git a/Geometry/HcalTestBeamData/plugins/HcalTB02ParametersESModule.cc b/Geometry/HcalTestBeamData/plugins/HcalTB02ParametersESModule.cc index 023e1a8c75214..e447abd798055 100644 --- a/Geometry/HcalTestBeamData/plugins/HcalTB02ParametersESModule.cc +++ b/Geometry/HcalTestBeamData/plugins/HcalTB02ParametersESModule.cc @@ -22,30 +22,30 @@ class HcalTB02ParametersESModule : public edm::ESProducer { private: edm::ESGetToken cpvTokenDDD_; - edm::ESGetToken cpvTokenDD4Hep_; + edm::ESGetToken cpvTokenDD4hep_; std::string name_; - bool fromDD4Hep_; + bool fromDD4hep_; }; HcalTB02ParametersESModule::HcalTB02ParametersESModule(const edm::ParameterSet& ps) { name_ = ps.getParameter("name"); - fromDD4Hep_ = ps.getParameter("fromDD4Hep"); + fromDD4hep_ = ps.getParameter("fromDD4hep"); auto cc = setWhatProduced(this, name_); - if (fromDD4Hep_) - cpvTokenDD4Hep_ = cc.consumesFrom(edm::ESInputTag()); + if (fromDD4hep_) + cpvTokenDD4hep_ = cc.consumesFrom(edm::ESInputTag()); else cpvTokenDDD_ = cc.consumesFrom(edm::ESInputTag()); #ifdef EDM_ML_DEBUG edm::LogVerbatim("HCalGeom") << "HcalTB02ParametersESModule::HcalTB02ParametersESModule called with dd4hep: " - << fromDD4Hep_ << " and name " << name_; + << fromDD4hep_ << " and name " << name_; #endif } void HcalTB02ParametersESModule::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { edm::ParameterSetDescription desc; desc.add("name", "EcalHitsEB"); - desc.add("fromDD4Hep", false); + desc.add("fromDD4hep", false); descriptions.add("hcalTB02XtalParameters", desc); } @@ -57,11 +57,11 @@ HcalTB02ParametersESModule::ReturnType HcalTB02ParametersESModule::produce(const auto ptp = std::make_unique(name_); HcalTB02ParametersFromDD builder; - if (fromDD4Hep_) { + if (fromDD4hep_) { #ifdef EDM_ML_DEBUG edm::LogVerbatim("HCalGeom") << "HcalTB02ParametersESModule::Try to access cms::DDCompactView"; #endif - edm::ESTransientHandle cpv = iRecord.getTransientHandle(cpvTokenDD4Hep_); + edm::ESTransientHandle cpv = iRecord.getTransientHandle(cpvTokenDD4hep_); builder.build(&(*cpv), *ptp, name_); } else { edm::ESTransientHandle cpv = iRecord.getTransientHandle(cpvTokenDDD_); diff --git a/Geometry/HcalTestBeamData/plugins/HcalTB06BeamParametersESModule.cc b/Geometry/HcalTestBeamData/plugins/HcalTB06BeamParametersESModule.cc index 02ec272752193..21502b6ca0dc4 100644 --- a/Geometry/HcalTestBeamData/plugins/HcalTB06BeamParametersESModule.cc +++ b/Geometry/HcalTestBeamData/plugins/HcalTB06BeamParametersESModule.cc @@ -22,24 +22,24 @@ class HcalTB06ParametersESModule : public edm::ESProducer { private: edm::ESGetToken cpvTokenDDD_; - edm::ESGetToken cpvTokenDD4Hep_; + edm::ESGetToken cpvTokenDD4hep_; std::string name1_, name2_; - bool fromDD4Hep_; + bool fromDD4hep_; }; HcalTB06ParametersESModule::HcalTB06ParametersESModule(const edm::ParameterSet& ps) { name1_ = ps.getParameter("name1"); name2_ = ps.getParameter("name2"); - fromDD4Hep_ = ps.getParameter("fromDD4Hep"); + fromDD4hep_ = ps.getParameter("fromDD4hep"); auto cc = setWhatProduced(this); - if (fromDD4Hep_) - cpvTokenDD4Hep_ = cc.consumesFrom(edm::ESInputTag()); + if (fromDD4hep_) + cpvTokenDD4hep_ = cc.consumesFrom(edm::ESInputTag()); else cpvTokenDDD_ = cc.consumesFrom(edm::ESInputTag()); #ifdef EDM_ML_DEBUG edm::LogVerbatim("HCalGeom") << "HcalTB06ParametersESModule::HcalTB06ParametersESModule called with dd4hep: " - << fromDD4Hep_ << " and names " << name1_ << ":" << name2_; + << fromDD4hep_ << " and names " << name1_ << ":" << name2_; #endif } @@ -47,7 +47,7 @@ void HcalTB06ParametersESModule::fillDescriptions(edm::ConfigurationDescriptions edm::ParameterSetDescription desc; desc.add("name1", "WireChamber"); desc.add("name2", "HcalTB06BeamHits"); - desc.add("fromDD4Hep", false); + desc.add("fromDD4hep", false); descriptions.add("hcalTB06BeamParameters", desc); } @@ -59,11 +59,11 @@ HcalTB06ParametersESModule::ReturnType HcalTB06ParametersESModule::produce(const auto ptp = std::make_unique(); HcalTB06BeamParametersFromDD builder; - if (fromDD4Hep_) { + if (fromDD4hep_) { #ifdef EDM_ML_DEBUG edm::LogVerbatim("HCalGeom") << "HcalTB06ParametersESModule::Try to access cms::DDCompactView"; #endif - edm::ESTransientHandle cpv = iRecord.getTransientHandle(cpvTokenDD4Hep_); + edm::ESTransientHandle cpv = iRecord.getTransientHandle(cpvTokenDD4hep_); builder.build(&(*cpv), *ptp, name1_, name2_); } else { edm::ESTransientHandle cpv = iRecord.getTransientHandle(cpvTokenDDD_); diff --git a/Geometry/HcalTestBeamData/python/hcalTB02Parameters_cff.py b/Geometry/HcalTestBeamData/python/hcalTB02Parameters_cff.py index 7516aa7de89aa..8ef7f49071c26 100644 --- a/Geometry/HcalTestBeamData/python/hcalTB02Parameters_cff.py +++ b/Geometry/HcalTestBeamData/python/hcalTB02Parameters_cff.py @@ -5,7 +5,7 @@ from Configuration.ProcessModifiers.dd4hep_cff import dd4hep dd4hep.toModify(hcalTB02XtalParameters, - fromDD4Hep = cms.bool(True), + fromDD4hep = cms.bool(True), ) hcalTB02HcalParameters = hcalTB02XtalParameters.clone( diff --git a/Geometry/HcalTestBeamData/python/hcalTB06Parameters_cff.py b/Geometry/HcalTestBeamData/python/hcalTB06Parameters_cff.py index 5a452211faae1..953158f820551 100644 --- a/Geometry/HcalTestBeamData/python/hcalTB06Parameters_cff.py +++ b/Geometry/HcalTestBeamData/python/hcalTB06Parameters_cff.py @@ -5,5 +5,5 @@ from Configuration.ProcessModifiers.dd4hep_cff import dd4hep dd4hep.toModify(hcalTB06BeamParameters, - fromDD4Hep = cms.bool(True), + fromDD4hep = cms.bool(True), ) diff --git a/Geometry/HcalTestBeamData/src/HcalTB02ParametersFromDD.cc b/Geometry/HcalTestBeamData/src/HcalTB02ParametersFromDD.cc index c3cc494fb28a0..9a1951c294a16 100644 --- a/Geometry/HcalTestBeamData/src/HcalTB02ParametersFromDD.cc +++ b/Geometry/HcalTestBeamData/src/HcalTB02ParametersFromDD.cc @@ -41,7 +41,7 @@ bool HcalTB02ParametersFromDD::build(const cms::DDCompactView* cpv, HcalTB02Para edm::LogVerbatim("HcalTBSim") << "HcalTB02ParametersFromDD (for " << name << "): Solid " << namx << " Shape " << cms::dd::name(cms::DDSolidShapeMap, fv.shape()) << " Parameter 0 = " << paras[0]; if (dd4hep::isA(fv.solid())) { - double dz = 2 * k_ScaleFromDD4HepToG4 * paras[0]; + double dz = 2 * k_ScaleFromDD4hepToG4 * paras[0]; php.lengthMap_.insert(std::pair(namx, dz)); } } diff --git a/Geometry/HcalTestBeamData/test/python/run2004_cfg.py b/Geometry/HcalTestBeamData/test/python/run2004_cfg.py index 92ff95d213f36..5870ff1cc7bd9 100644 --- a/Geometry/HcalTestBeamData/test/python/run2004_cfg.py +++ b/Geometry/HcalTestBeamData/test/python/run2004_cfg.py @@ -99,8 +99,8 @@ process.g4SimHits.Physics.type = 'SimG4Core/Physics/QGSP_FTFP_BERT_EML' process.g4SimHits.Physics.Region = 'HcalRegion' process.g4SimHits.Physics.DefaultCutValue = 1. -process.hcalParameters.fromDD4Hep = True -process.caloSimulationParameters.fromDD4Hep = True +process.hcalParameters.fromDD4hep = True +process.caloSimulationParameters.fromDD4hep = True process.g4SimHits.StackingAction.KillGamma = False process.g4SimHits.CaloSD.BeamPosition = beamPosition diff --git a/Geometry/HcalTowerAlgo/test/runHcalCellDumpDD4Hep_cfg.py b/Geometry/HcalTowerAlgo/test/runHcalCellDumpDD4Hep_cfg.py index 70b4474116edf..29c26f20a250a 100644 --- a/Geometry/HcalTowerAlgo/test/runHcalCellDumpDD4Hep_cfg.py +++ b/Geometry/HcalTowerAlgo/test/runHcalCellDumpDD4Hep_cfg.py @@ -28,12 +28,12 @@ process.Timing = cms.Service("Timing") -process.hcalParameters.fromDD4Hep = cms.bool(True) -process.caloSimulationParameters.fromDD4Hep = cms.bool(True) +process.hcalParameters.fromDD4hep = cms.bool(True) +process.caloSimulationParameters.fromDD4hep = cms.bool(True) process.CaloGeometryBuilder.SelectedCalos = ['HCAL'] -process.ecalSimulationParametersEB.fromDD4Hep = cms.bool(True) -process.ecalSimulationParametersEE.fromDD4Hep = cms.bool(True) -process.ecalSimulationParametersES.fromDD4Hep = cms.bool(True) -process.hcalSimulationParameters.fromDD4Hep = cms.bool(True) +process.ecalSimulationParametersEB.fromDD4hep = cms.bool(True) +process.ecalSimulationParametersEE.fromDD4hep = cms.bool(True) +process.ecalSimulationParametersES.fromDD4hep = cms.bool(True) +process.hcalSimulationParameters.fromDD4hep = cms.bool(True) process.p1 = cms.Path(process.hcalCellParameterDump) diff --git a/Geometry/MuonNumbering/plugins/MuonGeometryConstantsESModule.cc b/Geometry/MuonNumbering/plugins/MuonGeometryConstantsESModule.cc index 0e7f9fe9d1176..13d9f626aee32 100644 --- a/Geometry/MuonNumbering/plugins/MuonGeometryConstantsESModule.cc +++ b/Geometry/MuonNumbering/plugins/MuonGeometryConstantsESModule.cc @@ -25,27 +25,27 @@ class MuonGeometryConstantsESModule : public edm::ESProducer { private: edm::ESGetToken cpvTokenDDD_; - edm::ESGetToken cpvTokenDD4Hep_; - bool fromDD4Hep_; + edm::ESGetToken cpvTokenDD4hep_; + bool fromDD4hep_; }; MuonGeometryConstantsESModule::MuonGeometryConstantsESModule(const edm::ParameterSet& ps) { - fromDD4Hep_ = ps.getParameter("fromDD4Hep"); + fromDD4hep_ = ps.getParameter("fromDD4hep"); auto cc = setWhatProduced(this); - if (fromDD4Hep_) - cpvTokenDD4Hep_ = cc.consumesFrom(edm::ESInputTag()); + if (fromDD4hep_) + cpvTokenDD4hep_ = cc.consumesFrom(edm::ESInputTag()); else cpvTokenDDD_ = cc.consumesFrom(edm::ESInputTag()); #ifdef EDM_ML_DEBUG edm::LogVerbatim("MuonGeom") << "MuonGeometryConstantsESModule::MuonGeometryConstantsESModule called with dd4hep: " - << fromDD4Hep_; + << fromDD4hep_; #endif } void MuonGeometryConstantsESModule::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { edm::ParameterSetDescription desc; - desc.add("fromDD4Hep", false); + desc.add("fromDD4hep", false); descriptions.add("muonGeometryConstants", desc); } @@ -55,11 +55,11 @@ MuonGeometryConstantsESModule::ReturnType MuonGeometryConstantsESModule::produce auto ptp = std::make_unique(); MuonGeometryConstantsBuild builder; - if (fromDD4Hep_) { + if (fromDD4hep_) { #ifdef EDM_ML_DEBUG edm::LogVerbatim("MuonGeom") << "MuonGeometryConstantsESModule::Try to access cms::DDCompactView"; #endif - edm::ESTransientHandle cpv = iRecord.getTransientHandle(cpvTokenDD4Hep_); + edm::ESTransientHandle cpv = iRecord.getTransientHandle(cpvTokenDD4hep_); builder.build(&(*cpv), *ptp); } else { #ifdef EDM_ML_DEBUG diff --git a/Geometry/MuonNumbering/plugins/MuonOffsetESProducer.cc b/Geometry/MuonNumbering/plugins/MuonOffsetESProducer.cc index be8795cd03f93..cdfdc94c38bb0 100644 --- a/Geometry/MuonNumbering/plugins/MuonOffsetESProducer.cc +++ b/Geometry/MuonNumbering/plugins/MuonOffsetESProducer.cc @@ -44,23 +44,23 @@ class MuonOffsetESProducer : public edm::ESProducer { ReturnType produce(const IdealGeometryRecord&); private: - const bool fromDD4Hep_; + const bool fromDD4hep_; const std::vector names_; edm::ESGetToken cpvTokenDDD_; - edm::ESGetToken cpvTokenDD4Hep_; + edm::ESGetToken cpvTokenDD4hep_; }; MuonOffsetESProducer::MuonOffsetESProducer(const edm::ParameterSet& iConfig) - : fromDD4Hep_(iConfig.getParameter("fromDD4Hep")), + : fromDD4hep_(iConfig.getParameter("fromDD4hep")), names_(iConfig.getParameter>("names")) { auto cc = setWhatProduced(this); - if (fromDD4Hep_) { - cpvTokenDD4Hep_ = cc.consumesFrom(edm::ESInputTag()); + if (fromDD4hep_) { + cpvTokenDD4hep_ = cc.consumesFrom(edm::ESInputTag()); } else { cpvTokenDDD_ = cc.consumesFrom(edm::ESInputTag()); } #ifdef EDM_ML_DEBUG - edm::LogVerbatim("MuonGeom") << "MuonOffsetESProducer::MuonOffsetESProducer called with dd4hep: " << fromDD4Hep_; + edm::LogVerbatim("MuonGeom") << "MuonOffsetESProducer::MuonOffsetESProducer called with dd4hep: " << fromDD4hep_; #endif } @@ -117,7 +117,7 @@ void MuonOffsetESProducer::fillDescriptions(edm::ConfigurationDescriptions& desc "MuonGEMEndcap", "MuonGEMSector", "MuonGEMChamber"}; - desc.add("fromDD4Hep", false); + desc.add("fromDD4hep", false); desc.add>("names", names); descriptions.add("muonOffsetESProducer", desc); } @@ -130,11 +130,11 @@ MuonOffsetESProducer::ReturnType MuonOffsetESProducer::produce(const IdealGeomet auto ptp = std::make_unique(); MuonOffsetFromDD builder(names_); - if (fromDD4Hep_) { + if (fromDD4hep_) { #ifdef EDM_ML_DEBUG edm::LogVerbatim("MuonGeom") << "MuonOffsetESProducer::Try to access cms::DDCompactView"; #endif - edm::ESTransientHandle cpv = iRecord.getTransientHandle(cpvTokenDD4Hep_); + edm::ESTransientHandle cpv = iRecord.getTransientHandle(cpvTokenDD4hep_); builder.build(&(*cpv), *ptp); } else { #ifdef EDM_ML_DEBUG diff --git a/Geometry/MuonNumbering/python/muonGeometryConstants_cff.py b/Geometry/MuonNumbering/python/muonGeometryConstants_cff.py index 37156880e6753..d81498987d186 100644 --- a/Geometry/MuonNumbering/python/muonGeometryConstants_cff.py +++ b/Geometry/MuonNumbering/python/muonGeometryConstants_cff.py @@ -5,5 +5,5 @@ from Configuration.ProcessModifiers.dd4hep_cff import dd4hep dd4hep.toModify(muonGeometryConstants, - fromDD4Hep = cms.bool(True), + fromDD4hep = cms.bool(True), ) diff --git a/Geometry/MuonNumbering/python/muonOffsetESProducer_cff.py b/Geometry/MuonNumbering/python/muonOffsetESProducer_cff.py index e29ba1feb2b15..89c2cbd96bb85 100644 --- a/Geometry/MuonNumbering/python/muonOffsetESProducer_cff.py +++ b/Geometry/MuonNumbering/python/muonOffsetESProducer_cff.py @@ -5,7 +5,7 @@ from Configuration.ProcessModifiers.dd4hep_cff import dd4hep dd4hep.toModify(muonOffsetESProducer, - fromDD4Hep = cms.bool(True) + fromDD4hep = cms.bool(True) ) from Configuration.Eras.Modifier_phase2_common_cff import phase2_common diff --git a/Geometry/MuonNumbering/test/testConstantsFromDD4Hep_cfg.py b/Geometry/MuonNumbering/test/testConstantsFromDD4Hep_cfg.py index 57cdf64e2bf50..b1763f1b6df24 100644 --- a/Geometry/MuonNumbering/test/testConstantsFromDD4Hep_cfg.py +++ b/Geometry/MuonNumbering/test/testConstantsFromDD4Hep_cfg.py @@ -21,7 +21,7 @@ input = cms.untracked.int32(1) ) -process.muonGeometryConstants.fromDD4Hep = True +process.muonGeometryConstants.fromDD4hep = True process.test = cms.EDAnalyzer("MuonGeometryConstantsTester") diff --git a/Geometry/MuonNumbering/test/testConstantsFromDDD_cfg.py b/Geometry/MuonNumbering/test/testConstantsFromDDD_cfg.py index c78606dae9b05..9d5d86e53338e 100644 --- a/Geometry/MuonNumbering/test/testConstantsFromDDD_cfg.py +++ b/Geometry/MuonNumbering/test/testConstantsFromDDD_cfg.py @@ -12,7 +12,7 @@ input = cms.untracked.int32(1) ) -process.muonGeometryConstants.fromDD4Hep = False +process.muonGeometryConstants.fromDD4hep = False process.test = cms.EDAnalyzer("MuonGeometryConstantsTester") diff --git a/Geometry/RPCGeometryBuilder/interface/RPCGeometryParsFromDD.h b/Geometry/RPCGeometryBuilder/interface/RPCGeometryParsFromDD.h index 11f395cd53e0f..cbe1bdcca56a1 100644 --- a/Geometry/RPCGeometryBuilder/interface/RPCGeometryParsFromDD.h +++ b/Geometry/RPCGeometryBuilder/interface/RPCGeometryParsFromDD.h @@ -2,7 +2,7 @@ #define RPCGeometry_RPCGeometryParsFromDD_H /* \class RPCGeometryParsFromDD - * Build the RPCGeometry from the DDD and DD4Hep description + * Build the RPCGeometry from the DDD and DD4hep description * * DD4hep part added to the original old file (DD version) made by M. Maggi (INFN Bari) * Author: Sergio Lo Meo (sergio.lo.meo@cern.ch) @@ -16,7 +16,7 @@ class DDCompactView; class DDFilteredView; -namespace cms { // DD4Hep +namespace cms { // DD4hep class DDFilteredView; class DDCompactView; } // namespace cms @@ -32,13 +32,13 @@ class RPCGeometryParsFromDD { // DD void build(const DDCompactView* cview, const MuonGeometryConstants& muonConstants, RecoIdealGeometry& rgeo); - // DD4Hep + // DD4hep void build(const cms::DDCompactView* cview, const MuonGeometryConstants& muonConstants, RecoIdealGeometry& rgeo); private: // DD void buildGeometry(DDFilteredView& fview, const MuonGeometryConstants& muonConstants, RecoIdealGeometry& rgeo); - // DD4Hep + // DD4hep void buildGeometry(cms::DDFilteredView& fview, const MuonGeometryConstants& muonConstants, RecoIdealGeometry& rgeo); }; diff --git a/Geometry/RPCGeometryBuilder/src/RPCGeometryParsFromDD.cc b/Geometry/RPCGeometryBuilder/src/RPCGeometryParsFromDD.cc index 1d67df65876bd..21027219df91e 100644 --- a/Geometry/RPCGeometryBuilder/src/RPCGeometryParsFromDD.cc +++ b/Geometry/RPCGeometryBuilder/src/RPCGeometryParsFromDD.cc @@ -1,5 +1,5 @@ /* Implementation of the RPCGeometryParsFromDD Class - * Build the RPCGeometry from the DDD and DD4Hep description + * Build the RPCGeometry from the DDD and DD4hep description * * DD4hep part added to the original old file (DD version) made by M. Maggi (INFN Bari) * Author: Sergio Lo Meo (sergio.lo.meo@cern.ch) @@ -42,7 +42,7 @@ void RPCGeometryParsFromDD::build(const DDCompactView* cview, this->buildGeometry(fview, muonConstants, rgeo); } -// DD4Hep +// DD4hep void RPCGeometryParsFromDD::build(const cms::DDCompactView* cview, const MuonGeometryConstants& muonConstants, @@ -126,7 +126,7 @@ void RPCGeometryParsFromDD::buildGeometry(DDFilteredView& fview, } } -// DD4Hep +// DD4hep void RPCGeometryParsFromDD::buildGeometry(cms::DDFilteredView& fview, const MuonGeometryConstants& muonConstants, diff --git a/Geometry/TrackerGeometryBuilder/plugins/TrackerParametersESModule.cc b/Geometry/TrackerGeometryBuilder/plugins/TrackerParametersESModule.cc index 5505e2a59c842..d1721e41c9c94 100644 --- a/Geometry/TrackerGeometryBuilder/plugins/TrackerParametersESModule.cc +++ b/Geometry/TrackerGeometryBuilder/plugins/TrackerParametersESModule.cc @@ -33,27 +33,27 @@ class TrackerParametersESModule : public edm::ESProducer { private: edm::ESGetToken cpvTokenDDD_; - edm::ESGetToken cpvTokenDD4Hep_; - bool fromDD4Hep_; + edm::ESGetToken cpvTokenDD4hep_; + bool fromDD4hep_; }; TrackerParametersESModule::TrackerParametersESModule(const edm::ParameterSet& ps) { - fromDD4Hep_ = ps.getParameter("fromDD4Hep"); + fromDD4hep_ = ps.getParameter("fromDD4hep"); auto cc = setWhatProduced(this); - if (fromDD4Hep_) - cpvTokenDD4Hep_ = cc.consumesFrom(edm::ESInputTag()); + if (fromDD4hep_) + cpvTokenDD4hep_ = cc.consumesFrom(edm::ESInputTag()); else cpvTokenDDD_ = cc.consumesFrom(edm::ESInputTag()); #ifdef EDM_ML_DEBUG edm::LogVerbatim("TrackerGeom") << "TrackerParametersESModule::TrackerParametersESModule called with dd4hep: " - << fromDD4Hep_; + << fromDD4hep_; #endif } void TrackerParametersESModule::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { edm::ParameterSetDescription desc; - desc.add("fromDD4Hep", false); + desc.add("fromDD4hep", false); descriptions.add("trackerParameters", desc); } @@ -63,11 +63,11 @@ TrackerParametersESModule::ReturnType TrackerParametersESModule::produce(const P auto ptp = std::make_unique(); TrackerParametersFromDD builder; - if (fromDD4Hep_) { + if (fromDD4hep_) { #ifdef EDM_ML_DEBUG edm::LogVerbatim("TrackerGeom") << "TrackerParametersESModule::produce try to access cms::DDCompactView"; #endif - edm::ESTransientHandle cpv = iRecord.getTransientHandle(cpvTokenDD4Hep_); + edm::ESTransientHandle cpv = iRecord.getTransientHandle(cpvTokenDD4hep_); builder.build(&(*cpv), *ptp); } else { #ifdef EDM_ML_DEBUG diff --git a/Geometry/TrackerGeometryBuilder/python/trackerParameters_cff.py b/Geometry/TrackerGeometryBuilder/python/trackerParameters_cff.py index 01229fb962cd9..44725f4836b43 100644 --- a/Geometry/TrackerGeometryBuilder/python/trackerParameters_cff.py +++ b/Geometry/TrackerGeometryBuilder/python/trackerParameters_cff.py @@ -5,5 +5,5 @@ from Configuration.ProcessModifiers.dd4hep_cff import dd4hep dd4hep.toModify(trackerParameters, - fromDD4Hep = cms.bool(True), + fromDD4hep = cms.bool(True), ) diff --git a/Geometry/VeryForwardGeometryBuilder/interface/DetGeomDesc.h b/Geometry/VeryForwardGeometryBuilder/interface/DetGeomDesc.h index 76fdf0002bfe2..0981ba480ae6f 100644 --- a/Geometry/VeryForwardGeometryBuilder/interface/DetGeomDesc.h +++ b/Geometry/VeryForwardGeometryBuilder/interface/DetGeomDesc.h @@ -57,7 +57,7 @@ class DetGeomDesc { // Constructor from old DD DDFilteredView /// \param[in] isRun2 Switch between legacy run 2-like geometry and 2021+ scenarii DetGeomDesc(const DDFilteredView& fv, const bool isRun2); - // Constructor from DD4Hep DDFilteredView + // Constructor from DD4hep DDFilteredView /// \param[in] isRun2 Switch between legacy run 2-like geometry and 2021+ scenarii DetGeomDesc(const cms::DDFilteredView& fv, const bool isRun2); // Constructor from DB object PDetGeomDesc diff --git a/Geometry/VeryForwardGeometryBuilder/src/DetGeomDesc.cc b/Geometry/VeryForwardGeometryBuilder/src/DetGeomDesc.cc index 49c169c12ae4b..9fdc7b79f924a 100644 --- a/Geometry/VeryForwardGeometryBuilder/src/DetGeomDesc.cc +++ b/Geometry/VeryForwardGeometryBuilder/src/DetGeomDesc.cc @@ -41,7 +41,7 @@ DetGeomDesc::DetGeomDesc(const DDFilteredView& fv, const bool isRun2) {} /* - * Constructor from DD4Hep DDFilteredView, also using the SpecPars to access 2x2 wafers info. + * Constructor from DD4hep DDFilteredView, also using the SpecPars to access 2x2 wafers info. */ DetGeomDesc::DetGeomDesc(const cms::DDFilteredView& fv, const bool isRun2) : m_name(computeNameWithNoNamespace(fv.name())), diff --git a/SimG4Core/Application/interface/OscarMTMasterThread.h b/SimG4Core/Application/interface/OscarMTMasterThread.h index bb066beab35fd..5b5e58984ad2e 100644 --- a/SimG4Core/Application/interface/OscarMTMasterThread.h +++ b/SimG4Core/Application/interface/OscarMTMasterThread.h @@ -58,10 +58,10 @@ class OscarMTMasterThread { // ES products needed for Geant4 initialization mutable const DDCompactView* m_pDDD = nullptr; - mutable const cms::DDCompactView* m_pDD4Hep = nullptr; + mutable const cms::DDCompactView* m_pDD4hep = nullptr; mutable const HepPDT::ParticleDataTable* m_pTable = nullptr; mutable edm::ESGetToken m_DDD; - mutable edm::ESGetToken m_DD4Hep; + mutable edm::ESGetToken m_DD4hep; mutable edm::ESGetToken m_PDT; // status flags diff --git a/SimG4Core/Application/python/g4SimHits_cfi.py b/SimG4Core/Application/python/g4SimHits_cfi.py index bec35d1b1c7ac..7e234e027fdd6 100644 --- a/SimG4Core/Application/python/g4SimHits_cfi.py +++ b/SimG4Core/Application/python/g4SimHits_cfi.py @@ -646,7 +646,7 @@ TmaxHits = cms.vdouble(1000.0,1000.0,1000.0,1000.0,2000.0) ) ## -## DD4Hep migration +## DD4hep migration ## from Configuration.ProcessModifiers.dd4hep_cff import dd4hep dd4hep.toModify( g4SimHits, g4GeometryDD4hepSource = True ) diff --git a/SimG4Core/Application/src/OscarMTMasterThread.cc b/SimG4Core/Application/src/OscarMTMasterThread.cc index 6c4772a4aafdd..e3a0ae25759b5 100644 --- a/SimG4Core/Application/src/OscarMTMasterThread.cc +++ b/SimG4Core/Application/src/OscarMTMasterThread.cc @@ -16,7 +16,7 @@ OscarMTMasterThread::OscarMTMasterThread(const edm::ParameterSet& iConfig) std::unique_lock lk(m_threadMutex); edm::LogVerbatim("SimG4CoreApplication") - << "OscarMTMasterThread: creating master thread DD4Hep: " << m_pGeoFromDD4hep; + << "OscarMTMasterThread: creating master thread DD4hep: " << m_pGeoFromDD4hep; // Create Geant4 master thread m_masterThread = std::thread([&]() { @@ -56,7 +56,7 @@ OscarMTMasterThread::OscarMTMasterThread(const edm::ParameterSet& iConfig) if (m_masterThreadState == ThreadState::BeginRun) { // Initialize Geant4 edm::LogVerbatim("OscarMTMasterThread") << "Master thread: Initializing Geant4"; - m_runManagerMaster->initG4(m_pDDD, m_pDD4Hep, m_pTable); + m_runManagerMaster->initG4(m_pDDD, m_pDD4hep, m_pTable); isG4Alive = true; } else if (m_masterThreadState == ThreadState::EndRun) { // Stop Geant4 @@ -109,7 +109,7 @@ void OscarMTMasterThread::callConsumes(edm::ConsumesCollector&& iC) const { return; } if (m_pGeoFromDD4hep) { - m_DD4Hep = iC.esConsumes(); + m_DD4hep = iC.esConsumes(); } else { m_DDD = iC.esConsumes(); } @@ -124,7 +124,7 @@ void OscarMTMasterThread::beginRun(const edm::EventSetup& iSetup) const { if (m_firstRun) { if (m_pGeoFromDD4hep) { - m_pDD4Hep = &(*iSetup.getTransientHandle(m_DD4Hep)); + m_pDD4hep = &(*iSetup.getTransientHandle(m_DD4hep)); } else { m_pDDD = &(*iSetup.getTransientHandle(m_DDD)); } diff --git a/SimG4Core/Application/src/RunManagerMT.cc b/SimG4Core/Application/src/RunManagerMT.cc index 061fbb3c79499..34faa9e82dcab 100644 --- a/SimG4Core/Application/src/RunManagerMT.cc +++ b/SimG4Core/Application/src/RunManagerMT.cc @@ -105,7 +105,7 @@ void RunManagerMT::initG4(const DDCompactView* pDD, int verb = m_pPhysics.getUntrackedParameter("Verbosity", 0); int stepverb = m_p.getUntrackedParameter("SteppingVerbosity", 0); edm::LogVerbatim("SimG4CoreApplication") - << "RunManagerMT: start initialising of geometry DD4Hep: " << geoFromDD4hep << "\n" + << "RunManagerMT: start initialising of geometry DD4hep: " << geoFromDD4hep << "\n" << " cutsPerRegion: " << cuts << " cutForProton: " << protonCut << "\n" << " G4 verbosity: " << verb; diff --git a/SimG4Core/Configuration/test/dd4hepTTBar2026D77_cfg.py b/SimG4Core/Configuration/test/dd4hepTTBar2026D77_cfg.py index 054ef2555b1f0..7876f2ae41ae7 100644 --- a/SimG4Core/Configuration/test/dd4hepTTBar2026D77_cfg.py +++ b/SimG4Core/Configuration/test/dd4hepTTBar2026D77_cfg.py @@ -49,7 +49,7 @@ dataTier = cms.untracked.string('GEN-SIM'), filterName = cms.untracked.string('') ), - fileName = cms.untracked.string('file:step1DD4Hep.root'), + fileName = cms.untracked.string('file:step1DD4hep.root'), outputCommands = process.FEVTDEBUGEventContent.outputCommands, splitLevel = cms.untracked.int32(0) ) diff --git a/SimG4Core/Configuration/test/dd4hepTTBar2026D83_cfg.py b/SimG4Core/Configuration/test/dd4hepTTBar2026D83_cfg.py index 53d369cc91d17..543d74cb45653 100644 --- a/SimG4Core/Configuration/test/dd4hepTTBar2026D83_cfg.py +++ b/SimG4Core/Configuration/test/dd4hepTTBar2026D83_cfg.py @@ -49,7 +49,7 @@ dataTier = cms.untracked.string('GEN-SIM'), filterName = cms.untracked.string('') ), - fileName = cms.untracked.string('file:step1DD4Hep.root'), + fileName = cms.untracked.string('file:step1DD4hep.root'), outputCommands = process.FEVTDEBUGEventContent.outputCommands, splitLevel = cms.untracked.int32(0) ) diff --git a/SimG4Core/Geometry/src/DDDWorld.cc b/SimG4Core/Geometry/src/DDDWorld.cc index 84aba2eb58cc1..4c56c05cce178 100644 --- a/SimG4Core/Geometry/src/DDDWorld.cc +++ b/SimG4Core/Geometry/src/DDDWorld.cc @@ -28,7 +28,7 @@ DDDWorld::DDDWorld(const DDCompactView *pDD, bool pcut) { LogVerbatim("SimG4CoreApplication") << "+++ DDDWorld: initialisation of Geant4 geometry"; if (pDD4hep) { - // DD4Hep + // DD4hep const cms::DDDetector *det = pDD4hep->detector(); dd4hep::sim::Geant4GeometryMaps::VolumeMap lvMap; diff --git a/SimG4Core/GeometryProducer/interface/GeometryProducer.h b/SimG4Core/GeometryProducer/interface/GeometryProducer.h index f57e7f23cd611..860653a69174c 100644 --- a/SimG4Core/GeometryProducer/interface/GeometryProducer.h +++ b/SimG4Core/GeometryProducer/interface/GeometryProducer.h @@ -81,7 +81,7 @@ class GeometryProducer : public edm::one::EDProducer tokMF_; edm::ESGetToken tokDDD_; - edm::ESGetToken tokDD4Hep_; + edm::ESGetToken tokDD4hep_; }; #endif diff --git a/SimG4Core/GeometryProducer/src/GeometryProducer.cc b/SimG4Core/GeometryProducer/src/GeometryProducer.cc index 2ce4d108db1ff..4e6a9cecf13cf 100644 --- a/SimG4Core/GeometryProducer/src/GeometryProducer.cc +++ b/SimG4Core/GeometryProducer/src/GeometryProducer.cc @@ -72,7 +72,7 @@ GeometryProducer::GeometryProducer(edm::ParameterSet const &p) m_sdMakers = sim::sensitiveDetectorMakers(m_p, consumesCollector(), std::vector()); tokMF_ = esConsumes(); if (m_pGeoFromDD4hep) { - tokDD4Hep_ = esConsumes(); + tokDD4hep_ = esConsumes(); } else { tokDDD_ = esConsumes(); } @@ -124,7 +124,7 @@ void GeometryProducer::produce(edm::Event &e, const edm::EventSetup &es) { edm::LogVerbatim("GeometryProducer") << " GeometryProducer initializing "; // DDDWorld: get the DDCV from the ES and use it to build the World if (m_pGeoFromDD4hep) { - m_pDD4hep = &es.getData(tokDD4Hep_); + m_pDD4hep = &es.getData(tokDD4hep_); } else { m_pDD = &es.getData(tokDDD_); } diff --git a/SimG4Core/PrintGeomInfo/plugins/PrintGeomInfoAction.cc b/SimG4Core/PrintGeomInfo/plugins/PrintGeomInfoAction.cc index 5dcec80fef5c9..310773729535b 100644 --- a/SimG4Core/PrintGeomInfo/plugins/PrintGeomInfoAction.cc +++ b/SimG4Core/PrintGeomInfo/plugins/PrintGeomInfoAction.cc @@ -100,7 +100,7 @@ PrintGeomInfoAction::PrintGeomInfoAction(const edm::ParameterSet &p) { dumpReplica_ = p.getUntrackedParameter("DumpReplica", false); dumpTouch_ = p.getUntrackedParameter("DumpTouch", false); dumpSense_ = p.getUntrackedParameter("DumpSense", false); - dd4hep_ = p.getUntrackedParameter("DD4Hep", false); + dd4hep_ = p.getUntrackedParameter("DD4hep", false); name_ = p.getUntrackedParameter("Name", "*"); nchar_ = name_.find('*'); name_.assign(name_, 0, nchar_); diff --git a/SimG4Core/PrintGeomInfo/plugins/PrintGeomSolids.cc b/SimG4Core/PrintGeomInfo/plugins/PrintGeomSolids.cc index 9dcba9809f383..9b615cee1d568 100644 --- a/SimG4Core/PrintGeomInfo/plugins/PrintGeomSolids.cc +++ b/SimG4Core/PrintGeomInfo/plugins/PrintGeomSolids.cc @@ -35,30 +35,30 @@ class PrintGeomSolids : public edm::one::EDAnalyzer<> { private: edm::ESGetToken cpvTokenDDD_; - edm::ESGetToken cpvTokenDD4Hep_; - bool fromDD4Hep_; + edm::ESGetToken cpvTokenDD4hep_; + bool fromDD4hep_; }; PrintGeomSolids::PrintGeomSolids(const edm::ParameterSet& ps) { - fromDD4Hep_ = ps.getParameter("fromDD4Hep"); - if (fromDD4Hep_) - cpvTokenDD4Hep_ = esConsumes(edm::ESInputTag()); + fromDD4hep_ = ps.getParameter("fromDD4hep"); + if (fromDD4hep_) + cpvTokenDD4hep_ = esConsumes(edm::ESInputTag()); else cpvTokenDDD_ = esConsumes(edm::ESInputTag()); - edm::LogVerbatim("PrintGeom") << "PrintGeomSolids created with dd4hep: " << fromDD4Hep_; + edm::LogVerbatim("PrintGeom") << "PrintGeomSolids created with dd4hep: " << fromDD4hep_; } void PrintGeomSolids::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { edm::ParameterSetDescription desc; - desc.add("fromDD4Hep", false); + desc.add("fromDD4hep", false); descriptions.add("printGeomSolids", desc); } void PrintGeomSolids::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) { int solids(0); - if (fromDD4Hep_) { - edm::ESTransientHandle cpv = iSetup.getTransientHandle(cpvTokenDD4Hep_); + if (fromDD4hep_) { + edm::ESTransientHandle cpv = iSetup.getTransientHandle(cpvTokenDD4hep_); const cms::DDDetector* det = cpv->detector(); TGeoManager const& geom = det->description()->manager(); TGeoIterator next(geom.GetTopVolume()); diff --git a/SimG4Core/PrintGeomInfo/python/customiseg4PrintGeomInfo.py b/SimG4Core/PrintGeomInfo/python/customiseg4PrintGeomInfo.py index 87ed9269d4b22..7fda6685fefac 100644 --- a/SimG4Core/PrintGeomInfo/python/customiseg4PrintGeomInfo.py +++ b/SimG4Core/PrintGeomInfo/python/customiseg4PrintGeomInfo.py @@ -19,7 +19,7 @@ def customise(process): DumpReplica = cms.untracked.bool(False), DumpTouch = cms.untracked.bool(False), DumpSense = cms.untracked.bool(False), - DD4Hep = cms.untracked.bool(False), + DD4hep = cms.untracked.bool(False), Name = cms.untracked.string('CMS*'), Names = cms.untracked.vstring(' '), type = cms.string('PrintGeomInfoAction') diff --git a/SimG4Core/PrintGeomInfo/python/g4PrintGeomInfo_cfi.py b/SimG4Core/PrintGeomInfo/python/g4PrintGeomInfo_cfi.py index 459f796d743d0..fc11e7fa4cb97 100644 --- a/SimG4Core/PrintGeomInfo/python/g4PrintGeomInfo_cfi.py +++ b/SimG4Core/PrintGeomInfo/python/g4PrintGeomInfo_cfi.py @@ -51,7 +51,7 @@ def printGeomInfo(process): DumpReplica = cms.untracked.bool(False), DumpTouch = cms.untracked.bool(False), DumpSense = cms.untracked.bool(False), - DD4Hep = cms.untracked.bool(False), + DD4hep = cms.untracked.bool(False), Name = cms.untracked.string('TotemT*'), Names = cms.untracked.vstring(' '), type = cms.string('PrintGeomInfoAction') diff --git a/SimG4Core/PrintGeomInfo/python/printGeomSolids_cff.py b/SimG4Core/PrintGeomInfo/python/printGeomSolids_cff.py index ec2486253cd81..31bddd00d391f 100644 --- a/SimG4Core/PrintGeomInfo/python/printGeomSolids_cff.py +++ b/SimG4Core/PrintGeomInfo/python/printGeomSolids_cff.py @@ -5,5 +5,5 @@ from Configuration.ProcessModifiers.dd4hep_cff import dd4hep dd4hep.toModify(printGeomSolids, - fromDD4Hep = cms.bool(True), + fromDD4hep = cms.bool(True), ) diff --git a/SimG4Core/PrintGeomInfo/test/SimFileCompare.cpp b/SimG4Core/PrintGeomInfo/test/SimFileCompare.cpp index bea0d0746eec2..d20fb2f2b2cb1 100644 --- a/SimG4Core/PrintGeomInfo/test/SimFileCompare.cpp +++ b/SimG4Core/PrintGeomInfo/test/SimFileCompare.cpp @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // -// Compares output files from PrintGeomInfo created using DDD and DD4Hep +// Compares output files from PrintGeomInfo created using DDD and DD4hep // inputs. Usage: // // SimFileCompare infile1 infile2 type files mode debug diff --git a/SimG4Core/PrintGeomInfo/test/python/runDD4HepBigXML_cfg.py b/SimG4Core/PrintGeomInfo/test/python/runDD4HepBigXML_cfg.py index 564193e4fd96b..c47e59cb92241 100644 --- a/SimG4Core/PrintGeomInfo/test/python/runDD4HepBigXML_cfg.py +++ b/SimG4Core/PrintGeomInfo/test/python/runDD4HepBigXML_cfg.py @@ -34,14 +34,14 @@ DumpReplica = cms.untracked.bool(False), DumpTouch = cms.untracked.bool(False), DumpSense = cms.untracked.bool(False), - DD4Hep = cms.untracked.bool(True), + DD4hep = cms.untracked.bool(True), Name = cms.untracked.string(''), Names = cms.untracked.vstring(''), - MaterialFileName = cms.untracked.string('matfileBigDD4Hep.txt'), - SolidFileName = cms.untracked.string('solidfileBigDD4Hep.txt'), - LVFileName = cms.untracked.string('lvfileBigDD4Hep.txt'), - PVFileName = cms.untracked.string('pvfileBigDD4Hep.txt'), - TouchFileName = cms.untracked.string('touchfileBigDD4Hep.txt'), + MaterialFileName = cms.untracked.string('matfileBigDD4hep.txt'), + SolidFileName = cms.untracked.string('solidfileBigDD4hep.txt'), + LVFileName = cms.untracked.string('lvfileBigDD4hep.txt'), + PVFileName = cms.untracked.string('pvfileBigDD4hep.txt'), + TouchFileName = cms.untracked.string('touchfileBigDD4hep.txt'), FileDetail = cms.untracked.bool(True), type = cms.string('PrintGeomInfoAction') )) diff --git a/SimG4Core/PrintGeomInfo/test/python/runDD4HepDB_cfg.py b/SimG4Core/PrintGeomInfo/test/python/runDD4HepDB_cfg.py index 9afd8c037350f..e036e93b003ff 100644 --- a/SimG4Core/PrintGeomInfo/test/python/runDD4HepDB_cfg.py +++ b/SimG4Core/PrintGeomInfo/test/python/runDD4HepDB_cfg.py @@ -29,14 +29,14 @@ DumpReplica = cms.untracked.bool(False), DumpTouch = cms.untracked.bool(False), DumpSense = cms.untracked.bool(False), - DD4Hep = cms.untracked.bool(True), + DD4hep = cms.untracked.bool(True), Name = cms.untracked.string(''), Names = cms.untracked.vstring(''), - MaterialFileName = cms.untracked.string('matfileDD4HepDB.txt'), - SolidFileName = cms.untracked.string('solidfileDD4HepDB.txt'), - LVFileName = cms.untracked.string('lvfileDD4HepDB.txt'), - PVFileName = cms.untracked.string('pvfileDD4HepDB.txt'), - TouchFileName = cms.untracked.string('touchfileDD4HepDB.txt'), + MaterialFileName = cms.untracked.string('matfileDD4hepDB.txt'), + SolidFileName = cms.untracked.string('solidfileDD4hepDB.txt'), + LVFileName = cms.untracked.string('lvfileDD4hepDB.txt'), + PVFileName = cms.untracked.string('pvfileDD4hepDB.txt'), + TouchFileName = cms.untracked.string('touchfileDD4hepDB.txt'), FileDetail = cms.untracked.bool(True), type = cms.string('PrintGeomInfoAction') )) diff --git a/SimG4Core/PrintGeomInfo/test/python/runDD4HepXML_cfg.py b/SimG4Core/PrintGeomInfo/test/python/runDD4HepXML_cfg.py index 369a04054df99..8c3e4847a65d9 100644 --- a/SimG4Core/PrintGeomInfo/test/python/runDD4HepXML_cfg.py +++ b/SimG4Core/PrintGeomInfo/test/python/runDD4HepXML_cfg.py @@ -31,14 +31,14 @@ DumpReplica = cms.untracked.bool(False), DumpTouch = cms.untracked.bool(False), DumpSense = cms.untracked.bool(False), - DD4Hep = cms.untracked.bool(True), + DD4hep = cms.untracked.bool(True), Name = cms.untracked.string(''), Names = cms.untracked.vstring(''), - MaterialFileName = cms.untracked.string('matfileDD4Hep.txt'), - SolidFileName = cms.untracked.string('solidfileDD4Hep.txt'), - LVFileName = cms.untracked.string('lvfileDD4Hep.txt'), - PVFileName = cms.untracked.string('pvfileDD4Hep.txt'), - TouchFileName = cms.untracked.string('touchfileDD4Hep.txt'), + MaterialFileName = cms.untracked.string('matfileDD4hep.txt'), + SolidFileName = cms.untracked.string('solidfileDD4hep.txt'), + LVFileName = cms.untracked.string('lvfileDD4hep.txt'), + PVFileName = cms.untracked.string('pvfileDD4hep.txt'), + TouchFileName = cms.untracked.string('touchfileDD4hep.txt'), FileDetail = cms.untracked.bool(True), type = cms.string('PrintGeomInfoAction') )) diff --git a/SimG4Core/PrintGeomInfo/test/python/runDDDBigXML_cfg.py b/SimG4Core/PrintGeomInfo/test/python/runDDDBigXML_cfg.py index 5a9280f668273..26d9255eddaaa 100644 --- a/SimG4Core/PrintGeomInfo/test/python/runDDDBigXML_cfg.py +++ b/SimG4Core/PrintGeomInfo/test/python/runDDDBigXML_cfg.py @@ -32,7 +32,7 @@ DumpReplica = cms.untracked.bool(False), DumpTouch = cms.untracked.bool(False), DumpSense = cms.untracked.bool(False), - DD4Hep = cms.untracked.bool(False), + DD4hep = cms.untracked.bool(False), Name = cms.untracked.string(''), Names = cms.untracked.vstring(''), MaterialFileName = cms.untracked.string('matfileBigDDD.txt'), diff --git a/SimG4Core/PrintGeomInfo/test/python/runDDDDB_cfg.py b/SimG4Core/PrintGeomInfo/test/python/runDDDDB_cfg.py index f964ca32f164b..14b720bf108c0 100644 --- a/SimG4Core/PrintGeomInfo/test/python/runDDDDB_cfg.py +++ b/SimG4Core/PrintGeomInfo/test/python/runDDDDB_cfg.py @@ -31,7 +31,7 @@ DumpReplica = cms.untracked.bool(False), DumpTouch = cms.untracked.bool(False), DumpSense = cms.untracked.bool(False), - DD4Hep = cms.untracked.bool(False), + DD4hep = cms.untracked.bool(False), Name = cms.untracked.string(''), Names = cms.untracked.vstring(''), MaterialFileName = cms.untracked.string('matfileDDDDB.txt'), diff --git a/SimG4Core/PrintGeomInfo/test/python/runDDDXML_cfg.py b/SimG4Core/PrintGeomInfo/test/python/runDDDXML_cfg.py index 0538de1a251af..b72ebf1cf3db0 100644 --- a/SimG4Core/PrintGeomInfo/test/python/runDDDXML_cfg.py +++ b/SimG4Core/PrintGeomInfo/test/python/runDDDXML_cfg.py @@ -37,7 +37,7 @@ DumpReplica = cms.untracked.bool(False), DumpTouch = cms.untracked.bool(False), DumpSense = cms.untracked.bool(False), - DD4Hep = cms.untracked.bool(False), + DD4hep = cms.untracked.bool(False), Name = cms.untracked.string(''), Names = cms.untracked.vstring(''), MaterialFileName = cms.untracked.string('matfileDDD.txt'),