[DD4hep] cleanup file names

CondTools/Geometry/plugins/GEMRecoIdealDBLoader.cc

@@ -36,7 +36,7 @@ class GEMRecoIdealDBLoader : public edm::one::EDAnalyzer<edm::one::WatchRuns> {
 };
 
 GEMRecoIdealDBLoader::GEMRecoIdealDBLoader(const edm::ParameterSet& iC) {
-  fromDD4hep_ = iC.getUntrackedParameter<bool>("fromDD4hep", false);  // set true for DD4HEP
+  fromDD4hep_ = iC.getUntrackedParameter<bool>("fromDD4hep", false);  // set true for DD4hep
   dd4HepCompactViewToken_ = esConsumes<edm::Transition::BeginRun>();
   compactViewToken_ = esConsumes<edm::Transition::BeginRun>();
   muonGeomConstantsToken_ = esConsumes<edm::Transition::BeginRun>();
@@ -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);

CondTools/Geometry/plugins/ME0RecoIdealDBLoader.cc

@@ -34,7 +34,7 @@ class ME0RecoIdealDBLoader : public edm::one::EDAnalyzer<edm::one::WatchRuns> {
 };
 
 ME0RecoIdealDBLoader::ME0RecoIdealDBLoader(const edm::ParameterSet& iC) {
-  fromDD4hep_ = iC.getUntrackedParameter<bool>("fromDD4hep", false);  // set true for DD4HEP
+  fromDD4hep_ = iC.getUntrackedParameter<bool>("fromDD4hep", false);  // set true for DD4hep
   dd4HepCompactViewToken_ = esConsumes<edm::Transition::BeginRun>();
   compactViewToken_ = esConsumes<edm::Transition::BeginRun>();
   muonGeomConstantsToken_ = esConsumes<edm::Transition::BeginRun>();
@@ -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);

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 *

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

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)

DetectorDescription/DDCMS/plugins/BuildFile.xml

@@ -16,7 +16,7 @@
   <flags EDM_PLUGIN="1"/>
 </library>
 
-<library name="DetectorDescriptionDD4HepPlugins" file="dd4hep/*.cc">
+<library name="DetectorDescriptionDD4hepPlugins" file="dd4hep/*.cc">
   <use name="rootgeom"/>
   <flags DD4HEP_PLUGIN="1"/>
 </library>

DetectorDescription/DDCMS/plugins/DDDetectorESProducer.cc

@@ -69,7 +69,7 @@ DDDetectorESProducer::DDDetectorESProducer(const ParameterSet& iConfig)
       confGeomXMLFiles_(fromDB_ ? "none" : iConfig.getParameter<FileInPath>("confGeomXMLFiles").fullPath()),
       rootDDName_(iConfig.getParameter<string>("rootDDName")),
       label_(iConfig.getParameter<string>("label")) {
-  usesResources({edm::ESSharedResourceNames::kDD4Hep});
+  usesResources({edm::ESSharedResourceNames::kDD4hep});
   edm::LogVerbatim("Geometry") << "DDDetectorESProducer::fromDB " << fromDB_ << " appendToDataLabel "
                                << appendToDataLabel_ << " rootDDName " << rootDDName_ << " label " << label_
                                << " confGeomXMLFiles " << confGeomXMLFiles_;

DetectorDescription/DDCMS/plugins/test/DDTestDumpFile.cc

@@ -37,7 +37,7 @@ class DDTestDumpFile : public one::EDAnalyzer<> {
 
 DDTestDumpFile::DDTestDumpFile(const ParameterSet& iConfig)
     : m_tag(iConfig.getUntrackedParameter<string>("tag", "unknown")),
-      m_outputFileName(iConfig.getUntrackedParameter<string>("outputFileName", "cmsDD4HepGeom.root")),
+      m_outputFileName(iConfig.getUntrackedParameter<string>("outputFileName", "cmsDD4hepGeom.root")),
       m_label(iConfig.getParameter<ESInputTag>("DDDetector")),
       m_token(esConsumes(m_label)) {}
 

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

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<unsigned int> counter;
 

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               
 //   

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<IdealGeometryRecord>(record, [&host, &record, this](auto const& rec) {
       host->clear();
       edm::ESTransientHandle<cms::DDCompactView> cpv = record.getTransientHandle(cpvTokendd4hep_);

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 
 */
 

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;

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               
 //   

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<double> grmat(9);
   std::vector<double> trm(9);
 
-  edm::LogVerbatim("CSCGeometryParsFromDD") << "(0) CSCGeometryParsFromDD - DD4HEP ";
+  edm::LogVerbatim("CSCGeometryParsFromDD") << "(0) CSCGeometryParsFromDD - DD4hep ";
 
   while (fv.firstChild()) {
     MuonGeometryNumbering mbn(muonConstants);

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);
 }

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.

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<double> getTranslation(DDFilteredView& fv);
   std::vector<double> getRotation(DDFilteredView& fv);
 
-  //DD4HEP
+  //DD4hep
 
   void buildGeometry(cms::DDFilteredView&, const MuonGeometryConstants&, RecoIdealGeometry&);
 

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"

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 
 */
 

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<ME0Geometry> ME0GeometryESModule::produce(const MuonGeometryReco
     ME0GeometryBuilder builder;
     return std::unique_ptr<ME0Geometry>(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_);

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 
 */
 

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,

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 <string>