Also commit the modified codes

cms-sw · Jun 4, 2020 · 40602a7 · 40602a7
1 parent fcb9deb
commit 40602a7
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 17 deletions.
diff --git a/Configuration/Geometry/python/GeometrySLHCSimDB_cff.py b/Configuration/Geometry/python/GeometrySLHCSimDB_cff.py
@@ -5,12 +5,12 @@
 #
 # Ideal geometry, needed for simulation
 from GeometryReaders.XMLIdealGeometryESSource.cmsGeometryDB_cff import *
-from Geometry.MuonNumbering.muonNumberingInitialization_cfi import *
 from Geometry.TrackerNumberingBuilder.trackerNumbering2026GeometryDB_cfi import *
-from Geometry.EcalCommonData.ecalSimulationParameters_cff import *
+from Geometry.EcalCommonData.ecalSimulationParameters_cff   import *
 from Geometry.HcalCommonData.hcalSimulationParameters_cfi   import *
 from Geometry.HcalCommonData.hcalDDDSimConstants_cfi        import *
-from Geometry.HcalCommonData.hcalDDDSimulationConstants_cfi import *
+from Geometry.HcalCommonData.hcalSimulationConstants_cfi    import *
 from Geometry.HcalCommonData.caloSimulationParameters_cff   import *
-from Geometry.MuonNumbering.muonGeometryConstants_cff import *
+from Geometry.MuonNumbering.muonGeometryConstants_cff       import *
+from Geometry.MuonNumbering.muonNumberingInitialization_cfi import *
 
diff --git a/Configuration/Geometry/python/GeometrySimDB_cff.py b/Configuration/Geometry/python/GeometrySimDB_cff.py
@@ -7,9 +7,9 @@
 from GeometryReaders.XMLIdealGeometryESSource.cmsGeometryDB_cff import *
 from Geometry.MuonNumbering.muonNumberingInitialization_cfi import *
 from Geometry.TrackerNumberingBuilder.trackerNumberingGeometryDB_cfi import *
-from Geometry.EcalCommonData.ecalSimulationParameters_cff import *
+from Geometry.EcalCommonData.ecalSimulationParameters_cff   import *
 from Geometry.HcalCommonData.hcalSimulationParameters_cfi   import *
 from Geometry.HcalCommonData.hcalDDDSimConstants_cfi        import *
-from Geometry.HcalCommonData.hcalDDDSimulationConstants_cfi import *
+from Geometry.HcalCommonData.hcalSimulationConstants_cfi    import *
 from Geometry.HcalCommonData.caloSimulationParameters_cff   import *
-from Geometry.MuonNumbering.muonGeometryConstants_cff import *
+from Geometry.MuonNumbering.muonGeometryConstants_cff       import *
diff --git a/FastSimulation/ShowerDevelopment/src/FastHFShowerLibrary.cc b/FastSimulation/ShowerDevelopment/src/FastHFShowerLibrary.cc
@@ -14,7 +14,7 @@
 #include "Geometry/Records/interface/HcalParametersRcd.h"
 #include "Geometry/Records/interface/HcalSimNumberingRecord.h"
 #include "Geometry/HcalCommonData/interface/HcalDDDSimConstants.h"
-#include "Geometry/HcalCommonData/interface/HcalDDDSimulationConstants.h"
+#include "Geometry/HcalCommonData/interface/HcalSimulationConstants.h"
 #include "FWCore/Utilities/interface/Exception.h"
 #include "DataFormats/HcalDetId/interface/HcalDetId.h"
 #include "DataFormats/HcalDetId/interface/HcalSubdetector.h"
