Merge pull request #28774 from bsunanda/Phase2-hgx230

Phase2-hgx230 Attempt to move reco geometry to DD4Hep
cms-sw · Jan 27, 2020 · fadc536 · fadc536
2 parents 6c55a9a + c9241bb
commit fadc536
Show file tree

Hide file tree

Showing 14 changed files with 360 additions and 23 deletions.
diff --git a/Geometry/HGCalCommonData/data/dd4hep/cms-test-ddhgcalModule-algorithm.xml b/Geometry/HGCalCommonData/data/dd4hep/cms-test-ddhgcalModule-algorithm.xml
@@ -20,7 +20,7 @@
   <close_geometry/>
 
   <IncludeSection>
-    <Include ref="Geometry/CMSCommonData/data/materials.xml"/>
+    <Include ref="Geometry/CMSCommonData/data/materials/2021/v1/materials.xml"/>
     <Include ref="Geometry/CMSCommonData/data/rotations.xml"/>
     <Include ref="Geometry/CMSCommonData/data/extend/cmsextent.xml"/>
     <Include ref="Geometry/CMSCommonData/data/cms/2019/v1/cms.xml"/>

diff --git a/Geometry/HGCalCommonData/data/dd4hep/cms-test-ddhgcalModuleAlgo-algorithm.xml b/Geometry/HGCalCommonData/data/dd4hep/cms-test-ddhgcalModuleAlgo-algorithm.xml
@@ -20,7 +20,7 @@
   <close_geometry/>
 
   <IncludeSection>
-    <Include ref="Geometry/CMSCommonData/data/materials.xml"/>
+    <Include ref="Geometry/CMSCommonData/data/materials/2021/v1/materials.xml"/>
     <Include ref="Geometry/CMSCommonData/data/rotations.xml"/>
     <Include ref="Geometry/CMSCommonData/data/extend/cmsextent.xml"/>
     <Include ref="Geometry/CMSCommonData/data/cms/2019/v1/cms.xml"/>

diff --git a/Geometry/HGCalCommonData/data/dd4hep/cms-test-ddhgcalNoTaperEndcap-algorithm.xml b/Geometry/HGCalCommonData/data/dd4hep/cms-test-ddhgcalNoTaperEndcap-algorithm.xml
@@ -20,7 +20,7 @@
   <close_geometry/>
 
   <IncludeSection>
-    <Include ref="Geometry/CMSCommonData/data/materials.xml"/>
+    <Include ref="Geometry/CMSCommonData/data/materials/2021/v1/materials.xml"/>
     <Include ref="Geometry/CMSCommonData/data/rotations.xml"/>
     <Include ref="Geometry/HGCalCommonData/data/dd4hep/cms.xml"/>
     <Include ref="Geometry/CMSCommonData/data/eta3/etaMax.xml"/>

diff --git a/Geometry/HGCalCommonData/data/dd4hep/cms-test-ddhgcalTBModule-algorithm.xml b/Geometry/HGCalCommonData/data/dd4hep/cms-test-ddhgcalTBModule-algorithm.xml
@@ -20,7 +20,7 @@
   <close_geometry/>
 
   <IncludeSection>
-    <Include ref="Geometry/CMSCommonData/data/materials.xml"/>
+    <Include ref="Geometry/CMSCommonData/data/materials/2021/v1/materials.xml"/>
     <Include ref="Geometry/CMSCommonData/data/rotations.xml"/>
     <Include ref="Geometry/HGCalCommonData/data/TB170/cms.xml"/>
     <Include ref="Geometry/HGCalCommonData/data/TB170/hgcal.xml"/>

diff --git a/Geometry/HGCalCommonData/data/dd4hep/cms-test-ddhgcalTBModuleX-algorithm.xml b/Geometry/HGCalCommonData/data/dd4hep/cms-test-ddhgcalTBModuleX-algorithm.xml
@@ -20,7 +20,7 @@
   <close_geometry/>
 
   <IncludeSection>
-    <Include ref="Geometry/CMSCommonData/data/materials.xml"/>
+    <Include ref="Geometry/CMSCommonData/data/materials/2021/v1/materials.xml"/>
     <Include ref="Geometry/CMSCommonData/data/rotations.xml"/>
     <Include ref="Geometry/HGCalCommonData/data/hgcalMaterial/v1/hgcalMaterial.xml"/>
     <Include ref="Geometry/HGCalCommonData/data/TB181/cms.xml"/>

diff --git a/Geometry/HGCalCommonData/data/dd4hep/cms-test-ddhgcalWaferAlgo-algorithm.xml b/Geometry/HGCalCommonData/data/dd4hep/cms-test-ddhgcalWaferAlgo-algorithm.xml
@@ -20,7 +20,7 @@
   <close_geometry/>
 
   <IncludeSection>
