Merge pull request #42262 from bsunanda/Phase2-hgx3341I

Phase2-hgx3341I Final step to prepare the V18 version of HGCal geometry which allows non-ero cassette shifts
cms-sw · Jul 16, 2023 · 63ed0a8 · 63ed0a8
2 parents 9f75c01 + 3968841
commit 63ed0a8
Show file tree

Hide file tree

Showing 12 changed files with 874 additions and 13 deletions.
diff --git a/Geometry/HGCalCommonData/data/dd4hep/cms-test-ddhgcalEEV18-algorithm.xml b/Geometry/HGCalCommonData/data/dd4hep/cms-test-ddhgcalEEV18-algorithm.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0"?>
+<DDDefinition>
+  <debug>
+<!-- 
+    <debug_shapes/>
+    <debug_includes/>
+    <debug_rotations/>
+    <debug_includes/>
+    <debug_volumes/>
+    <debug_constants/>
+    <debug_namespaces/>
+    <debug_placements/>
+    <debug_algorithms/>
+    <debug_materials/>
+    <debug_visattr/>
+-->
+  </debug>
+
+  <open_geometry/>
+  <close_geometry/>
+
+  <IncludeSection>
+    <Include ref="Geometry/CMSCommonData/data/materials/2021/v1/materials.xml"/>
+    <Include ref="Geometry/CMSCommonData/data/rotations.xml"/>
+    <Include ref="Geometry/CMSCommonData/data/extend/v2/cmsextent.xml"/>
+    <Include ref="Geometry/CMSCommonData/data/cavernData/2021/v1/cavernData.xml"/>
+    <Include ref="Geometry/CMSCommonData/data/cms/2026/v5/cms.xml"/>
+    <Include ref="Geometry/CMSCommonData/data/eta3/etaMax.xml"/>
+    <Include ref="Geometry/CMSCommonData/data/cmsMother.xml"/>
+    <Include ref="Geometry/CMSCommonData/data/caloBase/2026/v6/caloBase.xml"/>
+    <Include ref="Geometry/CMSCommonData/data/cmsCalo.xml"/>
+    <Include ref="Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml"/>
+    <Include ref="Geometry/HGCalCommonData/data/hgcal/v18/hgcal.xml"/>
+    <Include ref="Geometry/HGCalCommonData/data/hgcalcell/v17/hgcalcell.xml"/>
+    <Include ref="Geometry/HGCalCommonData/data/hgcalwafer/v17/hgcalwafer.xml"/>
+    <Include ref="Geometry/HGCalCommonData/data/hgcalPassive/v18/hgcalPassive.xml"/>
+    <Include ref="Geometry/HGCalCommonData/data/hgcalEE/v18/hgcalEE.xml"/>
+    <Include ref="Geometry/CMSCommonData/data/FieldParameters.xml"/>
+  </IncludeSection>
+
+</DDDefinition>
+
diff --git a/Geometry/HGCalCommonData/data/dd4hep/cms-test-ddhgcalHEmixV18-algorithm.xml b/Geometry/HGCalCommonData/data/dd4hep/cms-test-ddhgcalHEmixV18-algorithm.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0"?>
+<DDDefinition>
+  <debug>
+<!-- 
+    <debug_shapes/>
+    <debug_includes/>
+    <debug_rotations/>
+    <debug_includes/>
+    <debug_volumes/>
+    <debug_constants/>
+    <debug_namespaces/>
+    <debug_placements/>
+    <debug_algorithms/>
+    <debug_materials/>
+    <debug_visattr/>
+-->
+  </debug>
+
+  <open_geometry/>
+  <close_geometry/>
+
+  <IncludeSection>
+    <Include ref="Geometry/CMSCommonData/data/materials/2021/v1/materials.xml"/>
+    <Include ref="Geometry/CMSCommonData/data/rotations.xml"/>
+    <Include ref="Geometry/CMSCommonData/data/extend/v2/cmsextent.xml"/>
+    <Include ref="Geometry/CMSCommonData/data/cavernData/2021/v1/cavernData.xml"/>
+    <Include ref="Geometry/CMSCommonData/data/cms/2026/v5/cms.xml"/>
+    <Include ref="Geometry/CMSCommonData/data/eta3/etaMax.xml"/>
+    <Include ref="Geometry/CMSCommonData/data/cmsMother.xml"/>
+    <Include ref="Geometry/CMSCommonData/data/caloBase/2026/v6/caloBase.xml"/>
+    <Include ref="Geometry/CMSCommonData/data/cmsCalo.xml"/>
+    <Include ref="Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml"/>
+    <Include ref="Geometry/HGCalCommonData/data/hgcal/v18/hgcal.xml"/>
+    <Include ref="Geometry/HGCalCommonData/data/hgcalcell/v17/hgcalcell.xml"/>
+    <Include ref="Geometry/HGCalCommonData/data/hgcalwafer/v17/hgcalwafer.xml"/>
+    <Include ref="Geometry/HGCalCommonData/data/hgcalPassive/v18/hgcalPassive.xml"/>
+    <Include ref="Geometry/HGCalCommonData/data/hgcalHEmix/v18/hgcalHEmix.xml"/>
+  </IncludeSection>
+
+</DDDefinition>
+
diff --git a/Geometry/HGCalCommonData/data/dd4hep/cms-test-ddhgcalHEsilV18-algorithm.xml b/Geometry/HGCalCommonData/data/dd4hep/cms-test-ddhgcalHEsilV18-algorithm.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0"?>
+<DDDefinition>
+  <debug>
+<!-- 
+    <debug_shapes/>
+    <debug_includes/>
+    <debug_rotations/>
+    <debug_includes/>
+    <debug_volumes/>
+    <debug_constants/>
+    <debug_namespaces/>
+    <debug_placements/>
+    <debug_algorithms/>
+    <debug_materials/>
+    <debug_visattr/>
+-->
+  </debug>
+
+  <open_geometry/>
+  <close_geometry/>
+
+  <IncludeSection>
+    <Include ref="Geometry/CMSCommonData/data/materials/2021/v1/materials.xml"/>
+    <Include ref="Geometry/CMSCommonData/data/rotations.xml"/>
+    <Include ref="Geometry/CMSCommonData/data/extend/v2/cmsextent.xml"/>
+    <Include ref="Geometry/CMSCommonData/data/cavernData/2021/v1/cavernData.xml"/>
+    <Include ref="Geometry/CMSCommonData/data/cms/2026/v5/cms.xml"/>
+    <Include ref="Geometry/CMSCommonData/data/eta3/etaMax.xml"/>
+    <Include ref="Geometry/CMSCommonData/data/cmsMother.xml"/>
+    <Include ref="Geometry/CMSCommonData/data/caloBase/2026/v6/caloBase.xml"/>
+    <Include ref="Geometry/CMSCommonData/data/cmsCalo.xml"/>
+    <Include ref="Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml"/>
+    <Include ref="Geometry/HGCalCommonData/data/hgcal/v18/hgcal.xml"/>
+    <Include ref="Geometry/HGCalCommonData/data/hgcalcell/v17/hgcalcell.xml"/>
+    <Include ref="Geometry/HGCalCommonData/data/hgcalwafer/v17/hgcalwafer.xml"/>
+    <Include ref="Geometry/HGCalCommonData/data/hgcalPassive/v18/hgcalPassive.xml"/>
+    <Include ref="Geometry/HGCalCommonData/data/hgcalHEsil/v18/hgcalHEsil.xml"/>
+    <Include ref="Geometry/CMSCommonData/data/FieldParameters.xml"/>
+  </IncludeSection>
+
+</DDDefinition>
+
diff --git a/Geometry/HGCalCommonData/data/dd4hep/testHGCalV18.xml b/Geometry/HGCalCommonData/data/dd4hep/testHGCalV18.xml
@@ -42,7 +42,7 @@
     <Include ref="Geometry/HGCalCommonData/data/hgcalPassive/v18/hgcalPassive.xml"/>
     <Include ref="Geometry/HGCalCommonData/data/hgcalEE/v18/hgcalEE.xml"/>
     <Include ref="Geometry/HGCalCommonData/data/hgcalHEsil/v18/hgcalHEsil.xml"/>