@@ -51,9 +51,9 @@ void const FastHFShowerLibrary::initHFShowerLibrary(const edm::EventSetup& iSetu
   iSetup.get<HcalSimNumberingRecord>().get(hdc);
   hcalConstants = hdc.product();
 
-  edm::ESHandle<HcalDDDSimulationConstants> hdsc;
+  edm::ESHandle<HcalSimulationConstants> hdsc;
   iSetup.get<HcalSimNumberingRecord>().get(hdsc);
-  const HcalDDDSimulationConstants* hsps = hdsc.product();
+  const HcalSimulationConstants* hsps = hdsc.product();
 
   std::string name = "HcalHits";
   numberingFromDDD.reset(new HcalNumberingFromDDD(hcalConstants));

diff --git a/SimG4CMS/Calo/interface/HCalSD.h b/SimG4CMS/Calo/interface/HCalSD.h
@@ -20,7 +20,7 @@
 #include "SimG4Core/Notification/interface/BeginOfJob.h"
 #include "Geometry/HcalCommonData/interface/HcalNumberingFromDDD.h"
 #include "Geometry/HcalCommonData/interface/HcalDDDSimConstants.h"
-#include "Geometry/HcalCommonData/interface/HcalDDDSimulationConstants.h"
+#include "Geometry/HcalCommonData/interface/HcalSimulationConstants.h"
 #include "Geometry/Records/interface/HcalParametersRcd.h"
 #include "FWCore/Utilities/interface/ESGetToken.h"
 
@@ -87,7 +87,7 @@ class HCalSD : public CaloSD, public Observer<const BeginOfJob*> {
   std::unique_ptr<HFShowerFibreBundle> showerBundle;
 
   const HcalDDDSimConstants* hcalConstants_;
-  const HcalDDDSimulationConstants* hcalSimConstants_;
+  const HcalSimulationConstants* hcalSimConstants_;
   const HBHEDarkening* m_HBDarkening;
   const HBHEDarkening* m_HEDarkening;
   std::unique_ptr<HFDarkening> m_HFDarkening;

diff --git a/SimG4CMS/Calo/src/HCalSD.cc b/SimG4CMS/Calo/src/HCalSD.cc
@@ -141,7 +141,7 @@ HCalSD::HCalSD(const std::string& name,
     useHF = false;
     matNames.emplace_back("Scintillator");
   } else {
-    edm::ESHandle<HcalDDDSimulationConstants> hdsc;
+    edm::ESHandle<HcalSimulationConstants> hdsc;
     es.get<HcalSimNumberingRecord>().get(hdsc);
     if (hdsc.isValid()) {
       hcalSimConstants_ = hdsc.product();

diff --git a/SimG4CMS/ShowerLibraryProducer/src/FiberSD.cc b/SimG4CMS/ShowerLibraryProducer/src/FiberSD.cc
@@ -2,7 +2,7 @@
 #include "SimDataFormats/CaloHit/interface/HFShowerPhoton.h"
 #include "DataFormats/Math/interface/Point3D.h"
 #include "Geometry/HcalCommonData/interface/HcalDDDSimConstants.h"
-#include "Geometry/HcalCommonData/interface/HcalDDDSimulationConstants.h"
+#include "Geometry/HcalCommonData/interface/HcalSimulationConstants.h"
 #include "Geometry/Records/interface/HcalSimNumberingRecord.h"
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/EventSetup.h"
@@ -29,14 +29,14 @@ FiberSD::FiberSD(const std::string& iname,
       theShower(nullptr),
       theHCID(-1),
       theHC(nullptr) {
-  // Get pointer to HcalDDDConstant and HcalDDDSimulationConstants
-  edm::ESHandle<HcalDDDSimulationConstants> hdsc;
+  // Get pointer to HcalDDDConstant and HcalSimulationConstants
+  edm::ESHandle<HcalSimulationConstants> hdsc;
   es.get<HcalSimNumberingRecord>().get(hdsc);
   if (!hdsc.isValid()) {
     edm::LogError("FiberSim") << "FiberSD : Cannot find HcalDDDSimulationConstant";
     throw cms::Exception("Unknown", "FiberSD") << "Cannot find HcalDDDSimulationConstant\n";
   }
-  const HcalDDDSimulationConstants* hsps = hdsc.product();
+  const HcalSimulationConstants* hsps = hdsc.product();
   edm::ESHandle<HcalDDDSimConstants> hdc;
   es.get<HcalSimNumberingRecord>().get(hdc);
   if (hdc.isValid()) {