-    <Include ref="Geometry/CMSCommonData/data/materials.xml"/>
+    <Include ref="Geometry/CMSCommonData/data/materials/2021/v1/materials.xml"/>
     <Include ref="Geometry/CMSCommonData/data/rotations.xml"/>
     <Include ref="Geometry/HGCalCommonData/test/cms.xml"/>
     <Include ref="Geometry/HGCalCommonData/data/hgcalwafer/v7/hgcal.xml"/>

diff --git a/Geometry/HGCalCommonData/data/dd4hep/cms-test-ddhgcalcell-algorithm.xml b/Geometry/HGCalCommonData/data/dd4hep/cms-test-ddhgcalcell-algorithm.xml
@@ -20,7 +20,7 @@
   <close_geometry/>
 
   <IncludeSection>
-    <Include ref="Geometry/CMSCommonData/data/materials.xml"/>
+    <Include ref="Geometry/CMSCommonData/data/materials/2021/v1/materials.xml"/>
     <Include ref="Geometry/CMSCommonData/data/rotations.xml"/>
     <Include ref="Geometry/HGCalCommonData/test/cms.xml"/>
     <Include ref="Geometry/HGCalCommonData/data/hgcalcell/v9/hgcal.xml"/>

diff --git a/Geometry/HGCalCommonData/data/dd4hep/cms-test-ddhgcalwafer-algorithm.xml b/Geometry/HGCalCommonData/data/dd4hep/cms-test-ddhgcalwafer-algorithm.xml
@@ -20,7 +20,7 @@
   <close_geometry/>
 
   <IncludeSection>
-    <Include ref="Geometry/CMSCommonData/data/materials.xml"/>
+    <Include ref="Geometry/CMSCommonData/data/materials/2021/v1/materials.xml"/>
     <Include ref="Geometry/CMSCommonData/data/rotations.xml"/>
     <Include ref="Geometry/HGCalCommonData/test/cms.xml"/>
     <Include ref="Geometry/HGCalCommonData/data/hgcalwafer/v8/hgcal.xml"/>

diff --git a/Geometry/HGCalCommonData/data/dd4hep/cms-test-ddhgcalwafer8-algorithm.xml b/Geometry/HGCalCommonData/data/dd4hep/cms-test-ddhgcalwafer8-algorithm.xml
@@ -20,7 +20,7 @@
   <close_geometry/>
 
   <IncludeSection>
-    <Include ref="Geometry/CMSCommonData/data/materials.xml"/>
+    <Include ref="Geometry/CMSCommonData/data/materials/2021/v1/materials.xml"/>
     <Include ref="Geometry/CMSCommonData/data/rotations.xml"/>
     <Include ref="Geometry/HGCalCommonData/test/cms.xml"/>
     <Include ref="Geometry/HGCalCommonData/data/hgcalwafer/v9/hgcal.xml"/>

diff --git a/Geometry/HGCalCommonData/interface/HGCalGeomParameters.h b/Geometry/HGCalCommonData/interface/HGCalGeomParameters.h
@@ -37,15 +37,15 @@ class HGCalGeomParameters {
                            const std::string&,
                            const std::string&,
                            HGCalGeometryMode::WaferMode);
-  void loadGeometryHexagon(const cms::DDFilteredView&,
+  void loadGeometryHexagon(cms::DDFilteredView&,
                            HGCalParameters&,
                            const std::string&,
                            const cms::DDCompactView*,
                            const std::string&,
                            const std::string&,
                            HGCalGeometryMode::WaferMode);
   void loadGeometryHexagon8(const DDFilteredView&, HGCalParameters&, int);
-  void loadGeometryHexagon8(const cms::DDFilteredView&, HGCalParameters&, int);
+  void loadGeometryHexagon8(cms::DDFilteredView&, HGCalParameters&, int);
   void loadSpecParsHexagon(
       const DDFilteredView&, HGCalParameters&, const DDCompactView*, const std::string&, const std::string&);
   void loadSpecParsHexagon(const cms::DDFilteredView&,

diff --git a/Geometry/HGCalCommonData/interface/HGCalParameters.h b/Geometry/HGCalCommonData/interface/HGCalParameters.h
@@ -18,6 +18,8 @@ class HGCalParameters {
 
   static constexpr double k_ScaleFromDDD = 0.1;
   static constexpr double k_ScaleToDDD = 10.0;
+  static constexpr double k_ScaleFromDDDToG4 = 1.0;
+  static constexpr double k_ScaleToDDDFromG4 = 1.0;
   static constexpr double k_ScaleFromDD4Hep = 1.0;
   static constexpr double k_ScaleToDD4Hep = 1.0;
   static constexpr double k_ScaleFromDD4HepToG4 = 10.0;