diff --git a/CondTools/Geometry/plugins/GEMRecoIdealDBLoader.cc b/CondTools/Geometry/plugins/GEMRecoIdealDBLoader.cc index 94b202b17defe..599ceda3f6917 100644 --- a/CondTools/Geometry/plugins/GEMRecoIdealDBLoader.cc +++ b/CondTools/Geometry/plugins/GEMRecoIdealDBLoader.cc @@ -36,7 +36,7 @@ class GEMRecoIdealDBLoader : public edm::one::EDAnalyzer { }; 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(); @@ -58,7 +58,7 @@ void GEMRecoIdealDBLoader::beginRun(const edm::Run&, edm::EventSetup const& es) RecoIdealGeometry* rig = new RecoIdealGeometry; if (fromDD4hep_) { - edm::LogVerbatim("GEMRecoIdealDBLoader") << "(0) GEMRecoIdealDBLoader - DD4HEP "; + edm::LogVerbatim("GEMRecoIdealDBLoader") << "(0) GEMRecoIdealDBLoader - DD4hep "; auto pDD = es.getTransientHandle(dd4HepCompactViewToken_); const cms::DDCompactView& cpv = *pDD; rpcpd.build(&cpv, *pMNDC, *rig); diff --git a/CondTools/Geometry/plugins/ME0RecoIdealDBLoader.cc b/CondTools/Geometry/plugins/ME0RecoIdealDBLoader.cc index b1573895d1afe..89de15af570f1 100644 --- a/CondTools/Geometry/plugins/ME0RecoIdealDBLoader.cc +++ b/CondTools/Geometry/plugins/ME0RecoIdealDBLoader.cc @@ -34,7 +34,7 @@ class ME0RecoIdealDBLoader : public edm::one::EDAnalyzer { }; 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(); @@ -54,7 +54,7 @@ void ME0RecoIdealDBLoader::beginRun(const edm::Run&, edm::EventSetup const& es) ME0GeometryParsFromDD me0pd; RecoIdealGeometry* rig = new RecoIdealGeometry; if (fromDD4hep_) { - edm::LogVerbatim("ME0RecoIdealDBLoader") << "(0) ME0RecoIdealDBLoader - DD4HEP "; + edm::LogVerbatim("ME0RecoIdealDBLoader") << "(0) ME0RecoIdealDBLoader - DD4hep "; auto pDD = es.getTransientHandle(dd4HepCompactViewToken_); const cms::DDCompactView& cpv = *pDD; me0pd.build(&cpv, *pMNDC, *rig); diff --git a/Configuration/Geometry/python/GeometryDDDSimDB_cff.py b/Configuration/Geometry/python/GeometryDDDSimDB_cff.py index cfdc361714b58..5f71c3346d5ac 100644 --- a/Configuration/Geometry/python/GeometryDDDSimDB_cff.py +++ b/Configuration/Geometry/python/GeometryDDDSimDB_cff.py @@ -6,7 +6,7 @@ # Ideal geometry, needed for simulation # # Strictly xpeaking muonOffsetESProducer_cff is not needed; -# added for consistency with the DD4Hep version +# added for consistency with the DD4hep version # from GeometryReaders.XMLIdealGeometryESSource.cmsGeometryDB_cff import * from Geometry.MuonNumbering.muonNumberingInitialization_cfi import * diff --git a/Configuration/PyReleaseValidation/README.md b/Configuration/PyReleaseValidation/README.md index 6f5395d74d9bc..a66d10e4430f1 100644 --- a/Configuration/PyReleaseValidation/README.md +++ b/Configuration/PyReleaseValidation/README.md @@ -61,8 +61,8 @@ The offsets currently in use are: * 0.999: 0.99 with Phase-2 premixing with PU50 * 0.9821: Production-like premixing stage2 * 0.9921: Production-like premixing stage1+stage2 -* 0.911: DD4Hep reading geometry from XML -* 0.912: DD4Hep reading geometry from the DB +* 0.911: DD4hep reading geometry from XML +* 0.912: DD4hep reading geometry from the DB * 0.914: DDD DB * 0.101: Phase-2 aging, 1000fb-1 * 0.103: Phase-2 aging, 3000fb-1 diff --git a/Configuration/PyReleaseValidation/python/relval_2017.py b/Configuration/PyReleaseValidation/python/relval_2017.py index 1dd7cd8f9c419..4a67dae077793 100644 --- a/Configuration/PyReleaseValidation/python/relval_2017.py +++ b/Configuration/PyReleaseValidation/python/relval_2017.py @@ -27,7 +27,7 @@ # (Patatrack pixel-only: TTbar - on CPU: quadruplets, triplets) # (Patatrack ECAL-only: TTbar - on CPU) # (Patatrack HCAL-only: TTbar - on CPU) -# 2021 (DD4HEP XML: TTbar, ZMM) +# 2021 (DD4hep XML: TTbar, ZMM) # (DDD DB: TTbar, ZMM) # (ele guns 10, 35, 1000; pho guns 10, 35; mu guns 1, 10, 100, 1000, QCD 3TeV, QCD Flat) # (ZMM, TTbar, ZEE, MinBias, TTbar PU, TTbar PU premix, ZEE PU, TTbar design, GluGluTo2Jets, GluGluTo2Jets PU) diff --git a/DetectorDescription/DDCMS/plugins/BuildFile.xml b/DetectorDescription/DDCMS/plugins/BuildFile.xml index 3bac0040bd395..5661d19f4ce18 100644 --- a/DetectorDescription/DDCMS/plugins/BuildFile.xml +++ b/DetectorDescription/DDCMS/plugins/BuildFile.xml @@ -16,7 +16,7 @@ - + diff --git a/DetectorDescription/DDCMS/plugins/DDDetectorESProducer.cc b/DetectorDescription/DDCMS/plugins/DDDetectorESProducer.cc index 640e24c1db61d..bad693fcc759d 100644 --- a/DetectorDescription/DDCMS/plugins/DDDetectorESProducer.cc +++ b/DetectorDescription/DDCMS/plugins/DDDetectorESProducer.cc @@ -69,7 +69,7 @@ DDDetectorESProducer::DDDetectorESProducer(const ParameterSet& iConfig) confGeomXMLFiles_(fromDB_ ? "none" : iConfig.getParameter("confGeomXMLFiles").fullPath()), rootDDName_(iConfig.getParameter("rootDDName")), label_(iConfig.getParameter("label")) { - usesResources({edm::ESSharedResourceNames::kDD4Hep}); + usesResources({edm::ESSharedResourceNames::kDD4hep}); edm::LogVerbatim("Geometry") << "DDDetectorESProducer::fromDB " << fromDB_ << " appendToDataLabel " << appendToDataLabel_ << " rootDDName " << rootDDName_ << " label " << label_ << " confGeomXMLFiles " << confGeomXMLFiles_; diff --git a/DetectorDescription/DDCMS/plugins/test/DDTestDumpFile.cc b/DetectorDescription/DDCMS/plugins/test/DDTestDumpFile.cc index 7be824e03a8e2..231c444369264 100644 --- a/DetectorDescription/DDCMS/plugins/test/DDTestDumpFile.cc +++ b/DetectorDescription/DDCMS/plugins/test/DDTestDumpFile.cc @@ -37,7 +37,7 @@ class DDTestDumpFile : public one::EDAnalyzer<> { DDTestDumpFile::DDTestDumpFile(const ParameterSet& iConfig) : m_tag(iConfig.getUntrackedParameter("tag", "unknown")), - m_outputFileName(iConfig.getUntrackedParameter("outputFileName", "cmsDD4HepGeom.root")), + m_outputFileName(iConfig.getUntrackedParameter("outputFileName", "cmsDD4hepGeom.root")), m_label(iConfig.getParameter("DDDetector")), m_token(esConsumes(m_label)) {} diff --git a/FWCore/Concurrency/interface/SharedResourceNames.h b/FWCore/Concurrency/interface/SharedResourceNames.h index 0fcd634e8cca4..c063cd7eea7ef 100644 --- a/FWCore/Concurrency/interface/SharedResourceNames.h +++ b/FWCore/Concurrency/interface/SharedResourceNames.h @@ -35,7 +35,7 @@ namespace edm { class ESSharedResourceNames { public: static const std::string kDDGeometry; - static const std::string kDD4Hep; + static const std::string kDD4hep; }; // Each time the following function is called, it returns a different diff --git a/FWCore/Concurrency/src/SharedResourceNames.cc b/FWCore/Concurrency/src/SharedResourceNames.cc index b043e9bfd731f..7011235d15472 100644 --- a/FWCore/Concurrency/src/SharedResourceNames.cc +++ b/FWCore/Concurrency/src/SharedResourceNames.cc @@ -13,7 +13,7 @@ const std::string edm::SharedResourceNames::kEvtGen = "EvtGen"; const std::string edm::SharedResourceNames::kHerwig6 = "Herwig6"; const std::string edm::ESSharedResourceNames::kDDGeometry = "es_DDGeometry"; -const std::string edm::ESSharedResourceNames::kDD4Hep = "es_DD4Hep"; +const std::string edm::ESSharedResourceNames::kDD4hep = "es_DD4hep"; static std::atomic counter; diff --git a/Geometry/CSCGeometryBuilder/interface/CSCGeometryParsFromDD.h b/Geometry/CSCGeometryBuilder/interface/CSCGeometryParsFromDD.h index 9b032d0f6944f..60a5905b956de 100644 --- a/Geometry/CSCGeometryBuilder/interface/CSCGeometryParsFromDD.h +++ b/Geometry/CSCGeometryBuilder/interface/CSCGeometryParsFromDD.h @@ -6,7 +6,7 @@ // Description: CSC Geometry Pars for DD4hep // // -// \author Sergio Lo Meo (sergio.lo.meo@cern.ch) following what Ianna Osburne made for DTs (DD4HEP migration) +// \author Sergio Lo Meo (sergio.lo.meo@cern.ch) following what Ianna Osburne made for DTs (DD4hep migration) // Created: Thu, 05 March 2020 // Modified: Thu, 04 June 2020, following what made in PR #30047 // diff --git a/Geometry/CSCGeometryBuilder/plugins/CSCGeometryESModule.cc b/Geometry/CSCGeometryBuilder/plugins/CSCGeometryESModule.cc index 171df17d2177d..e8ef20f02b703 100644 --- a/Geometry/CSCGeometryBuilder/plugins/CSCGeometryESModule.cc +++ b/Geometry/CSCGeometryBuilder/plugins/CSCGeometryESModule.cc @@ -4,7 +4,7 @@ // Description: CSC ESModule for DD4hep // // -// \author Sergio Lo Meo (sergio.lo.meo@cern.ch) following what Ianna Osborne made for DTs (DD4HEP migration) +// \author Sergio Lo Meo (sergio.lo.meo@cern.ch) following what Ianna Osborne made for DTs (DD4hep migration) // Created: Thu, 05 March 2020 // Modified: Thu, 04 June 2020, following what made in PR #30047 // @@ -214,7 +214,7 @@ void CSCGeometryESModule::initCSCGeometry_(const MuonGeometryRecord& record, std builder.build(*host, cpv.product(), mdc); }); } else if (fromDD4hep_) { - edm::LogVerbatim("CSCGeoemtryESModule") << "(0) CSCGeometryESModule - DD4HEP "; + edm::LogVerbatim("CSCGeoemtryESModule") << "(0) CSCGeometryESModule - DD4hep "; host->ifRecordChanges(record, [&host, &record, this](auto const& rec) { host->clear(); edm::ESTransientHandle cpv = record.getTransientHandle(cpvTokendd4hep_); diff --git a/Geometry/CSCGeometryBuilder/plugins/CSCGeometryValidate.cc b/Geometry/CSCGeometryBuilder/plugins/CSCGeometryValidate.cc index cad9eb452ec63..2af4f1fccc748 100644 --- a/Geometry/CSCGeometryBuilder/plugins/CSCGeometryValidate.cc +++ b/Geometry/CSCGeometryBuilder/plugins/CSCGeometryValidate.cc @@ -4,7 +4,7 @@ Description: CSC GeometryValidate from DD & DD4hep // -// Author: Sergio Lo Meo (sergio.lo.meo@cern.ch) following what Ianna Osburne made for DTs (DD4HEP migration) +// Author: Sergio Lo Meo (sergio.lo.meo@cern.ch) following what Ianna Osburne made for DTs (DD4hep migration) // Created: Thu, 05 March 2020 */ diff --git a/Geometry/CSCGeometryBuilder/src/CSCGeometryBuilderFromDDD.cc b/Geometry/CSCGeometryBuilder/src/CSCGeometryBuilderFromDDD.cc index ceda1d2f63f3c..2da24f7dd4897 100644 --- a/Geometry/CSCGeometryBuilder/src/CSCGeometryBuilderFromDDD.cc +++ b/Geometry/CSCGeometryBuilder/src/CSCGeometryBuilderFromDDD.cc @@ -4,7 +4,7 @@ // Description: CSC Geometry Builder for DD4hep // // -// \author Sergio Lo Meo (sergio.lo.meo@cern.ch) following what Ianna Osburne made for DTs (DD4HEP migration) +// \author Sergio Lo Meo (sergio.lo.meo@cern.ch) following what Ianna Osburne made for DTs (DD4hep migration) // Created: Thu, 05 March 2020 // Modified: Thu, 04 June 2020, following what made in PR #30047 // @@ -51,7 +51,7 @@ void CSCGeometryBuilderFromDDD::build(CSCGeometry& geom, CSCGeometryParsFromDD cscp; if (!cscp.build(cview, muonConstants, rig, rdp)) { - throw cms::Exception("CSCGeometryBuilderFromDDD", "Failed to build the necessary objects from the DD4HEP"); + throw cms::Exception("CSCGeometryBuilderFromDDD", "Failed to build the necessary objects from the DD4hep"); } CSCGeometryBuilder realbuilder; diff --git a/Geometry/CSCGeometryBuilder/src/CSCGeometryBuilderFromDDD.h b/Geometry/CSCGeometryBuilder/src/CSCGeometryBuilderFromDDD.h index d076de490b79a..7523addb0aaba 100644 --- a/Geometry/CSCGeometryBuilder/src/CSCGeometryBuilderFromDDD.h +++ b/Geometry/CSCGeometryBuilder/src/CSCGeometryBuilderFromDDD.h @@ -6,7 +6,7 @@ // Description: CSC Geometry Builder for DD4hep // // -// \author Sergio Lo Meo (sergio.lo.meo@cern.ch) following what Ianna Osburne made for DTs (DD4HEP migration) +// \author Sergio Lo Meo (sergio.lo.meo@cern.ch) following what Ianna Osburne made for DTs (DD4hep migration) // Created: Thu, 05 March 2020 // Modified: Thu, 04 June 2020, following what made in PR #30047 // diff --git a/Geometry/CSCGeometryBuilder/src/CSCGeometryParsFromDD.cc b/Geometry/CSCGeometryBuilder/src/CSCGeometryParsFromDD.cc index 33f98925e101d..b3dd57dcec6ba 100644 --- a/Geometry/CSCGeometryBuilder/src/CSCGeometryParsFromDD.cc +++ b/Geometry/CSCGeometryBuilder/src/CSCGeometryParsFromDD.cc @@ -4,7 +4,7 @@ // Description: CSC Geometry Pars for DD4hep // // -// \author Sergio Lo Meo (sergio.lo.meo@cern.ch) following what Ianna Osburne made for DTs (DD4HEP migration) +// \author Sergio Lo Meo (sergio.lo.meo@cern.ch) following what Ianna Osburne made for DTs (DD4hep migration) // Created: Thu, 05 March 2020 // Modified: Thu, 04 June 2020, following what made in PR #30047 // Modified: Wed, 23 December 2020 @@ -390,7 +390,7 @@ bool CSCGeometryParsFromDD::build(const cms::DDCompactView* cview, std::vector grmat(9); std::vector trm(9); - edm::LogVerbatim("CSCGeometryParsFromDD") << "(0) CSCGeometryParsFromDD - DD4HEP "; + edm::LogVerbatim("CSCGeometryParsFromDD") << "(0) CSCGeometryParsFromDD - DD4hep "; while (fv.firstChild()) { MuonGeometryNumbering mbn(muonConstants); diff --git a/Geometry/DTGeometryBuilder/src/DTGeometryParsFromDD.cc b/Geometry/DTGeometryBuilder/src/DTGeometryParsFromDD.cc index acd84916444ad..74111d91d452b 100644 --- a/Geometry/DTGeometryBuilder/src/DTGeometryParsFromDD.cc +++ b/Geometry/DTGeometryBuilder/src/DTGeometryParsFromDD.cc @@ -264,7 +264,7 @@ DTGeometryParsFromDD::PosRotPair DTGeometryParsFromDD::plane(const DDFilteredVie void DTGeometryParsFromDD::buildGeometry(cms::DDFilteredView& fv, const MuonGeometryConstants& muonConstants, RecoIdealGeometry& rig) const { - edm::LogVerbatim("DTGeometryParsFromDD") << "(0) DTGeometryParsFromDD - DD4HEP "; + edm::LogVerbatim("DTGeometryParsFromDD") << "(0) DTGeometryParsFromDD - DD4hep "; bool doChamber = fv.firstChild(); @@ -300,7 +300,7 @@ DTGeometryParsFromDD::PosRotPair DTGeometryParsFromDD::plane(const cms::DDFilter gtran[1] = tr[1] / dd4hep::cm; gtran[2] = tr[2] / dd4hep::cm; - edm::LogVerbatim("DTGeometryParsFromDD") << "(4) DD4HEP, Position " + edm::LogVerbatim("DTGeometryParsFromDD") << "(4) DD4hep, Position " << " " << gtran[0] << " " << gtran[1] << " " << gtran[2]; DDRotationMatrix rotation = fv.rotation(); @@ -340,7 +340,7 @@ void DTGeometryParsFromDD::insertChamber(cms::DDFilteredView& fv, par[3] = par_temp[2] / dd4hep::mm; edm::LogVerbatim("DTGeometryParsFromDD") - << "(1) DD4HEP, Chamber DetID " << rawid << " " << par[0] << " " << par[1] << " " << par[2] << " " << par[3]; + << "(1) DD4hep, Chamber DetID " << rawid << " " << par[0] << " " << par[1] << " " << par[2] << " " << par[3]; PosRotPair posRot(plane(fv)); rig.insert(rawid, posRot.first, posRot.second, par); } @@ -361,7 +361,7 @@ void DTGeometryParsFromDD::insertSuperLayer(cms::DDFilteredView& fv, par[3] = par_temp[2] / dd4hep::mm; edm::LogVerbatim("DTGeometryParsFromDD") - << "(2) DD4HEP, Super Layer DetID " << rawid << " " << par[0] << " " << par[1] << " " << par[2] << " " << par[3]; + << "(2) DD4hep, Super Layer DetID " << rawid << " " << par[0] << " " << par[1] << " " << par[2] << " " << par[3]; PosRotPair posRot(plane(fv)); rig.insert(slId, posRot.first, posRot.second, par); } @@ -402,7 +402,7 @@ void DTGeometryParsFromDD::insertLayer(cms::DDFilteredView& fv, PosRotPair posRot(plane(fv)); edm::LogVerbatim("DTGeometryParsFromDD") - << "(3) DD4HEP, Layer DetID " << rawid << " " << par[0] << " " << par[1] << " " << par[2] << " " << par[3] << " " + << "(3) DD4hep, Layer DetID " << rawid << " " << par[0] << " " << par[1] << " " << par[2] << " " << par[3] << " " << par[4] << " " << par[5] << " " << par[6]; rig.insert(layId, posRot.first, posRot.second, par); } diff --git a/Geometry/EcalAlgo/plugins/moduleDD4Hep.cc b/Geometry/EcalAlgo/plugins/moduleDD4hep.cc similarity index 100% rename from Geometry/EcalAlgo/plugins/moduleDD4Hep.cc rename to Geometry/EcalAlgo/plugins/moduleDD4hep.cc diff --git a/Geometry/EcalAlgo/test/python/README.txt b/Geometry/EcalAlgo/test/python/README.txt index ffcc1992f78a2..b35aa72ca2c09 100644 --- a/Geometry/EcalAlgo/test/python/README.txt +++ b/Geometry/EcalAlgo/test/python/README.txt @@ -1,10 +1,10 @@ -The validation of the ECAL Reco geometry in the old DDD way and new DD4HEP way is done with two dumpers present in Geometry/EcalAlgo/test/python : +The validation of the ECAL Reco geometry in the old DDD way and new DD4hep way is done with two dumpers present in Geometry/EcalAlgo/test/python : 1) runEcalCellDumpDDD_cfg.py for DDD -2) runEcalCellDumpDD4Hep_cfg.py for DD4HEP +2) runEcalCellDumpDD4hep_cfg.py for DD4hep These dump the position, backface, dimensions and the 8 corner-coordinates of each ECAL crystal in EB and EE. For this two analyzers are used ecalBarrelCellParameterDump.cc and ecalEndcapCellParameterDump.cc which are present in: Geometry/EcalAlgo/test -To dump these into a file execute: cmsRun PATH_TO_CONFIG/runEcalCellDumpDD4Hep_cfg.py > ECAL_cellParams_DD4HEP_Dump.txt and similarly for the DDD config. +To dump these into a file execute: cmsRun PATH_TO_CONFIG/runEcalCellDumpDD4hep_cfg.py > ECAL_cellParams_DD4hep_Dump.txt and similarly for the DDD config. The dump will be found to be identical. diff --git a/Geometry/EcalAlgo/test/python/runEcalCellDumpDD4Hep_cfg.py b/Geometry/EcalAlgo/test/python/runEcalCellDumpDD4hep_cfg.py similarity index 100% rename from Geometry/EcalAlgo/test/python/runEcalCellDumpDD4Hep_cfg.py rename to Geometry/EcalAlgo/test/python/runEcalCellDumpDD4hep_cfg.py diff --git a/Geometry/EcalCommonData/test/python/dumpECDD4Hep_cfg.py b/Geometry/EcalCommonData/test/python/dumpECDD4hep_cfg.py similarity index 100% rename from Geometry/EcalCommonData/test/python/dumpECDD4Hep_cfg.py rename to Geometry/EcalCommonData/test/python/dumpECDD4hep_cfg.py diff --git a/Geometry/EcalCommonData/test/python/runEcalSimParameterDD4Hep_cfg.py b/Geometry/EcalCommonData/test/python/runEcalSimParameterDD4hep_cfg.py similarity index 100% rename from Geometry/EcalCommonData/test/python/runEcalSimParameterDD4Hep_cfg.py rename to Geometry/EcalCommonData/test/python/runEcalSimParameterDD4hep_cfg.py diff --git a/Geometry/GEMGeometryBuilder/interface/ME0GeometryParsFromDD.h b/Geometry/GEMGeometryBuilder/interface/ME0GeometryParsFromDD.h index 1c70ad8b9f0f3..7a5850b84fdd8 100644 --- a/Geometry/GEMGeometryBuilder/interface/ME0GeometryParsFromDD.h +++ b/Geometry/GEMGeometryBuilder/interface/ME0GeometryParsFromDD.h @@ -29,7 +29,7 @@ class ME0GeometryParsFromDD { ~ME0GeometryParsFromDD(void) {} // DD void build(const DDCompactView*, const MuonGeometryConstants&, RecoIdealGeometry&); - // DD4HEP + // DD4hep void build(const cms::DDCompactView*, const MuonGeometryConstants&, RecoIdealGeometry&); private: @@ -44,7 +44,7 @@ class ME0GeometryParsFromDD { std::vector getTranslation(DDFilteredView& fv); std::vector getRotation(DDFilteredView& fv); - //DD4HEP + //DD4hep void buildGeometry(cms::DDFilteredView&, const MuonGeometryConstants&, RecoIdealGeometry&); diff --git a/Geometry/GEMGeometryBuilder/plugins/GEMGeometryESModule.cc b/Geometry/GEMGeometryBuilder/plugins/GEMGeometryESModule.cc index b1721a6b7812d..5ded4eef6f6e6 100644 --- a/Geometry/GEMGeometryBuilder/plugins/GEMGeometryESModule.cc +++ b/Geometry/GEMGeometryBuilder/plugins/GEMGeometryESModule.cc @@ -1,10 +1,10 @@ /* //\class GEMGeometryESModule - Description: GEM Geometry ES Module from DD & DD4HEP + Description: GEM Geometry ES Module from DD & DD4hep 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) following what Ianna Osburne made for DTs (DD4HEP migration) +// Author: Sergio Lo Meo (sergio.lo.meo@cern.ch) following what Ianna Osburne made for DTs (DD4hep migration) // Created: 27 Jan 2020 */ #include "Geometry/GEMGeometryBuilder/src/GEMGeometryBuilder.h" diff --git a/Geometry/GEMGeometryBuilder/plugins/GEMGeometryValidate.cc b/Geometry/GEMGeometryBuilder/plugins/GEMGeometryValidate.cc index f10cfcdea1ed9..c173bc0d1589f 100644 --- a/Geometry/GEMGeometryBuilder/plugins/GEMGeometryValidate.cc +++ b/Geometry/GEMGeometryBuilder/plugins/GEMGeometryValidate.cc @@ -1,10 +1,10 @@ /* //\class GEMGeometryValidate - Description: GEM GeometryValidate from DD & DD4HEP + Description: GEM GeometryValidate from DD & DD4hep // -// Author: Sergio Lo Meo (sergio.lo.meo@cern.ch) following what Ianna Osburne made for DTs (DD4HEP migration) +// Author: Sergio Lo Meo (sergio.lo.meo@cern.ch) following what Ianna Osburne made for DTs (DD4hep migration) // Created: 27 Jan 2020 */ diff --git a/Geometry/GEMGeometryBuilder/plugins/ME0GeometryESModule.cc b/Geometry/GEMGeometryBuilder/plugins/ME0GeometryESModule.cc index 16d3437cb992f..cd627d04901a1 100644 --- a/Geometry/GEMGeometryBuilder/plugins/ME0GeometryESModule.cc +++ b/Geometry/GEMGeometryBuilder/plugins/ME0GeometryESModule.cc @@ -4,7 +4,7 @@ Description: ME0 GeometryESModule from DD & DD4hep 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) following what Ianna Osborne made for DTs (DD4HEP migration) +// Author: Sergio Lo Meo (sergio.lo.meo@cern.ch) following what Ianna Osborne made for DTs (DD4hep migration) // Created: 29 Apr 2020 */ @@ -82,7 +82,7 @@ std::unique_ptr ME0GeometryESModule::produce(const MuonGeometryReco ME0GeometryBuilder builder; return std::unique_ptr(builder.build(cpv.product(), mdc)); } else if (fromDD4hep_) { - edm::LogVerbatim("ME0GeometryESModule") << "(0) ME0GeometryESModule - DD4HEP "; + edm::LogVerbatim("ME0GeometryESModule") << "(0) ME0GeometryESModule - DD4hep "; edm::LogVerbatim("GEMGeometry") << "ME0GeometryESModule::produce :: ME0GeometryBuilder builder DD4hep"; auto cpv = record.getTransientHandle(dd4hepcpvToken_); const auto& mdc = record.get(mdcToken_); diff --git a/Geometry/GEMGeometryBuilder/plugins/ME0GeometryValidate.cc b/Geometry/GEMGeometryBuilder/plugins/ME0GeometryValidate.cc index 60fdd03f2c22c..30dbc1ee50790 100644 --- a/Geometry/GEMGeometryBuilder/plugins/ME0GeometryValidate.cc +++ b/Geometry/GEMGeometryBuilder/plugins/ME0GeometryValidate.cc @@ -4,7 +4,7 @@ Description: ME0 GeometryValidate for DD4hep // -// Author: Sergio Lo Meo (sergio.lo.meo@cern.ch) following what Ianna Osborne made for DTs (DD4HEP migration) +// Author: Sergio Lo Meo (sergio.lo.meo@cern.ch) following what Ianna Osborne made for DTs (DD4hep migration) // Created: 29 Apr 2020 */ diff --git a/Geometry/GEMGeometryBuilder/src/GEMGeometryBuilder.cc b/Geometry/GEMGeometryBuilder/src/GEMGeometryBuilder.cc index 161d18934ffc9..d16520f439419 100644 --- a/Geometry/GEMGeometryBuilder/src/GEMGeometryBuilder.cc +++ b/Geometry/GEMGeometryBuilder/src/GEMGeometryBuilder.cc @@ -1,9 +1,9 @@ /* //\class GEMGeometryBuilder - Description: GEM Geometry builder from DD and DD4HEP + Description: GEM Geometry builder from DD and 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 Osburne made for DTs (DD4HEP migration) + Sergio Lo Meo (sergio.lo.meo@cern.ch) following what Ianna Osburne made for DTs (DD4hep migration) Updated by Sunanda Banerjee (Fermilab) to make it working for dd4hep Updated: 7 August 2020 */ @@ -301,7 +301,7 @@ GEMGeometryBuilder::RCPBoundPlane GEMGeometryBuilder::boundPlane(const DDFiltere return RCPBoundPlane(new BoundPlane(posResult, rotResult, bounds)); } -// DD4HEP +// DD4hep void GEMGeometryBuilder::build(GEMGeometry& theGeometry, const cms::DDCompactView* cview, diff --git a/Geometry/GEMGeometryBuilder/src/GEMGeometryBuilder.h b/Geometry/GEMGeometryBuilder/src/GEMGeometryBuilder.h index 38658f42a83e2..79c772b660a43 100644 --- a/Geometry/GEMGeometryBuilder/src/GEMGeometryBuilder.h +++ b/Geometry/GEMGeometryBuilder/src/GEMGeometryBuilder.h @@ -5,10 +5,10 @@ /* //\class GEMGeometryBuilder - Description: GEM Geometry builder from DD & DD4HEP + Description: GEM Geometry builder from DD & DD4hep 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) following what Ianna Osburne made for DTs (DD4HEP migration) +// Author: Sergio Lo Meo (sergio.lo.meo@cern.ch) following what Ianna Osburne made for DTs (DD4hep migration) // Created: 27 Jan 2020 */ #include diff --git a/Geometry/GEMGeometryBuilder/src/GEMGeometryParsFromDD.cc b/Geometry/GEMGeometryBuilder/src/GEMGeometryParsFromDD.cc index e05aad346742b..17ef0b5492486 100644 --- a/Geometry/GEMGeometryBuilder/src/GEMGeometryParsFromDD.cc +++ b/Geometry/GEMGeometryBuilder/src/GEMGeometryParsFromDD.cc @@ -236,7 +236,7 @@ void GEMGeometryParsFromDD::build(const cms::DDCompactView* cview, void GEMGeometryParsFromDD::buildGeometry(cms::DDFilteredView& fv, const MuonGeometryConstants& muonConstants, RecoIdealGeometry& rgeo) { - edm::LogVerbatim("GEMGeometryParsFromDD") << "(0) GEMGeometryParsFromDD - DD4HEP "; + edm::LogVerbatim("GEMGeometryParsFromDD") << "(0) GEMGeometryParsFromDD - DD4hep "; MuonGeometryNumbering mdddnum(muonConstants); GEMNumberingScheme gemNum(muonConstants); @@ -305,7 +305,7 @@ void GEMGeometryParsFromDD::buildSuperChamber(cms::DDFilteredView& fv, GEMDetId std::vector vrot = getRotation(fv); edm::LogVerbatim("GEMGeometryParsFromDD") - << "(3) DD4HEP, SuperChamber DetID " << gemid.rawId() << " Name " << std::string(name) << " dx1 " << dx1 + << "(3) DD4hep, SuperChamber DetID " << gemid.rawId() << " Name " << std::string(name) << " dx1 " << dx1 << " dx2 " << dx2 << " dy " << dy << " dz " << dz; rgeo.insert(gemid.rawId(), vtra, vrot, pars, {std::string(name)}); } @@ -333,7 +333,7 @@ void GEMGeometryParsFromDD::buildChamber(cms::DDFilteredView& fv, GEMDetId detId std::vector vrot = getRotation(fv); edm::LogVerbatim("GEMGeometryParsFromDD") - << "(4) DD4HEP, Chamber DetID " << gemid.rawId() << " Name " << std::string(name) << " dx1 " << dx1 << " dx2 " + << "(4) DD4hep, Chamber DetID " << gemid.rawId() << " Name " << std::string(name) << " dx1 " << dx1 << " dx2 " << dx2 << " dy " << dy << " dz " << dz; rgeo.insert(gemid.rawId(), vtra, vrot, pars, {std::string(name)}); } @@ -356,7 +356,7 @@ void GEMGeometryParsFromDD::buildEtaPartition(cms::DDFilteredView& fv, GEMDetId std::vector vrot = getRotation(fv); edm::LogVerbatim("GEMGeometryParsFromDD") - << "(5) DD4HEP, Eta Partion DetID " << detId.rawId() << " Name " << std::string(name) << " dx1 " << dx1 << " dx2 " + << "(5) DD4hep, Eta Partion DetID " << detId.rawId() << " Name " << std::string(name) << " dx1 " << dx1 << " dx2 " << dx2 << " dy " << dy << " dz " << dz << " nStrips " << nStrips << " nPads " << nPads << " dPhi " << dPhi; rgeo.insert(detId.rawId(), vtra, vrot, pars, {std::string(name)}); } @@ -368,7 +368,7 @@ std::vector GEMGeometryParsFromDD::getTranslation(cms::DDFilteredView& f tran[2] = static_cast(fv.translation().Z()) / dd4hep::mm; edm::LogVerbatim("GEMGeometryParsFromDD") - << "(1) DD4HEP, tran vector " << tran[0] << " " << tran[1] << " " << tran[2]; + << "(1) DD4hep, tran vector " << tran[0] << " " << tran[1] << " " << tran[2]; return {tran[0], tran[1], tran[2]}; } @@ -379,7 +379,7 @@ std::vector GEMGeometryParsFromDD::getRotation(cms::DDFilteredView& fv) rota.GetComponents(x, y, z); const std::vector rot = {x.X(), x.Y(), x.Z(), y.X(), y.Y(), y.Z(), z.X(), z.Y(), z.Z()}; edm::LogVerbatim("GEMGeometryParsFromDD") - << "(2) DD4HEP, rot matrix " << rot[0] << " " << rot[1] << " " << rot[2] << " " << rot[3] << " " << rot[4] + << "(2) DD4hep, rot matrix " << rot[0] << " " << rot[1] << " " << rot[2] << " " << rot[3] << " " << rot[4] << " " << rot[5] << " " << rot[6] << " " << rot[7] << " " << rot[8]; return {rot[0], rot[1], rot[2], rot[3], rot[4], rot[5], rot[6], rot[7], rot[8]}; } diff --git a/Geometry/GEMGeometryBuilder/src/ME0GeometryBuilder.cc b/Geometry/GEMGeometryBuilder/src/ME0GeometryBuilder.cc index 21cd2c4eb57b7..79f36ee47dfef 100644 --- a/Geometry/GEMGeometryBuilder/src/ME0GeometryBuilder.cc +++ b/Geometry/GEMGeometryBuilder/src/ME0GeometryBuilder.cc @@ -3,7 +3,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) + 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: 7 August 2020 */ diff --git a/Geometry/GEMGeometryBuilder/src/ME0GeometryBuilder.h b/Geometry/GEMGeometryBuilder/src/ME0GeometryBuilder.h index 4625d2b2a3f81..dff45c661cbfc 100644 --- a/Geometry/GEMGeometryBuilder/src/ME0GeometryBuilder.h +++ b/Geometry/GEMGeometryBuilder/src/ME0GeometryBuilder.h @@ -3,10 +3,10 @@ /* //\class ME0GeometryBuilder - Description: ME0 Geometry builder for DD4HEP + Description: ME0 Geometry builder for DD4hep 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) following what Ianna Osborne made for DTs (DD4HEP migration) +// Author: Sergio Lo Meo (sergio.lo.meo@cern.ch) following what Ianna Osborne made for DTs (DD4hep migration) // Created: 29 Apr 2019 */ diff --git a/Geometry/GEMGeometryBuilder/src/ME0GeometryParsFromDD.cc b/Geometry/GEMGeometryBuilder/src/ME0GeometryParsFromDD.cc index 4f0149364bd25..50594fe04d5f1 100644 --- a/Geometry/GEMGeometryBuilder/src/ME0GeometryParsFromDD.cc +++ b/Geometry/GEMGeometryBuilder/src/ME0GeometryParsFromDD.cc @@ -181,7 +181,7 @@ std::vector ME0GeometryParsFromDD::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 ME0GeometryParsFromDD::build(const cms::DDCompactView* cview, const MuonGeometryConstants& muonConstants, @@ -196,7 +196,7 @@ void ME0GeometryParsFromDD::build(const cms::DDCompactView* cview, void ME0GeometryParsFromDD::buildGeometry(cms::DDFilteredView& fv, const MuonGeometryConstants& muonConstants, RecoIdealGeometry& rgeo) { - edm::LogVerbatim("ME0GeometryParsFromDD") << "(0) ME0GeometryParsFromDD - DD4HEP "; + edm::LogVerbatim("ME0GeometryParsFromDD") << "(0) ME0GeometryParsFromDD - DD4hep "; MuonGeometryNumbering mdddnum(muonConstants); ME0NumberingScheme me0Num(muonConstants); @@ -228,7 +228,7 @@ void ME0GeometryParsFromDD::buildChamber(cms::DDFilteredView& fv, ME0DetId detId std::vector vrot = getRotation(fv); edm::LogVerbatim("ME0GeometryParsFromDD") - << "(4) DD4HEP, Chamber DetID " << detId.chamberId().rawId() << " Name " << std::string(name); + << "(4) DD4hep, Chamber DetID " << detId.chamberId().rawId() << " Name " << std::string(name); rgeo.insert(detId.chamberId().rawId(), vtra, vrot, pars, {std::string(name)}); } @@ -240,7 +240,7 @@ void ME0GeometryParsFromDD::buildLayer(cms::DDFilteredView& fv, ME0DetId detId, std::vector vrot = getRotation(fv); edm::LogVerbatim("ME0GeometryParsFromDD") - << "(5) DD4HEP, Layer DetID " << detId.layerId().rawId() << " Name " << std::string(name); + << "(5) DD4hep, Layer DetID " << detId.layerId().rawId() << " Name " << std::string(name); rgeo.insert(detId.layerId().rawId(), vtra, vrot, pars, {std::string(name)}); } @@ -254,7 +254,7 @@ void ME0GeometryParsFromDD::buildEtaPartition(cms::DDFilteredView& fv, ME0DetId std::vector vtra = getTranslation(fv); std::vector vrot = getRotation(fv); - edm::LogVerbatim("ME0GeometryParsFromDD") << "(6) DD4HEP, Eta Partion DetID " << detId.rawId() << " Name " + edm::LogVerbatim("ME0GeometryParsFromDD") << "(6) DD4hep, Eta Partion DetID " << detId.rawId() << " Name " << std::string(name) << " nStrips " << nStrips << " nPads " << nPads; rgeo.insert(detId.rawId(), vtra, vrot, pars, {std::string(name)}); @@ -264,7 +264,7 @@ std::vector ME0GeometryParsFromDD::getDimension(cms::DDFilteredView& fv) std::vector dpar = fv.parameters(); edm::LogVerbatim("ME0GeometryParsFromDD") - << "(1) DD4HEP, dimension dx1 " << dpar[0] / dd4hep::mm << ", dx2 " << dpar[1] / dd4hep::mm << ", dy " + << "(1) DD4hep, dimension dx1 " << dpar[0] / dd4hep::mm << ", dx2 " << dpar[1] / dd4hep::mm << ", dy " << dpar[3] / dd4hep::mm << ", dz " << dpar[2] / dd4hep::mm; return {dpar[0] / dd4hep::mm, dpar[1] / dd4hep::mm, dpar[3] / dd4hep::mm, dpar[2] / dd4hep::mm}; @@ -277,7 +277,7 @@ std::vector ME0GeometryParsFromDD::getTranslation(cms::DDFilteredView& f tran[2] = static_cast(fv.translation().Z()) / dd4hep::mm; edm::LogVerbatim("ME0GeometryParsFromDD") - << "(2) DD4HEP, tran vector " << tran[0] << " " << tran[1] << " " << tran[2]; + << "(2) DD4hep, tran vector " << tran[0] << " " << tran[1] << " " << tran[2]; return {tran[0], tran[1], tran[2]}; } @@ -288,7 +288,7 @@ std::vector ME0GeometryParsFromDD::getRotation(cms::DDFilteredView& fv) rota.GetComponents(x, y, z); const std::vector rot = {x.X(), x.Y(), x.Z(), y.X(), y.Y(), y.Z(), z.X(), z.Y(), z.Z()}; edm::LogVerbatim("ME0GeometryParsFromDD") - << "(3) DD4HEP, rot matrix " << rot[0] << " " << rot[1] << " " << rot[2] << " " << rot[3] << " " << rot[4] + << "(3) DD4hep, rot matrix " << rot[0] << " " << rot[1] << " " << rot[2] << " " << rot[3] << " " << rot[4] << " " << rot[5] << " " << rot[6] << " " << rot[7] << " " << rot[8]; return {rot[0], rot[1], rot[2], rot[3], rot[4], rot[5], rot[6], rot[7], rot[8]}; } diff --git a/Geometry/GEMGeometryBuilder/test/python/dumpGEMGeometryDD4Hep_cfg.py b/Geometry/GEMGeometryBuilder/test/python/dumpGEMGeometryDD4hep_cfg.py similarity index 100% rename from Geometry/GEMGeometryBuilder/test/python/dumpGEMGeometryDD4Hep_cfg.py rename to Geometry/GEMGeometryBuilder/test/python/dumpGEMGeometryDD4hep_cfg.py diff --git a/Geometry/GEMGeometryBuilder/test/python/dumpME0GeometryDD4Hep_cfg.py b/Geometry/GEMGeometryBuilder/test/python/dumpME0GeometryDD4hep_cfg.py similarity index 100% rename from Geometry/GEMGeometryBuilder/test/python/dumpME0GeometryDD4Hep_cfg.py rename to Geometry/GEMGeometryBuilder/test/python/dumpME0GeometryDD4hep_cfg.py diff --git a/Geometry/GEMGeometryBuilder/test/python/validateGEMGeometryDD4Hep_cfg.py b/Geometry/GEMGeometryBuilder/test/python/validateGEMGeometryDD4hep_cfg.py similarity index 100% rename from Geometry/GEMGeometryBuilder/test/python/validateGEMGeometryDD4Hep_cfg.py rename to Geometry/GEMGeometryBuilder/test/python/validateGEMGeometryDD4hep_cfg.py diff --git a/Geometry/HGCalCommonData/plugins/dd4hep/DDHGCalHEFileAlgo.cc b/Geometry/HGCalCommonData/plugins/dd4hep/DDHGCalHEFileAlgo.cc index 52ef2236c155f..4f1adfe3fbadd 100644 --- a/Geometry/HGCalCommonData/plugins/dd4hep/DDHGCalHEFileAlgo.cc +++ b/Geometry/HGCalCommonData/plugins/dd4hep/DDHGCalHEFileAlgo.cc @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // File: DDHGCalHEFileAlgo.cc -// Description: Geometry factory class for HGCal (Mix) adopted for DD4HEP +// Description: Geometry factory class for HGCal (Mix) adopted for DD4hep /////////////////////////////////////////////////////////////////////////////// #include diff --git a/Geometry/HGCalCommonData/plugins/dd4hep/DDHGCalMixLayer.cc b/Geometry/HGCalCommonData/plugins/dd4hep/DDHGCalMixLayer.cc index edb275f11cc9d..18ac1bee17d8e 100644 --- a/Geometry/HGCalCommonData/plugins/dd4hep/DDHGCalMixLayer.cc +++ b/Geometry/HGCalCommonData/plugins/dd4hep/DDHGCalMixLayer.cc @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // File: DDHGCalMixLayer.cc -// Description: Geometry factory class for HGCal (Mix) adopted for DD4HEP +// Description: Geometry factory class for HGCal (Mix) adopted for DD4hep /////////////////////////////////////////////////////////////////////////////// #include diff --git a/Geometry/HGCalCommonData/test/python/dumpAHcalModuleDD4Hep_cfg.py b/Geometry/HGCalCommonData/test/python/dumpAHcalModuleDD4hep_cfg.py similarity index 100% rename from Geometry/HGCalCommonData/test/python/dumpAHcalModuleDD4Hep_cfg.py rename to Geometry/HGCalCommonData/test/python/dumpAHcalModuleDD4hep_cfg.py diff --git a/Geometry/HGCalCommonData/test/python/dumpExtendedHGCalGeometryDD4Hep_cfg.py b/Geometry/HGCalCommonData/test/python/dumpExtendedHGCalGeometryDD4hep_cfg.py similarity index 100% rename from Geometry/HGCalCommonData/test/python/dumpExtendedHGCalGeometryDD4Hep_cfg.py rename to Geometry/HGCalCommonData/test/python/dumpExtendedHGCalGeometryDD4hep_cfg.py diff --git a/Geometry/HGCalCommonData/test/python/dumpHGCalCellDD4Hep_cfg.py b/Geometry/HGCalCommonData/test/python/dumpHGCalCellDD4hep_cfg.py similarity index 100% rename from Geometry/HGCalCommonData/test/python/dumpHGCalCellDD4Hep_cfg.py rename to Geometry/HGCalCommonData/test/python/dumpHGCalCellDD4hep_cfg.py diff --git a/Geometry/HGCalCommonData/test/python/dumpHGCalEEDD4Hep_cfg.py b/Geometry/HGCalCommonData/test/python/dumpHGCalEEDD4hep_cfg.py similarity index 100% rename from Geometry/HGCalCommonData/test/python/dumpHGCalEEDD4Hep_cfg.py rename to Geometry/HGCalCommonData/test/python/dumpHGCalEEDD4hep_cfg.py diff --git a/Geometry/HGCalCommonData/test/python/dumpHGCalEEFileDD4Hep_cfg.py b/Geometry/HGCalCommonData/test/python/dumpHGCalEEFileDD4hep_cfg.py similarity index 100% rename from Geometry/HGCalCommonData/test/python/dumpHGCalEEFileDD4Hep_cfg.py rename to Geometry/HGCalCommonData/test/python/dumpHGCalEEFileDD4hep_cfg.py diff --git a/Geometry/HGCalCommonData/test/python/dumpHGCalEEV15DD4Hep_cfg.py b/Geometry/HGCalCommonData/test/python/dumpHGCalEEV15DD4hep_cfg.py similarity index 100% rename from Geometry/HGCalCommonData/test/python/dumpHGCalEEV15DD4Hep_cfg.py rename to Geometry/HGCalCommonData/test/python/dumpHGCalEEV15DD4hep_cfg.py diff --git a/Geometry/HGCalCommonData/test/python/dumpHGCalEEV16DD4Hep_cfg.py b/Geometry/HGCalCommonData/test/python/dumpHGCalEEV16DD4hep_cfg.py similarity index 100% rename from Geometry/HGCalCommonData/test/python/dumpHGCalEEV16DD4Hep_cfg.py rename to Geometry/HGCalCommonData/test/python/dumpHGCalEEV16DD4hep_cfg.py diff --git a/Geometry/HGCalCommonData/test/python/dumpHGCalGeometryDD4Hep_cfg.py b/Geometry/HGCalCommonData/test/python/dumpHGCalGeometryDD4hep_cfg.py similarity index 100% rename from Geometry/HGCalCommonData/test/python/dumpHGCalGeometryDD4Hep_cfg.py rename to Geometry/HGCalCommonData/test/python/dumpHGCalGeometryDD4hep_cfg.py diff --git a/Geometry/HGCalCommonData/test/python/dumpHGCalHEmixDD4Hep_cfg.py b/Geometry/HGCalCommonData/test/python/dumpHGCalHEmixDD4hep_cfg.py similarity index 100% rename from Geometry/HGCalCommonData/test/python/dumpHGCalHEmixDD4Hep_cfg.py rename to Geometry/HGCalCommonData/test/python/dumpHGCalHEmixDD4hep_cfg.py diff --git a/Geometry/HGCalCommonData/test/python/dumpHGCalHEmixFileDD4Hep_cfg.py b/Geometry/HGCalCommonData/test/python/dumpHGCalHEmixFileDD4hep_cfg.py similarity index 100% rename from Geometry/HGCalCommonData/test/python/dumpHGCalHEmixFileDD4Hep_cfg.py rename to Geometry/HGCalCommonData/test/python/dumpHGCalHEmixFileDD4hep_cfg.py diff --git a/Geometry/HGCalCommonData/test/python/dumpHGCalHEmixV15DD4Hep_cfg.py b/Geometry/HGCalCommonData/test/python/dumpHGCalHEmixV15DD4hep_cfg.py similarity index 100% rename from Geometry/HGCalCommonData/test/python/dumpHGCalHEmixV15DD4Hep_cfg.py rename to Geometry/HGCalCommonData/test/python/dumpHGCalHEmixV15DD4hep_cfg.py diff --git a/Geometry/HGCalCommonData/test/python/dumpHGCalHEmixV16DD4Hep_cfg.py b/Geometry/HGCalCommonData/test/python/dumpHGCalHEmixV16DD4hep_cfg.py similarity index 100% rename from Geometry/HGCalCommonData/test/python/dumpHGCalHEmixV16DD4Hep_cfg.py rename to Geometry/HGCalCommonData/test/python/dumpHGCalHEmixV16DD4hep_cfg.py diff --git a/Geometry/HGCalCommonData/test/python/dumpHGCalHEsilDD4Hep_cfg.py b/Geometry/HGCalCommonData/test/python/dumpHGCalHEsilDD4hep_cfg.py similarity index 100% rename from Geometry/HGCalCommonData/test/python/dumpHGCalHEsilDD4Hep_cfg.py rename to Geometry/HGCalCommonData/test/python/dumpHGCalHEsilDD4hep_cfg.py diff --git a/Geometry/HGCalCommonData/test/python/dumpHGCalHEsilV15DD4Hep_cfg.py b/Geometry/HGCalCommonData/test/python/dumpHGCalHEsilV15DD4hep_cfg.py similarity index 100% rename from Geometry/HGCalCommonData/test/python/dumpHGCalHEsilV15DD4Hep_cfg.py rename to Geometry/HGCalCommonData/test/python/dumpHGCalHEsilV15DD4hep_cfg.py diff --git a/Geometry/HGCalCommonData/test/python/dumpHGCalHEsilV16DD4Hep_cfg.py b/Geometry/HGCalCommonData/test/python/dumpHGCalHEsilV16DD4hep_cfg.py similarity index 100% rename from Geometry/HGCalCommonData/test/python/dumpHGCalHEsilV16DD4Hep_cfg.py rename to Geometry/HGCalCommonData/test/python/dumpHGCalHEsilV16DD4hep_cfg.py diff --git a/Geometry/HGCalCommonData/test/python/dumpHGCalModuleAlgoDD4Hep_cfg.py b/Geometry/HGCalCommonData/test/python/dumpHGCalModuleAlgoDD4hep_cfg.py similarity index 100% rename from Geometry/HGCalCommonData/test/python/dumpHGCalModuleAlgoDD4Hep_cfg.py rename to Geometry/HGCalCommonData/test/python/dumpHGCalModuleAlgoDD4hep_cfg.py diff --git a/Geometry/HGCalCommonData/test/python/dumpHGCalModuleDD4Hep_cfg.py b/Geometry/HGCalCommonData/test/python/dumpHGCalModuleDD4hep_cfg.py similarity index 100% rename from Geometry/HGCalCommonData/test/python/dumpHGCalModuleDD4Hep_cfg.py rename to Geometry/HGCalCommonData/test/python/dumpHGCalModuleDD4hep_cfg.py diff --git a/Geometry/HGCalCommonData/test/python/dumpHGCalNoTaperEndcapDD4Hep_cfg.py b/Geometry/HGCalCommonData/test/python/dumpHGCalNoTaperEndcapDD4hep_cfg.py similarity index 100% rename from Geometry/HGCalCommonData/test/python/dumpHGCalNoTaperEndcapDD4Hep_cfg.py rename to Geometry/HGCalCommonData/test/python/dumpHGCalNoTaperEndcapDD4hep_cfg.py diff --git a/Geometry/HGCalCommonData/test/python/dumpHGCalTBModuleDD4Hep_cfg.py b/Geometry/HGCalCommonData/test/python/dumpHGCalTBModuleDD4hep_cfg.py similarity index 100% rename from Geometry/HGCalCommonData/test/python/dumpHGCalTBModuleDD4Hep_cfg.py rename to Geometry/HGCalCommonData/test/python/dumpHGCalTBModuleDD4hep_cfg.py diff --git a/Geometry/HGCalCommonData/test/python/dumpHGCalTBModuleXDD4Hep_cfg.py b/Geometry/HGCalCommonData/test/python/dumpHGCalTBModuleXDD4hep_cfg.py similarity index 100% rename from Geometry/HGCalCommonData/test/python/dumpHGCalTBModuleXDD4Hep_cfg.py rename to Geometry/HGCalCommonData/test/python/dumpHGCalTBModuleXDD4hep_cfg.py diff --git a/Geometry/HGCalCommonData/test/python/dumpHGCalWafer8DD4Hep_cfg.py b/Geometry/HGCalCommonData/test/python/dumpHGCalWafer8DD4hep_cfg.py similarity index 100% rename from Geometry/HGCalCommonData/test/python/dumpHGCalWafer8DD4Hep_cfg.py rename to Geometry/HGCalCommonData/test/python/dumpHGCalWafer8DD4hep_cfg.py diff --git a/Geometry/HGCalCommonData/test/python/dumpHGCalWaferAlgoDD4Hep_cfg.py b/Geometry/HGCalCommonData/test/python/dumpHGCalWaferAlgoDD4hep_cfg.py similarity index 100% rename from Geometry/HGCalCommonData/test/python/dumpHGCalWaferAlgoDD4Hep_cfg.py rename to Geometry/HGCalCommonData/test/python/dumpHGCalWaferAlgoDD4hep_cfg.py diff --git a/Geometry/HGCalCommonData/test/python/dumpHGCalWaferDD4Hep_cfg.py b/Geometry/HGCalCommonData/test/python/dumpHGCalWaferDD4hep_cfg.py similarity index 100% rename from Geometry/HGCalCommonData/test/python/dumpHGCalWaferDD4Hep_cfg.py rename to Geometry/HGCalCommonData/test/python/dumpHGCalWaferDD4hep_cfg.py diff --git a/Geometry/HGCalCommonData/test/python/dumpHGCalWaferFDD4Hep_cfg.py b/Geometry/HGCalCommonData/test/python/dumpHGCalWaferFDD4hep_cfg.py similarity index 100% rename from Geometry/HGCalCommonData/test/python/dumpHGCalWaferFDD4Hep_cfg.py rename to Geometry/HGCalCommonData/test/python/dumpHGCalWaferFDD4hep_cfg.py diff --git a/Geometry/HGCalCommonData/test/python/dumpHGCalWaferPDD4Hep_cfg.py b/Geometry/HGCalCommonData/test/python/dumpHGCalWaferPDD4hep_cfg.py similarity index 100% rename from Geometry/HGCalCommonData/test/python/dumpHGCalWaferPDD4Hep_cfg.py rename to Geometry/HGCalCommonData/test/python/dumpHGCalWaferPDD4hep_cfg.py diff --git a/Geometry/HGCalCommonData/test/python/runHGCalD77DD4Hep_cfg.py b/Geometry/HGCalCommonData/test/python/runHGCalD77DD4hep_cfg.py similarity index 100% rename from Geometry/HGCalCommonData/test/python/runHGCalD77DD4Hep_cfg.py rename to Geometry/HGCalCommonData/test/python/runHGCalD77DD4hep_cfg.py diff --git a/Geometry/HGCalCommonData/test/python/runHGCalWafer8DD4Hep_cfg.py b/Geometry/HGCalCommonData/test/python/runHGCalWafer8DD4hep_cfg.py similarity index 100% rename from Geometry/HGCalCommonData/test/python/runHGCalWafer8DD4Hep_cfg.py rename to Geometry/HGCalCommonData/test/python/runHGCalWafer8DD4hep_cfg.py diff --git a/Geometry/HGCalCommonData/test/python/testHGCalParametersDD4Hep_cfg.py b/Geometry/HGCalCommonData/test/python/testHGCalParametersDD4hep_cfg.py similarity index 100% rename from Geometry/HGCalCommonData/test/python/testHGCalParametersDD4Hep_cfg.py rename to Geometry/HGCalCommonData/test/python/testHGCalParametersDD4hep_cfg.py diff --git a/Geometry/HGCalCommonData/test/python/testHGCalParametersV16DD4Hep_cfg.py b/Geometry/HGCalCommonData/test/python/testHGCalParametersV16DD4hep_cfg.py similarity index 100% rename from Geometry/HGCalCommonData/test/python/testHGCalParametersV16DD4Hep_cfg.py rename to Geometry/HGCalCommonData/test/python/testHGCalParametersV16DD4hep_cfg.py diff --git a/Geometry/HGCalCommonData/test/python/testHGCalTBParametersDD4Hep_cfg.py b/Geometry/HGCalCommonData/test/python/testHGCalTBParametersDD4hep_cfg.py similarity index 100% rename from Geometry/HGCalCommonData/test/python/testHGCalTBParametersDD4Hep_cfg.py rename to Geometry/HGCalCommonData/test/python/testHGCalTBParametersDD4hep_cfg.py diff --git a/Geometry/HGCalGeometry/test/python/testHGCalCellDumpDD4Hep_cfg.py b/Geometry/HGCalGeometry/test/python/testHGCalCellDumpDD4hep_cfg.py similarity index 100% rename from Geometry/HGCalGeometry/test/python/testHGCalCellDumpDD4Hep_cfg.py rename to Geometry/HGCalGeometry/test/python/testHGCalCellDumpDD4hep_cfg.py diff --git a/Geometry/HcalCommonData/test/python/runHcalParametersFromDD4HepAnalyzer_cfg.py b/Geometry/HcalCommonData/test/python/runHcalParametersFromDD4hepAnalyzer_cfg.py similarity index 100% rename from Geometry/HcalCommonData/test/python/runHcalParametersFromDD4HepAnalyzer_cfg.py rename to Geometry/HcalCommonData/test/python/runHcalParametersFromDD4hepAnalyzer_cfg.py diff --git a/Geometry/HcalCommonData/test/python/runHcalSimParametersDD4Hep_cfg.py b/Geometry/HcalCommonData/test/python/runHcalSimParametersDD4hep_cfg.py similarity index 100% rename from Geometry/HcalCommonData/test/python/runHcalSimParametersDD4Hep_cfg.py rename to Geometry/HcalCommonData/test/python/runHcalSimParametersDD4hep_cfg.py diff --git a/Geometry/HcalTestBeamData/test/python/testHcalTBParameterDD4Hep_cfg.py b/Geometry/HcalTestBeamData/test/python/testHcalTBParameterDD4hep_cfg.py similarity index 100% rename from Geometry/HcalTestBeamData/test/python/testHcalTBParameterDD4Hep_cfg.py rename to Geometry/HcalTestBeamData/test/python/testHcalTBParameterDD4hep_cfg.py diff --git a/Geometry/HcalTowerAlgo/test/runHcalCellDumpDD4Hep_cfg.py b/Geometry/HcalTowerAlgo/test/runHcalCellDumpDD4hep_cfg.py similarity index 100% rename from Geometry/HcalTowerAlgo/test/runHcalCellDumpDD4Hep_cfg.py rename to Geometry/HcalTowerAlgo/test/runHcalCellDumpDD4hep_cfg.py diff --git a/Geometry/MuonNumbering/test/testConstantsFromDD4Hep_cfg.py b/Geometry/MuonNumbering/test/testConstantsFromDD4hep_cfg.py similarity index 100% rename from Geometry/MuonNumbering/test/testConstantsFromDD4Hep_cfg.py rename to Geometry/MuonNumbering/test/testConstantsFromDD4hep_cfg.py diff --git a/Geometry/MuonNumbering/test/testMuonOffsetDD4Hep_cfg.py b/Geometry/MuonNumbering/test/testMuonOffsetDD4hep_cfg.py similarity index 100% rename from Geometry/MuonNumbering/test/testMuonOffsetDD4Hep_cfg.py rename to Geometry/MuonNumbering/test/testMuonOffsetDD4hep_cfg.py diff --git a/Geometry/RPCGeometryBuilder/plugins/RPCGeometryESModule.cc b/Geometry/RPCGeometryBuilder/plugins/RPCGeometryESModule.cc index 610352ecdb7eb..839b463f042d7 100644 --- a/Geometry/RPCGeometryBuilder/plugins/RPCGeometryESModule.cc +++ b/Geometry/RPCGeometryBuilder/plugins/RPCGeometryESModule.cc @@ -4,7 +4,7 @@ Description: RPC GeometryESModule from DD & DD4hep 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) following what Ianna Osborne made for DTs (DD4HEP migration) +// Author: Sergio Lo Meo (sergio.lo.meo@cern.ch) following what Ianna Osborne made for DTs (DD4hep migration) // Created: Fri, 20 Sep 2019 // Modified: Fri, 29 May 2020, following what Sunanda Banerjee made in PR #29842 PR #29943 and Ianna Osborne in PR #29954 */ @@ -79,7 +79,7 @@ std::unique_ptr RPCGeometryESModule::produce(const MuonGeometryReco RPCGeometryBuilder builder; return std::unique_ptr(builder.build(&(*cpv), mdc)); } else if (fromDD4hep_) { - edm::LogVerbatim("RPCGeoemtryESModule") << "(0) RPCGeometryESModule - DD4HEP "; + edm::LogVerbatim("RPCGeoemtryESModule") << "(0) RPCGeometryESModule - DD4hep "; edm::ESTransientHandle cpv = record.getTransientHandle(idealDD4hepGeomToken_); auto const& mdc = record.get(dddConstantsToken_); RPCGeometryBuilder builder; diff --git a/Geometry/RPCGeometryBuilder/plugins/RPCGeometryValidate.cc b/Geometry/RPCGeometryBuilder/plugins/RPCGeometryValidate.cc index 50eddebee9c41..415c1550614b3 100644 --- a/Geometry/RPCGeometryBuilder/plugins/RPCGeometryValidate.cc +++ b/Geometry/RPCGeometryBuilder/plugins/RPCGeometryValidate.cc @@ -4,7 +4,7 @@ Description: RPC GeometryValidate from DD & DD4hep // -// Author: Sergio Lo Meo (sergio.lo.meo@cern.ch) following what Ianna Osburne made for DTs (DD4HEP migration) +// Author: Sergio Lo Meo (sergio.lo.meo@cern.ch) following what Ianna Osburne made for DTs (DD4hep migration) // Created: Fri, 20 Sep 2019 */ diff --git a/Geometry/RPCGeometryBuilder/src/RPCGeometryBuilder.cc b/Geometry/RPCGeometryBuilder/src/RPCGeometryBuilder.cc index f6c8917db84a2..63a662e6eb007 100644 --- a/Geometry/RPCGeometryBuilder/src/RPCGeometryBuilder.cc +++ b/Geometry/RPCGeometryBuilder/src/RPCGeometryBuilder.cc @@ -4,7 +4,7 @@ Description: RPC Geometry builder from DD & DD4hep 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) following what Ianna Osborne made for DTs (DD4HEP migration) +// Author: Sergio Lo Meo (sergio.lo.meo@cern.ch) following what Ianna Osborne made for DTs (DD4hep migration) // Created: Fri, 20 Sep 2019 // Modified: Fri, 29 May 2020, following what Sunanda Banerjee made in PR #29842 PR #29943 and Ianna Osborne in PR #29954 */ diff --git a/Geometry/RPCGeometryBuilder/src/RPCGeometryBuilder.h b/Geometry/RPCGeometryBuilder/src/RPCGeometryBuilder.h index 01a9998cd2e87..fad238a4c9806 100644 --- a/Geometry/RPCGeometryBuilder/src/RPCGeometryBuilder.h +++ b/Geometry/RPCGeometryBuilder/src/RPCGeometryBuilder.h @@ -6,7 +6,7 @@ Description: RPC Geometry builder from DD & DD4hep 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) following what Ianna Osborne made for DTs (DD4HEP migration) +// Author: Sergio Lo Meo (sergio.lo.meo@cern.ch) following what Ianna Osborne made for DTs (DD4hep migration) // Created: Fri, 20 Sep 2019 // Modified: Fri, 29 May 2020, following what Sunanda Banerjee made in PR #29842 PR #29943 and Ianna Osborne in PR #29954 */ diff --git a/Geometry/TrackerCommonData/test/python/dumpTrackerDD4Hep_cfg.py b/Geometry/TrackerCommonData/test/python/dumpTrackerDD4hep_cfg.py similarity index 100% rename from Geometry/TrackerCommonData/test/python/dumpTrackerDD4Hep_cfg.py rename to Geometry/TrackerCommonData/test/python/dumpTrackerDD4hep_cfg.py diff --git a/Geometry/TrackerNumberingBuilder/src/GeometricDet.cc b/Geometry/TrackerNumberingBuilder/src/GeometricDet.cc index eaf2719520dcd..9579db5aef07c 100644 --- a/Geometry/TrackerNumberingBuilder/src/GeometricDet.cc +++ b/Geometry/TrackerNumberingBuilder/src/GeometricDet.cc @@ -102,7 +102,7 @@ GeometricDet::GeometricDet(DDFilteredView* fv, GeometricEnumType type) } /* - Constructor from DD4HEP Filtered view. + Constructor from DD4hep Filtered view. */ GeometricDet::GeometricDet(cms::DDFilteredView* fv, GeometricEnumType type) : ddname_(dd4hep::dd::noNamespace(fv->name())), diff --git a/MagneticField/Engine/test/regression.py b/MagneticField/Engine/test/regression.py index 70e5f217a2eb7..650b314b77863 100644 --- a/MagneticField/Engine/test/regression.py +++ b/MagneticField/Engine/test/regression.py @@ -10,7 +10,7 @@ 'static_DDD', #default value VarParsing.VarParsing.multiplicity.singleton, VarParsing.VarParsing.varType.string, - "MF producer to use. Valid values: 'static_DDD', 'static_DD4Hep', 'fromDB', 'fromDB_DD4Hep'") + "MF producer to use. Valid values: 'static_DDD', 'static_DD4hep', 'fromDB', 'fromDB_DD4hep'") options.register('era', 'RunII', #default value @@ -40,7 +40,7 @@ if options.current < 0 : # Test all currents, simulating different IOVs with different values runInfo # FIXME: currents are set all equal for the time being because we need to set up a way to specify the correct # reference file file to be picked for each at runtime. - if options.producerType == 'static_DDD' or options.producerType == 'static_DD4Hep' : + if options.producerType == 'static_DDD' or options.producerType == 'static_DD4hep' : sys.exit('Invalid configuration: current=-1 mode is not supported with static prouducers') process.maxEvents.input = 4 process.source.numberEventsInLuminosityBlock =cms.untracked.uint32(1) @@ -113,7 +113,7 @@ process.load("MagneticField.Engine.volumeBasedMagneticField_71212_cfi") #2.0T -elif options.producerType == 'static_DD4Hep' : +elif options.producerType == 'static_DD4hep' : process.load("MagneticField.Engine.volumeBasedMagneticField_dd4hep_160812_cfi") if options.current > 17543 : if options.era == 'RunI' : @@ -125,13 +125,13 @@ process.VolumeBasedMagneticFieldESProducer.version = cms.string('grid_160812_3t') process.ParametrizedMagneticFieldProducer.parameters.BValue = cms.string('3_0T') elif options.current > 4779 : - sys.exit('ERROR: Unsupported current for static_DD4Hep: ' + str(options.current)) + sys.exit('ERROR: Unsupported current for static_DD4hep: ' + str(options.current)) -elif options.producerType == 'fromDB' or options.producerType == 'fromDB_DD4Hep': +elif options.producerType == 'fromDB' or options.producerType == 'fromDB_DD4hep': if options.producerType == 'fromDB': process.load("Configuration.StandardSequences.MagneticField_cff") - elif options.producerType == 'fromDB_DD4Hep': + elif options.producerType == 'fromDB_DD4hep': process.load("MagneticField.Engine.volumeBasedMagneticFieldFromDB_dd4hep_cfi") process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") diff --git a/MagneticField/Engine/test/runTest.sh b/MagneticField/Engine/test/runTest.sh index 4cbd3a060588c..1c46565f71c71 100755 --- a/MagneticField/Engine/test/runTest.sh +++ b/MagneticField/Engine/test/runTest.sh @@ -9,31 +9,31 @@ echo "===== Test MF map regressions ====" #Run II, 3.8T (cmsRun ${LOCAL_TEST_DIR}/regression.py producerType=static_DDD) || die "MF regression failure, from xml, DDD, 3.8T" $? (cmsRun ${LOCAL_TEST_DIR}/regression.py producerType=fromDB) || die "MF regression failure, from DB, DDD, 3.8T" $? -(cmsRun ${LOCAL_TEST_DIR}/regression.py producerType=static_DD4Hep) || die "MF regression failure, from xml, DD4hep, 3.8T" $? -(cmsRun ${LOCAL_TEST_DIR}/regression.py producerType=fromDB_DD4Hep) || die "MF regression failure, from DB, DD4hep, 3.8T" $? +(cmsRun ${LOCAL_TEST_DIR}/regression.py producerType=static_DD4hep) || die "MF regression failure, from xml, DD4hep, 3.8T" $? +(cmsRun ${LOCAL_TEST_DIR}/regression.py producerType=fromDB_DD4hep) || die "MF regression failure, from DB, DD4hep, 3.8T" $? #Run I, 3.8T #(cmsRun ${LOCAL_TEST_DIR}/regression.py producerType=static_DDD era=RunI) || die "MF regression failure, from xml, DDD, 3.8T RunI" $? (cmsRun ${LOCAL_TEST_DIR}/regression.py producerType=fromDB era=RunI) || die "MF regression failure, from DB, DDD, 3.8T RunI" $? -#(cmsRun ${LOCAL_TEST_DIR}/regression.py producerType=static_DD4Hep era=RunI) || die "MF regression failure, from xml, DD4hep, 3.8T RunI" $? -#(cmsRun ${LOCAL_TEST_DIR}/regression.py producerType=fromDB_DD4Hep era=RunI) || die "MF regression failure, from DB, DD4hep, 3.8T RunI" $? +#(cmsRun ${LOCAL_TEST_DIR}/regression.py producerType=static_DD4hep era=RunI) || die "MF regression failure, from xml, DD4hep, 3.8T RunI" $? +#(cmsRun ${LOCAL_TEST_DIR}/regression.py producerType=fromDB_DD4hep era=RunI) || die "MF regression failure, from DB, DD4hep, 3.8T RunI" $? #Run II, 3.5T export CURRENT=16730 #(cmsRun ${LOCAL_TEST_DIR}/regression.py producerType=static_DDD current=$CURRENT) || die "MF regression failure, from xml, DDD, 3.5T" $? #(cmsRun ${LOCAL_TEST_DIR}/regression.py producerType=fromDB current=$CURRENT) || die "MF regression failure, from DB, DDD, 3.5T" $? -(cmsRun ${LOCAL_TEST_DIR}/regression.py producerType=static_DD4Hep current=$CURRENT) || die "MF regression failure, from xml, DD4hep, 3.5T" $? -#(cmsRun ${LOCAL_TEST_DIR}/regression.py producerType=fromDB_DD4Hep current=$CURRENT) || die "MF regression failure, from DB, DD4hep, 3.5T" $? +(cmsRun ${LOCAL_TEST_DIR}/regression.py producerType=static_DD4hep current=$CURRENT) || die "MF regression failure, from xml, DD4hep, 3.5T" $? +#(cmsRun ${LOCAL_TEST_DIR}/regression.py producerType=fromDB_DD4hep current=$CURRENT) || die "MF regression failure, from DB, DD4hep, 3.5T" $? #Run II, 3T export CURRENT=14340 (cmsRun ${LOCAL_TEST_DIR}/regression.py producerType=static_DDD current=$CURRENT) || die "MF regression failure, from xml, DDD, 3T" $? #(cmsRun ${LOCAL_TEST_DIR}/regression.py producerType=fromDB current=$CURRENT) || die "MF regression failure, from DB, DDD, 3T" $? -#(cmsRun ${LOCAL_TEST_DIR}/regression.py producerType=static_DD4Hep current=$CURRENT) || die "MF regression failure, from xml, DD4hep, 3T" $? -#(cmsRun ${LOCAL_TEST_DIR}/regression.py producerType=fromDB_DD4Hep current=$CURRENT) || die "MF regression failure, from DB, DD4hep, 3T" $? +#(cmsRun ${LOCAL_TEST_DIR}/regression.py producerType=static_DD4hep current=$CURRENT) || die "MF regression failure, from xml, DD4hep, 3T" $? +#(cmsRun ${LOCAL_TEST_DIR}/regression.py producerType=fromDB_DD4hep current=$CURRENT) || die "MF regression failure, from DB, DD4hep, 3T" $? #Run II, 2T export CURRENT=9500 #(cmsRun ${LOCAL_TEST_DIR}/regression.py producerType=static_DDD current=$CURRENT) || die "MF regression failure, from xml, DDD, 2T" $? #(cmsRun ${LOCAL_TEST_DIR}/regression.py producerType=fromDB current=$CURRENT) || die "MF regression failure, from DB, DDD, 2T" $? -(cmsRun ${LOCAL_TEST_DIR}/regression.py producerType=fromDB_DD4Hep current=$CURRENT) || die "MF regression failure, from DB, DD4hep, 2T" $? +(cmsRun ${LOCAL_TEST_DIR}/regression.py producerType=fromDB_DD4hep current=$CURRENT) || die "MF regression failure, from DB, DD4hep, 2T" $? diff --git a/MagneticField/GeomBuilder/data/cms-mf-geometry_160812.xml b/MagneticField/GeomBuilder/data/cms-mf-geometry_160812.xml index ba5a4b48e2b68..154b187a6d4f2 100644 --- a/MagneticField/GeomBuilder/data/cms-mf-geometry_160812.xml +++ b/MagneticField/GeomBuilder/data/cms-mf-geometry_160812.xml @@ -27,7 +27,7 @@ - + diff --git a/MagneticField/GeomBuilder/data/cms-mf-geometry_71212.xml b/MagneticField/GeomBuilder/data/cms-mf-geometry_71212.xml index 5a76f1b4d94b5..a752dbc4c8dbc 100644 --- a/MagneticField/GeomBuilder/data/cms-mf-geometry_71212.xml +++ b/MagneticField/GeomBuilder/data/cms-mf-geometry_71212.xml @@ -26,7 +26,7 @@ - + diff --git a/MagneticField/GeomBuilder/plugins/dd4hep/DD4hep_VolumeBasedMagneticFieldESProducerFromDB.cc b/MagneticField/GeomBuilder/plugins/dd4hep/DD4hep_VolumeBasedMagneticFieldESProducerFromDB.cc index d920c2a5e4c0d..db3413c2a1cea 100644 --- a/MagneticField/GeomBuilder/plugins/dd4hep/DD4hep_VolumeBasedMagneticFieldESProducerFromDB.cc +++ b/MagneticField/GeomBuilder/plugins/dd4hep/DD4hep_VolumeBasedMagneticFieldESProducerFromDB.cc @@ -81,7 +81,7 @@ DD4hep_VolumeBasedMagneticFieldESProducerFromDB::DD4hep_VolumeBasedMagneticField const edm::ParameterSet& iConfig) : debug_(iConfig.getUntrackedParameter("debugBuilder")) { std::string const myConfigLabel = "VBMFESChoice"; - usesResources({edm::ESSharedResourceNames::kDD4Hep}); + usesResources({edm::ESSharedResourceNames::kDD4hep}); //Based on configuration, pick algorithm to produce the proper MagFieldConfig with a specific label const int current = iConfig.getParameter("valueOverride"); diff --git a/SimG4CMS/CherenkovAnalysis/data/SingleDREAMDD4Hep.xml b/SimG4CMS/CherenkovAnalysis/data/SingleDREAMDD4hep.xml similarity index 100% rename from SimG4CMS/CherenkovAnalysis/data/SingleDREAMDD4Hep.xml rename to SimG4CMS/CherenkovAnalysis/data/SingleDREAMDD4hep.xml diff --git a/SimG4CMS/CherenkovAnalysis/interface/DreamSD.h b/SimG4CMS/CherenkovAnalysis/interface/DreamSD.h index 3205f0f3bbfb9..514d7c4a17e55 100644 --- a/SimG4CMS/CherenkovAnalysis/interface/DreamSD.h +++ b/SimG4CMS/CherenkovAnalysis/interface/DreamSD.h @@ -58,10 +58,10 @@ class DreamSD : public CaloSD { bool setPbWO2MaterialProperties_(G4Material *aMaterial); static constexpr double k_ScaleFromDDDToG4 = 1.0; - static constexpr double k_ScaleFromDD4HepToG4 = 1.0 / dd4hep::mm; + static constexpr double k_ScaleFromDD4hepToG4 = 1.0 / dd4hep::mm; const DDCompactView *cpvDDD_; - const cms::DDCompactView *cpvDD4Hep_; + const cms::DDCompactView *cpvDD4hep_; bool useBirk_, doCherenkov_, readBothSide_, dd4hep_; double birk1_, birk2_, birk3_; diff --git a/SimG4CMS/CherenkovAnalysis/plugins/DreamSensitiveDetectorBuilder.cc b/SimG4CMS/CherenkovAnalysis/plugins/DreamSensitiveDetectorBuilder.cc index 20a1e1c4a2228..bc020b7ea525e 100644 --- a/SimG4CMS/CherenkovAnalysis/plugins/DreamSensitiveDetectorBuilder.cc +++ b/SimG4CMS/CherenkovAnalysis/plugins/DreamSensitiveDetectorBuilder.cc @@ -20,17 +20,17 @@ class DreamSensitiveDetectorBuilder : public SensitiveDetectorMakerBase { public: explicit DreamSensitiveDetectorBuilder(edm::ParameterSet const& p, edm::ConsumesCollector cc) { - fromDD4Hep_ = p.getParameter("g4GeometryDD4hepSource"); - if (fromDD4Hep_) - cpvTokenDD4Hep_ = cc.esConsumes(); + fromDD4hep_ = p.getParameter("g4GeometryDD4hepSource"); + if (fromDD4hep_) + cpvTokenDD4hep_ = cc.esConsumes(); else cpvTokenDDD_ = cc.esConsumes(); - edm::LogVerbatim("EcalSim") << "DreamSensitiveDetectorBuilder called with dd4hep flag " << fromDD4Hep_; + edm::LogVerbatim("EcalSim") << "DreamSensitiveDetectorBuilder called with dd4hep flag " << fromDD4hep_; } void beginRun(const edm::EventSetup& es) final { - if (fromDD4Hep_) { - cpvDD4Hep_ = &es.getData(cpvTokenDD4Hep_); + if (fromDD4hep_) { + cpvDD4hep_ = &es.getData(cpvTokenDD4hep_); } else { cpvDDD_ = &es.getData(cpvTokenDDD_); } @@ -41,17 +41,17 @@ class DreamSensitiveDetectorBuilder : public SensitiveDetectorMakerBase { const edm::ParameterSet& p, const SimTrackManager* man, SimActivityRegistry& reg) const final { - auto sd = std::make_unique(iname, cpvDDD_, cpvDD4Hep_, clg, p, man); + auto sd = std::make_unique(iname, cpvDDD_, cpvDD4hep_, clg, p, man); SimActivityRegistryEnroller::enroll(reg, sd.get()); return sd; } private: - bool fromDD4Hep_; + bool fromDD4hep_; edm::ESGetToken cpvTokenDDD_; - edm::ESGetToken cpvTokenDD4Hep_; + edm::ESGetToken cpvTokenDD4hep_; const DDCompactView* cpvDDD_; - const cms::DDCompactView* cpvDD4Hep_; + const cms::DDCompactView* cpvDD4hep_; }; typedef DreamSD DreamSensitiveDetector; diff --git a/SimG4CMS/CherenkovAnalysis/src/DreamSD.cc b/SimG4CMS/CherenkovAnalysis/src/DreamSD.cc index 57f355729dc12..db3fc73ca3197 100644 --- a/SimG4CMS/CherenkovAnalysis/src/DreamSD.cc +++ b/SimG4CMS/CherenkovAnalysis/src/DreamSD.cc @@ -30,11 +30,11 @@ //________________________________________________________________________________________ DreamSD::DreamSD(const std::string &name, const DDCompactView *cpvDDD, - const cms::DDCompactView *cpvDD4Hep, + const cms::DDCompactView *cpvDD4hep, const SensitiveDetectorCatalog &clg, edm::ParameterSet const &p, const SimTrackManager *manager) - : CaloSD(name, clg, p, manager), cpvDDD_(cpvDDD), cpvDD4Hep_(cpvDD4Hep) { + : CaloSD(name, clg, p, manager), cpvDDD_(cpvDDD), cpvDD4hep_(cpvDD4hep) { edm::ParameterSet m_EC = p.getParameter("ECalSD"); useBirk_ = m_EC.getParameter("UseBirkLaw"); doCherenkov_ = m_EC.getParameter("doCherenkov"); @@ -120,7 +120,7 @@ uint32_t DreamSD::setDetUnitId(const G4Step *aStep) { void DreamSD::initMap(const std::string &sd) { if (dd4hep_) { const cms::DDFilter filter("ReadOutName", sd); - cms::DDFilteredView fv((*cpvDD4Hep_), filter); + cms::DDFilteredView fv((*cpvDD4hep_), filter); while (fv.firstChild()) { std::string name = static_cast(dd4hep::dd::noNamespace(fv.name())); std::vector paras(fv.parameters()); @@ -130,8 +130,8 @@ void DreamSD::initMap(const std::string &sd) { #endif // Set length to be the largest size, width the smallest std::sort(paras.begin(), paras.end()); - double length = 2.0 * k_ScaleFromDD4HepToG4 * paras.back(); - double width = 2.0 * k_ScaleFromDD4HepToG4 * paras.front(); + double length = 2.0 * k_ScaleFromDD4hepToG4 * paras.back(); + double width = 2.0 * k_ScaleFromDD4hepToG4 * paras.front(); fillMap(name, length, width); } } else { diff --git a/SimG4CMS/CherenkovAnalysis/test/runSingleDREAMDD4Hep_cfg.py b/SimG4CMS/CherenkovAnalysis/test/runSingleDREAMDD4hep_cfg.py similarity index 97% rename from SimG4CMS/CherenkovAnalysis/test/runSingleDREAMDD4Hep_cfg.py rename to SimG4CMS/CherenkovAnalysis/test/runSingleDREAMDD4hep_cfg.py index e4069a5951fbe..c02940a7c4bee 100644 --- a/SimG4CMS/CherenkovAnalysis/test/runSingleDREAMDD4Hep_cfg.py +++ b/SimG4CMS/CherenkovAnalysis/test/runSingleDREAMDD4hep_cfg.py @@ -38,7 +38,7 @@ process.p1 = cms.Path(process.generator*process.VtxSmeared*process.generatorSmeared*process.g4SimHits*process.cherenkovAnalysis) -process.DDDetectorESProducer.confGeomXMLFiles = cms.FileInPath("SimG4CMS/CherenkovAnalysis/data/SingleDREAMDD4Hep.xml") +process.DDDetectorESProducer.confGeomXMLFiles = cms.FileInPath("SimG4CMS/CherenkovAnalysis/data/SingleDREAMDD4hep.xml") process.generator.PGunParameters.MinE = 10.0 process.generator.PGunParameters.MaxE = 10.0 process.g4SimHits.UseMagneticField = False diff --git a/SimG4CMS/CherenkovAnalysis/test/runSingleDREAMDDD_cfg.py b/SimG4CMS/CherenkovAnalysis/test/runSingleDREAMDDD_cfg.py index f00be6da65cf4..e3cca53ddb51c 100644 --- a/SimG4CMS/CherenkovAnalysis/test/runSingleDREAMDDD_cfg.py +++ b/SimG4CMS/CherenkovAnalysis/test/runSingleDREAMDDD_cfg.py @@ -43,7 +43,7 @@ process.g4SimHits.ECalSD = cms.PSet( TestBeam = cms.untracked.bool(False), ReadBothSide = cms.untracked.bool(True), - DD4Hep = cms.untracked.bool(False), + DD4hep = cms.untracked.bool(False), BirkL3Parametrization = cms.bool(False), doCherenkov = cms.bool(True), BirkCut = cms.double(0.1), diff --git a/SimG4CMS/CherenkovAnalysis/test/testMuon_cfg.py b/SimG4CMS/CherenkovAnalysis/test/testMuon_cfg.py index 3f77a26b73315..3f300c9526f53 100644 --- a/SimG4CMS/CherenkovAnalysis/test/testMuon_cfg.py +++ b/SimG4CMS/CherenkovAnalysis/test/testMuon_cfg.py @@ -73,7 +73,7 @@ TestBeam = cms.untracked.bool(False), ReadBothSide = cms.untracked.bool(False), BirkL3Parametrization = cms.bool(False), - DD4Hep = cms.untracked.bool(False), + DD4hep = cms.untracked.bool(False), doCherenkov = cms.bool(False), BirkCut = cms.double(0.1), BirkC1 = cms.double(0.0045), diff --git a/SimG4CMS/HGCalTestBeam/plugins/HGCPassive.cc b/SimG4CMS/HGCalTestBeam/plugins/HGCPassive.cc index 6c30d5cb7b127..2569fe5edda27 100644 --- a/SimG4CMS/HGCalTestBeam/plugins/HGCPassive.cc +++ b/SimG4CMS/HGCalTestBeam/plugins/HGCPassive.cc @@ -78,7 +78,7 @@ HGCPassive::HGCPassive(const edm::ParameterSet &p) : topPV_(nullptr), topLV_(nul edm::ParameterSet m_Passive = p.getParameter("HGCPassive"); LVNames_ = m_Passive.getParameter>("LVNames"); motherName_ = m_Passive.getParameter("MotherName"); - bool dd4hep = m_Passive.getParameter("IfDD4Hep"); + bool dd4hep = m_Passive.getParameter("IfDD4hep"); addlevel_ = dd4hep ? 1 : 0; #ifdef EDM_ML_DEBUG diff --git a/SimG4CMS/HGCalTestBeam/test/HGCalTBCERN170_cfg.py b/SimG4CMS/HGCalTestBeam/test/HGCalTBCERN170_cfg.py index ffebf5a7ea94d..5b1817ac1669f 100644 --- a/SimG4CMS/HGCalTestBeam/test/HGCalTBCERN170_cfg.py +++ b/SimG4CMS/HGCalTestBeam/test/HGCalTBCERN170_cfg.py @@ -103,7 +103,7 @@ HGCPassive = cms.PSet( LVNames = cms.vstring('HGCalEE','HGCalHE','HGCalAH', 'HGCalBeam', 'CMSE'), MotherName = cms.string('OCMS'), - IfDD4Hep = cms.bool(False), + IfDD4hep = cms.bool(False), ), type = cms.string('HGCPassive'), ) diff --git a/SimG4CMS/HGCalTestBeam/test/HGCalTBCERN181Oct1DD4Hep_cfg.py b/SimG4CMS/HGCalTestBeam/test/HGCalTBCERN181Oct1DD4hep_cfg.py similarity index 97% rename from SimG4CMS/HGCalTestBeam/test/HGCalTBCERN181Oct1DD4Hep_cfg.py rename to SimG4CMS/HGCalTestBeam/test/HGCalTBCERN181Oct1DD4hep_cfg.py index b6ce1cd26dbd1..ea373e69ce7e7 100644 --- a/SimG4CMS/HGCalTestBeam/test/HGCalTBCERN181Oct1DD4Hep_cfg.py +++ b/SimG4CMS/HGCalTestBeam/test/HGCalTBCERN181Oct1DD4hep_cfg.py @@ -57,14 +57,14 @@ dataTier = cms.untracked.string('GEN-SIM'), filterName = cms.untracked.string('') ), - fileName = cms.untracked.string('file:TBGenSim181Oct1DD4Hep.root'), + fileName = cms.untracked.string('file:TBGenSim181Oct1DD4hep.root'), outputCommands = process.FEVTDEBUGEventContent.outputCommands, splitLevel = cms.untracked.int32(0) ) # Additional output definition process.TFileService = cms.Service("TFileService", - fileName = cms.string('TBGenSimDD4Hep.root') + fileName = cms.string('TBGenSimDD4hep.root') ) # Other statements @@ -105,7 +105,7 @@ HGCPassive = cms.PSet( LVNames = cms.vstring('HGCalEE','HGCalHE','HGCalAH', 'HGCalBeam', 'CMSE'), MotherName = cms.string('OCMS'), - IfDD4Hep = cms.bool(True), + IfDD4hep = cms.bool(True), ), type = cms.string('HGCPassive'), ) diff --git a/SimG4CMS/HGCalTestBeam/test/HGCalTBCERN181Oct1PC1mm_cfg.py b/SimG4CMS/HGCalTestBeam/test/HGCalTBCERN181Oct1PC1mm_cfg.py index f7a646183257c..26fdf2fd702bf 100644 --- a/SimG4CMS/HGCalTestBeam/test/HGCalTBCERN181Oct1PC1mm_cfg.py +++ b/SimG4CMS/HGCalTestBeam/test/HGCalTBCERN181Oct1PC1mm_cfg.py @@ -103,7 +103,7 @@ HGCPassive = cms.PSet( LVNames = cms.vstring('HGCalEE','HGCalHE','HGCalAH', 'HGCalBeam', 'CMSE'), MotherName = cms.string('OCMS'), - IfDD4Hep = cms.bool(False), + IfDD4hep = cms.bool(False), ), type = cms.string('HGCPassive'), ) diff --git a/SimG4CMS/HGCalTestBeam/test/HGCalTBCERN181Oct1_cfg.py b/SimG4CMS/HGCalTestBeam/test/HGCalTBCERN181Oct1_cfg.py index dedf1c3e905b5..45587c8108c8b 100644 --- a/SimG4CMS/HGCalTestBeam/test/HGCalTBCERN181Oct1_cfg.py +++ b/SimG4CMS/HGCalTestBeam/test/HGCalTBCERN181Oct1_cfg.py @@ -102,7 +102,7 @@ HGCPassive = cms.PSet( LVNames = cms.vstring('HGCalEE','HGCalHE','HGCalAH', 'HGCalBeam', 'CMSE'), MotherName = cms.string('OCMS'), - IfDD4Hep = cms.bool(False), + IfDD4hep = cms.bool(False), ), type = cms.string('HGCPassive'), ) diff --git a/SimG4CMS/HGCalTestBeam/test/HGCalTBCERN181Oct1el100_cfg.py b/SimG4CMS/HGCalTestBeam/test/HGCalTBCERN181Oct1el100_cfg.py index 2ff18aae945a8..93469f479eb73 100644 --- a/SimG4CMS/HGCalTestBeam/test/HGCalTBCERN181Oct1el100_cfg.py +++ b/SimG4CMS/HGCalTestBeam/test/HGCalTBCERN181Oct1el100_cfg.py @@ -104,7 +104,7 @@ HGCPassive = cms.PSet( LVNames = cms.vstring('HGCalEE','HGCalHE','HGCalAH', 'HGCalBeam', 'CMSE'), MotherName = cms.string('OCMS'), - IfDD4Hep = cms.bool(False), + IfDD4hep = cms.bool(False), ), type = cms.string('HGCPassive'), ) diff --git a/SimG4CMS/HGCalTestBeam/test/HGCalTBCERN181Oct2_cfg.py b/SimG4CMS/HGCalTestBeam/test/HGCalTBCERN181Oct2_cfg.py index 78e5591094328..6aa7ac21ce3c5 100644 --- a/SimG4CMS/HGCalTestBeam/test/HGCalTBCERN181Oct2_cfg.py +++ b/SimG4CMS/HGCalTestBeam/test/HGCalTBCERN181Oct2_cfg.py @@ -102,7 +102,7 @@ HGCPassive = cms.PSet( LVNames = cms.vstring('HGCalEE','HGCalHE','HGCalAH', 'HGCalBeam', 'CMSE'), MotherName = cms.string('OCMS'), - IfDD4Hep = cms.bool(False), + IfDD4hep = cms.bool(False), ), type = cms.string('HGCPassive'), ) diff --git a/SimG4CMS/HGCalTestBeam/test/HGCalTBCERN181Oct3_cfg.py b/SimG4CMS/HGCalTestBeam/test/HGCalTBCERN181Oct3_cfg.py index adfa709001079..39677a35f6e8f 100644 --- a/SimG4CMS/HGCalTestBeam/test/HGCalTBCERN181Oct3_cfg.py +++ b/SimG4CMS/HGCalTestBeam/test/HGCalTBCERN181Oct3_cfg.py @@ -102,7 +102,7 @@ HGCPassive = cms.PSet( LVNames = cms.vstring('HGCalEE','HGCalHE','HGCalAH', 'HGCalBeam', 'CMSE'), MotherName = cms.string('OCMS'), - IfDD4Hep = cms.bool(False), + IfDD4hep = cms.bool(False), ), type = cms.string('HGCPassive'), ) diff --git a/SimG4CMS/HGCalTestBeam/test/HGCalTBCERN181Oct4_cfg.py b/SimG4CMS/HGCalTestBeam/test/HGCalTBCERN181Oct4_cfg.py index 26a3a41c82086..0262c64699b8a 100644 --- a/SimG4CMS/HGCalTestBeam/test/HGCalTBCERN181Oct4_cfg.py +++ b/SimG4CMS/HGCalTestBeam/test/HGCalTBCERN181Oct4_cfg.py @@ -102,7 +102,7 @@ HGCPassive = cms.PSet( LVNames = cms.vstring('HGCalEE','HGCalHE','HGCalAH', 'HGCalBeam', 'CMSE'), MotherName = cms.string('OCMS'), - IfDD4Hep = cms.bool(False), + IfDD4hep = cms.bool(False), ), type = cms.string('HGCPassive'), ) diff --git a/SimG4Core/PrintGeomInfo/test/SimFileCompare.cpp b/SimG4Core/PrintGeomInfo/test/SimFileCompare.cpp index d20fb2f2b2cb1..1ca8bbf444c99 100644 --- a/SimG4Core/PrintGeomInfo/test/SimFileCompare.cpp +++ b/SimG4Core/PrintGeomInfo/test/SimFileCompare.cpp @@ -9,8 +9,8 @@ // type (int) Type of file: material (0), solid (1), // LogicalVolume (2), PhysicalVolume (3) // files (int) Double digits each inidicating the file source -// (0 for DDD, 1 for DD4HEP). So if first file is -// DDD and second is DD4HEP, it will be 10 +// (0 for DDD, 1 for DD4hep). So if first file is +// DDD and second is DD4hep, it will be 10 // mode (int) Treat (0) or not treat (1) names from DDD // deug (int) Single digit number (0 minimum printout) // @@ -376,7 +376,7 @@ int main(int argc, char* argv[]) { << "name of the first input file\n" << "name of the second input file\n" << "type (Material:0, Solid:1, LV:2, PV:3\n" - << "files (10 if first file from DDD and second from DD4HEP)\n" + << "files (10 if first file from DDD and second from DD4hep)\n" << "mode (treat the name for DDD or not == needed for PV)\n" << "debug flag (0 for minimum printout)\n" << std::endl; diff --git a/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheckDD4Hep_cfg.py b/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheckDD4hep_cfg.py similarity index 100% rename from SimG4Core/PrintGeomInfo/test/python/g4OverlapCheckDD4Hep_cfg.py rename to SimG4Core/PrintGeomInfo/test/python/g4OverlapCheckDD4hep_cfg.py diff --git a/SimG4Core/PrintGeomInfo/test/python/runDD4HepBigXML_cfg.py b/SimG4Core/PrintGeomInfo/test/python/runDD4hepBigXML_cfg.py similarity index 100% rename from SimG4Core/PrintGeomInfo/test/python/runDD4HepBigXML_cfg.py rename to SimG4Core/PrintGeomInfo/test/python/runDD4hepBigXML_cfg.py diff --git a/SimG4Core/PrintGeomInfo/test/python/runDD4HepDB_cfg.py b/SimG4Core/PrintGeomInfo/test/python/runDD4hepDB_cfg.py similarity index 100% rename from SimG4Core/PrintGeomInfo/test/python/runDD4HepDB_cfg.py rename to SimG4Core/PrintGeomInfo/test/python/runDD4hepDB_cfg.py diff --git a/SimG4Core/PrintGeomInfo/test/python/runDD4HepXML_cfg.py b/SimG4Core/PrintGeomInfo/test/python/runDD4hepXML_cfg.py similarity index 100% rename from SimG4Core/PrintGeomInfo/test/python/runDD4HepXML_cfg.py rename to SimG4Core/PrintGeomInfo/test/python/runDD4hepXML_cfg.py diff --git a/Validation/Geometry/macros/MatBudgetHcal.C b/Validation/Geometry/macros/MatBudgetHcal.C index 9dbade1a2def1..ba1a0ac67bcfb 100644 --- a/Validation/Geometry/macros/MatBudgetHcal.C +++ b/Validation/Geometry/macros/MatBudgetHcal.C @@ -13,9 +13,9 @@ // tag (string) Tag to be added to the name of the canvas ("Run") // debug (bool) print or not the debug information (false) // -// etaPhiPlotComp(fileName1, fileName2, plot, lay, ifEta, maxEta, tag1, +// etaPhiPlotComp(fileName1, fileName2, plot, lay, ifEta, maxEta, tag1, // tag2, debug) -// Make superimposed plors of integrated interaction/radiation/step +// Make superimposed plors of integrated interaction/radiation/step // lengths from 2 files produced through 2 sources of geometry as a // function of eta or phi // @@ -38,7 +38,7 @@ // the same meanings as those of *etaPhiPlot* // // etaSlicePlot(fileName, plot, ifirst, ilast, ietaRange, drawLeg, tag, debug); -// Plot phi distributions of integrated interaction/radiation/step +// Plot phi distributions of integrated interaction/radiation/step // length for a given ietaRange (0 -> 28; 1 --> 29; 2 --> 9) // // printTable(fileName, outputFileName, inputFileName) @@ -93,14 +93,14 @@ void etaPhiPlot(TString fileName = "matbdg_HCAL.root", std::string tag = "Run", bool debug = false); void etaPhiPlotComp(TString fileName1 = "matbdgHCAL_run3.root", - TString fileName2 = "matbdgHCAL_run3_dd4hep.root", - std::string plot = "IntLen", - int lay = 2, - bool ifEta = true, - double maxEta = -1, - std::string tag1 = "DDD", - std::string tag2 = "DD4HEP", - bool debug = false); + TString fileName2 = "matbdgHCAL_run3_dd4hep.root", + std::string plot = "IntLen", + int lay = 2, + bool ifEta = true, + double maxEta = -1, + std::string tag1 = "DDD", + std::string tag2 = "DD4hep", + bool debug = false); void etaPhiPlotHO(TString fileName = "matbdg_HCAL.root", TString plot = "IntLen", int drawLeg = 1, @@ -126,13 +126,13 @@ void etaPhi2DPlot(TString fileName = "matbdg_HCAL.root", int drawLeg = 1, std::string tag = "Run"); void etaSlicePlot(TString fileName = "matbdg_HCAL.root", - TString plot = "IntLen", - int ifirst = 0, - int ilast = 19, - int ietaRange = 0, - int drawLeg = 1, - std::string tag = "Run", - bool debug = false); + TString plot = "IntLen", + int ifirst = 0, + int ilast = 19, + int ietaRange = 0, + int drawLeg = 1, + std::string tag = "Run", + bool debug = false); void etaPhi2DPlot(int nslice, int kslice, TString fileName = "matbdg_HCAL.root", @@ -274,7 +274,7 @@ void etaPhiPlot(TString fileName, for (int ibx = 0; ibx < nbinX; ibx++) { double xx1 = xmin + ibx * dx; double cont = prof[0]->GetBinContent(ibx + 1); - std::cout << " | " << ibx << "(" << xx1 << ":" << (xx1 + dx) << ") " << cont; + std::cout << " | " << ibx << "(" << xx1 << ":" << (xx1 + dx) << ") " << cont; } std::cout << "\n"; } @@ -295,25 +295,25 @@ void etaPhiPlot(TString fileName, } void etaPhiPlotComp(TString fileName1, - TString fileName2, - std::string plot, - int lay, - bool ifEta, - double maxEta, - std::string tag1, - std::string tag2, - bool debug) { + TString fileName2, + std::string plot, + int lay, + bool ifEta, + double maxEta, + std::string tag1, + std::string tag2, + bool debug) { setStyle(); TFile *file1 = new TFile(fileName1); TFile *file2 = new TFile(fileName2); - if (lay < 0) + if (lay < 0) lay = 0; else if (lay > 21) lay = 21; if ((file1 != nullptr) && (file2 != nullptr)) { TDirectory *dir1 = (TDirectory *)(file1->FindObjectAny("g4SimHits")); TDirectory *dir2 = (TDirectory *)(file2->FindObjectAny("g4SimHits")); - + TString xtit = TString("#eta"); std::string ztit("eta"); std::string ytit("none"); @@ -344,9 +344,8 @@ void etaPhiPlotComp(TString fileName1, xtit = TString("#phi"); ztit = "phi"; } - double fac[23] = {0.05, 0.1, 0.3, 0.3, 0.3, 0.3, 0.3, 0.4, 0.4, 0.4, - 0.5, 0.5, 0.5, 0.5, 0.6, 0.6, 0.7, 0.8, 0.8, 0.9, - 1.0, 1.0, 1.0}; + double fac[23] = {0.05, 0.1, 0.3, 0.3, 0.3, 0.3, 0.3, 0.4, 0.4, 0.4, 0.5, 0.5, + 0.5, 0.5, 0.6, 0.6, 0.7, 0.8, 0.8, 0.9, 1.0, 1.0, 1.0}; ymax *= fac[lay]; TLegend *leg = new TLegend(xh - 0.13, 0.80, xh, 0.90); @@ -358,7 +357,7 @@ void etaPhiPlotComp(TString fileName1, int color[2] = {2, 4}; char hname[10], title[50], cname[100]; if (lay > 1 && lay < 21) { - sprintf(title, "%s (Layer %d)", ytit.c_str(), lay-1); + sprintf(title, "%s (Layer %d)", ytit.c_str(), lay - 1); } else if (lay == 1) { sprintf(title, "%s (After Crystal)", ytit.c_str()); } else if (lay > 20) { @@ -371,28 +370,28 @@ void etaPhiPlotComp(TString fileName1, dir2->GetObject(hname, prof[1]); if ((prof[0] != nullptr) && (prof[1] != nullptr)) { for (int k = 0; k < 2; ++k) { - prof[k]->GetXaxis()->SetTitle(xtit); - prof[k]->GetYaxis()->SetTitle(title); - prof[k]->GetYaxis()->SetRangeUser(ymin, ymax); - prof[k]->SetLineColor(color[k]); - prof[k]->SetLineWidth(2); - if (ifEta && maxEta > 0) - prof[k]->GetXaxis()->SetRangeUser(-maxEta, maxEta); - if (xh < 0.8) - prof[k]->GetYaxis()->SetTitleOffset(1.7); - else - prof[k]->GetYaxis()->SetTitleOffset(1.0); - if (k == 0) - leg->AddEntry(prof[k], tag1.c_str(), "lf"); - else - leg->AddEntry(prof[k], tag2.c_str(), "lf"); + prof[k]->GetXaxis()->SetTitle(xtit); + prof[k]->GetYaxis()->SetTitle(title); + prof[k]->GetYaxis()->SetRangeUser(ymin, ymax); + prof[k]->SetLineColor(color[k]); + prof[k]->SetLineWidth(2); + if (ifEta && maxEta > 0) + prof[k]->GetXaxis()->SetRangeUser(-maxEta, maxEta); + if (xh < 0.8) + prof[k]->GetYaxis()->SetTitleOffset(1.7); + else + prof[k]->GetYaxis()->SetTitleOffset(1.0); + if (k == 0) + leg->AddEntry(prof[k], tag1.c_str(), "lf"); + else + leg->AddEntry(prof[k], tag2.c_str(), "lf"); } - sprintf (cname, "c_%sLay%d%s%s%s", plot1.c_str(), lay, ztit.c_str(), tag1.c_str(), tag2.c_str()); + sprintf(cname, "c_%sLay%d%s%s%s", plot1.c_str(), lay, ztit.c_str(), tag1.c_str(), tag2.c_str()); TCanvas *cc1 = new TCanvas(cname, cname, 700, 600); if (xh < 0.8) { - cc1->SetLeftMargin(0.15); - cc1->SetRightMargin(0.05); + cc1->SetLeftMargin(0.15); + cc1->SetRightMargin(0.05); } prof[0]->Draw("h"); @@ -400,21 +399,22 @@ void etaPhiPlotComp(TString fileName1, leg->Draw("sames"); if (debug) { - int nbinX = prof[0]->GetNbinsX(); - double xmin = prof[0]->GetXaxis()->GetXmin(); - double xmax = prof[0]->GetXaxis()->GetXmax(); - double dx = (xmax - xmin) / nbinX; - for (int ibx = 0; ibx < nbinX; ibx++) { - double xx1 = xmin + ibx * dx; - if (xx1 >= -1.5 && xx1 < 1.5) { - double cont1 = prof[0]->GetBinContent(ibx + 1); - double cont2 = prof[1]->GetBinContent(ibx + 1); - if ((cont1 + cont2) > 0.01) { - double frac = 2.0 * (cont1 - cont2) / (cont1 + cont2); - std::cout << ibx << "(" << xx1 << ":" << (xx1 + dx) << ") " << cont1 << ":" << cont2 << ":" << frac << std::endl; - } - } - } + int nbinX = prof[0]->GetNbinsX(); + double xmin = prof[0]->GetXaxis()->GetXmin(); + double xmax = prof[0]->GetXaxis()->GetXmax(); + double dx = (xmax - xmin) / nbinX; + for (int ibx = 0; ibx < nbinX; ibx++) { + double xx1 = xmin + ibx * dx; + if (xx1 >= -1.5 && xx1 < 1.5) { + double cont1 = prof[0]->GetBinContent(ibx + 1); + double cont2 = prof[1]->GetBinContent(ibx + 1); + if ((cont1 + cont2) > 0.01) { + double frac = 2.0 * (cont1 - cont2) / (cont1 + cont2); + std::cout << ibx << "(" << xx1 << ":" << (xx1 + dx) << ") " << cont1 << ":" << cont2 << ":" << frac + << std::endl; + } + } + } } } } @@ -926,14 +926,8 @@ void etaPhi2DPlot( } } -void etaSlicePlot(TString fileName, - TString plot, - int ifirst, - int ilast, - int ietaRange, - int drawLeg, - std::string tag, - bool debug) { +void etaSlicePlot( + TString fileName, TString plot, int ifirst, int ilast, int ietaRange, int drawLeg, std::string tag, bool debug) { TFile *hcalFile = new TFile(fileName); hcalFile->cd("g4SimHits"); setStyle(); diff --git a/Validation/Geometry/macros/MatBudgetVolume.C b/Validation/Geometry/macros/MatBudgetVolume.C index aa51f0ae0f8aa..c509a254f6add 100644 --- a/Validation/Geometry/macros/MatBudgetVolume.C +++ b/Validation/Geometry/macros/MatBudgetVolume.C @@ -25,7 +25,7 @@ // by one of dddXML/dd4hepXML/dddDB/dd4hepDB strings // and finally with *tag* and ".root" // txt (std::string) Part of the y-title coming after #frac for the plot -// ("{DDD}{DD4Hep}") +// ("{DDD}{DD4hep}") // /////////////////////////////////////////////////////////////////////////////// @@ -66,7 +66,7 @@ void etaPhiPlotComp(TString fileName1 = "matbdg_run3.root", std::string plot = "intl", bool ifEta = true, std::string tag = "Run3", - std::string txt = "{DDD}/{DD4Hep}", + std::string txt = "{DDD}/{DD4hep}", bool debug = false); void etaPhiPlotComp4(std::string filePreFix = "files/matbdgRun3", std::string tag = "pre6", diff --git a/Validation/Geometry/python/materialBudgetVolume_cfi.py b/Validation/Geometry/python/materialBudgetVolume_cfi.py index 8df9233b3ed4b..75c9cbd822273 100644 --- a/Validation/Geometry/python/materialBudgetVolume_cfi.py +++ b/Validation/Geometry/python/materialBudgetVolume_cfi.py @@ -5,10 +5,10 @@ MaterialBudgetVolume = cms.PSet( lvNames = cms.vstring('BEAM', 'BEAM1', 'BEAM2', 'BEAM3', 'BEAM4', 'Tracker', 'ECAL', 'HCal', 'VCAL', 'MGNT', 'MUON', 'OQUA', 'CALOEC'), lvLevels = cms.vint32(3, 3, 3, 3, 3, 3, 4, 4, 3, 4, 3, 3, 4), - useDD4Hep = cms.bool(False), + useDD4hep = cms.bool(False), ), type = cms.string('MaterialBudgetVolume'), )) from Configuration.ProcessModifiers.dd4hep_cff import dd4hep -dd4hep.toModify( g4SimHits.Watchers[0].MaterialBudgetVolume, useDD4Hep = True ) +dd4hep.toModify( g4SimHits.Watchers[0].MaterialBudgetVolume, useDD4hep = True ) diff --git a/Validation/Geometry/src/MaterialBudgetHcalHistos.cc b/Validation/Geometry/src/MaterialBudgetHcalHistos.cc index 844884ea5b2d6..20ba4f605cc13 100644 --- a/Validation/Geometry/src/MaterialBudgetHcalHistos.cc +++ b/Validation/Geometry/src/MaterialBudgetHcalHistos.cc @@ -40,7 +40,7 @@ MaterialBudgetHcalHistos::MaterialBudgetHcalHistos(const edm::ParameterSet& p) { << " (Eta limit " << etaLow_ << ":" << etaHigh_ << ")" << " Eta range (" << etaLowMin_ << ":" << etaLowMax_ << "), (" << etaMidMin_ << ":" << etaMidMax_ << "), (" << etaHighMin_ << ":" << etaHighMax_ - << ") Debug for eta range " << etaMinP_ << ":" << etaMaxP_ << " FromDD4Hep " + << ") Debug for eta range " << etaMinP_ << ":" << etaMaxP_ << " FromDD4hep " << fromdd4hep_; if (fillHistos_) book(); diff --git a/Validation/Geometry/src/MaterialBudgetVolume.cc b/Validation/Geometry/src/MaterialBudgetVolume.cc index 6357e4640d8c2..8507e37da0eab 100644 --- a/Validation/Geometry/src/MaterialBudgetVolume.cc +++ b/Validation/Geometry/src/MaterialBudgetVolume.cc @@ -79,7 +79,7 @@ MaterialBudgetVolume::MaterialBudgetVolume(const edm::ParameterSet& p) : init_(f lvNames_ = m_p.getParameter >("lvNames"); lvLevel_ = m_p.getParameter >("lvLevels"); - iaddLevel_ = (m_p.getParameter("useDD4Hep")) ? 1 : 0; + iaddLevel_ = (m_p.getParameter("useDD4hep")) ? 1 : 0; edm::LogVerbatim("MaterialBudget") << "MaterialBudgetVolume: Studies Material budget for " << lvNames_.size() << " volumes with addLevel " << iaddLevel_; diff --git a/Validation/Geometry/test/runMaterialBudgetVolumeBigDD4HepXML_cfg.py b/Validation/Geometry/test/runMaterialBudgetVolumeBigDD4hepXML_cfg.py similarity index 100% rename from Validation/Geometry/test/runMaterialBudgetVolumeBigDD4HepXML_cfg.py rename to Validation/Geometry/test/runMaterialBudgetVolumeBigDD4hepXML_cfg.py diff --git a/Validation/Geometry/test/runP_ECAL_dd4hep_cfg.py b/Validation/Geometry/test/runP_ECAL_dd4hep_cfg.py index 1eb835dea42b9..2d183e5efc02b 100644 --- a/Validation/Geometry/test/runP_ECAL_dd4hep_cfg.py +++ b/Validation/Geometry/test/runP_ECAL_dd4hep_cfg.py @@ -45,14 +45,14 @@ process.g4SimHits.Watchers = cms.VPSet(cms.PSet( type = cms.string('MaterialBudgetAction'), MaterialBudgetAction = cms.PSet( - HistosFile = cms.string('matbdg_ECAL_DD4HEP.root'), + HistosFile = cms.string('matbdg_ECAL_DD4hep.root'), AllStepsToTree = cms.bool(False), HistogramList = cms.string('ECAL'), SelectedVolumes = cms.vstring('ECAL'), # string TextFile = "None" # "None" means this option TreeFile = cms.string('None'), StopAfterProcess = cms.string('None'), - TextFile = cms.string('matbdg_ECAL_DD4HEP.txt') + TextFile = cms.string('matbdg_ECAL_DD4hep.txt') ) )) diff --git a/Validation/HGCalValidation/test/MakePlots.C b/Validation/HGCalValidation/test/MakePlots.C index 5757032b57e7d..b25591768e825 100644 --- a/Validation/HGCalValidation/test/MakePlots.C +++ b/Validation/HGCalValidation/test/MakePlots.C @@ -453,7 +453,7 @@ void hgcalBHValidPlots(std::string fname = "roots/hgcBHValidD83.root", void ehcalPlots(std::string fname = "ecalHitdd4hep.root", std::string dirnm = "EcalSimHitStudy", - std::string tag = "DD4Hep", + std::string tag = "DD4hep", int dets = 2, bool save = false, bool debug = false) {