-    <Include ref="Geometry/HGCalCommonData/data/hgcalHEmix/v17/hgcalHEmix.xml"/>
+    <Include ref="Geometry/HGCalCommonData/data/hgcalHEmix/v18/hgcalHEmix.xml"/>
     <Include ref="Geometry/HGCalCommonData/data/hgcalCons/v18/hgcalCons.xml"/>
     <Include ref="Geometry/HGCalCommonData/data/hgcalConsData/v17/hgcalConsData.xml"/>
     <Include ref="Geometry/ForwardCommonData/data/forwardshield/2026/v4/forwardshield.xml"/>

diff --git a/Geometry/HGCalCommonData/plugins/DDHGCalMixRotatedCassette.cc b/Geometry/HGCalCommonData/plugins/DDHGCalMixRotatedCassette.cc
@@ -31,7 +31,7 @@
 #include <unordered_set>
 #include <vector>
 
-#define EDM_ML_DEBUG
+//#define EDM_ML_DEBUG
 using namespace angle_units::operators;
 
 class DDHGCalMixRotatedCassette : public DDAlgorithm {

diff --git a/Geometry/HGCalCommonData/plugins/DDHGCalSiliconRotatedCassette.cc b/Geometry/HGCalCommonData/plugins/DDHGCalSiliconRotatedCassette.cc
@@ -32,7 +32,7 @@
 #include <unordered_set>
 #include <vector>
 
-#define EDM_ML_DEBUG
+//#define EDM_ML_DEBUG
 using namespace angle_units::operators;
 
 class DDHGCalSiliconRotatedCassette : public DDAlgorithm {
@@ -554,7 +554,6 @@ void DDHGCalSiliconRotatedCassette::positionPassive(const DDLogicalPart& glog,
 #endif
     int nr = 2 * v;
     int nc = -2 * u + v;
-    int type = HGCalProperty::waferThick(waferProperty_[k]);
     int part = HGCalProperty::waferPartial(waferProperty_[k]);
     int orien = HGCalProperty::waferOrient(waferProperty_[k]);
     int cassette = HGCalProperty::waferCassette(waferProperty_[k]);
@@ -566,6 +565,7 @@ void DDHGCalSiliconRotatedCassette::positionPassive(const DDLogicalPart& glog,
     double xorig = xyoff.first + nc * delx;
     double yorig = xyoff.second + nr * dy;
     double angle = std::atan2(yorig, xorig);
+    int type = HGCalProperty::waferThick(waferProperty_[k]);
     edm::LogVerbatim("HGCalGeom") << "DDHGCalSiliconRotatedCassette::Passive: layer " << layer + 1 << " cassette "
                                   << cassette << " Shift " << cshift.first << ":" << cshift.second << " Original "
                                   << xorig << ":" << yorig << ":" << convertRadToDeg(angle) << " Final " << xpos << ":"