Merge pull request #36036 from bsunanda/Phase2-hgx294A

Phase2-hgx294A Add layeroffset attribute to 6-inch wafer geometry files for HGCal
cms-sw · Nov 11, 2021 · bdd8e05 · bdd8e05
2 parents 1d81c36 + 0398b56
commit bdd8e05
Show file tree

Hide file tree

Showing 14 changed files with 29 additions and 237 deletions.
diff --git a/Geometry/HGCalCommonData/data/TB160/hgcalCons.xml b/Geometry/HGCalCommonData/data/TB160/hgcalCons.xml
@@ -269,6 +269,7 @@
     <Parameter name="GroupingZOut"   value="28"/>
     <Parameter name="GroupingZOut"   value="28"/>
     <Parameter name="GroupingZOut"   value="28"/>
+    <Parameter name="LayerOffset"    value="0"/>
   </SpecPar>
 </SpecParSection>
 

diff --git a/Geometry/HGCalCommonData/data/TB161/1Module/hgcalCons.xml b/Geometry/HGCalCommonData/data/TB161/1Module/hgcalCons.xml
@@ -26,6 +26,7 @@
     <Parameter name="GroupingZOut"   value="1"/>
     <Parameter name="GroupingZOut"   value="1"/>
     <Parameter name="GroupingZOut"   value="-1"/>
+    <Parameter name="LayerOffset"    value="0"/>
   </SpecPar>
 </SpecParSection>
 

diff --git a/Geometry/HGCalCommonData/data/TB161/8Module/hgcalCons.xml b/Geometry/HGCalCommonData/data/TB161/8Module/hgcalCons.xml
@@ -89,6 +89,7 @@
     <Parameter name="GroupingZOut"   value="-1"/>
     <Parameter name="GroupingZOut"   value="8"/>
     <Parameter name="GroupingZOut"   value="8"/>
+    <Parameter name="LayerOffset"    value="0"/>
   </SpecPar>
 </SpecParSection>
 

diff --git a/Geometry/HGCalCommonData/data/TB161/TimingLayer/hgcalCons.xml b/Geometry/HGCalCommonData/data/TB161/TimingLayer/hgcalCons.xml
@@ -26,6 +26,7 @@
     <Parameter name="GroupingZOut"   value="1"/>
     <Parameter name="GroupingZOut"   value="1"/>
     <Parameter name="GroupingZOut"   value="1"/>
+    <Parameter name="LayerOffset"    value="0"/>
   </SpecPar>
 </SpecParSection>
 

diff --git a/Geometry/HGCalCommonData/data/TB170/July17/hgcalCons.xml b/Geometry/HGCalCommonData/data/TB170/July17/hgcalCons.xml
@@ -55,6 +55,7 @@
     <Parameter name="GroupingZOut"  value="3"/>
     <Parameter name="GroupingZOut"  value="3"/>
     <Parameter name="GroupingZOut"  value="3"/>
+    <Parameter name="LayerOffset"   value="0"/>
   </SpecPar>
   <SpecPar name="HGCalHESiliconSensitive">
     <PartSelector path="//HGCalHESiliconSensitive.*"/>
@@ -96,6 +97,7 @@
     <Parameter name="GroupingZOut"   value="4"/>
     <Parameter name="GroupingZOut"   value="4"/>
     <Parameter name="GroupingZOut"   value="4"/>
+    <Parameter name="LayerOffset"    value="3"/>
   </SpecPar>
 </SpecParSection>
 

diff --git a/Geometry/HGCalCommonData/data/TB170/Sep17/hgcalCons.xml b/Geometry/HGCalCommonData/data/TB170/Sep17/hgcalCons.xml
@@ -186,6 +186,7 @@
     <Parameter name="GroupingZOut"   value="10"/>
     <Parameter name="GroupingZOut"   value="10"/>
     <Parameter name="GroupingZOut"   value="10"/>
+    <Parameter name="LayerOffset"    value="0"/>
   </SpecPar>
 </SpecParSection>
 

diff --git a/Geometry/HGCalCommonData/data/TB170/hgcalCons.xml b/Geometry/HGCalCommonData/data/TB170/hgcalCons.xml
@@ -280,6 +280,7 @@
     <Parameter name="GroupingZOut"  value="28"/>
     <Parameter name="GroupingZOut"  value="28"/>
     <Parameter name="GroupingZOut"  value="28"/>
+    <Parameter name="LayerOffset"    value="0"/>
   </SpecPar>
   <SpecPar name="HGCalHESiliconSensitive">
     <PartSelector path="//HGCalHESiliconSensitive.*"/>
@@ -393,6 +394,7 @@
     <Parameter name="GroupingZOut"   value="12"/>
     <Parameter name="GroupingZOut"   value="12"/>
     <Parameter name="GroupingZOut"   value="12"/>
+    <Parameter name="LayerOffset"    value="28"/>
   </SpecPar>
 </SpecParSection>
 

diff --git a/Geometry/HGCalCommonData/data/TB180/hgcalCons.xml b/Geometry/HGCalCommonData/data/TB180/hgcalCons.xml
@@ -44,6 +44,7 @@
     <Parameter name="GroupingZOut"   value="3"/>
     <Parameter name="GroupingZOut"   value="3"/>
     <Parameter name="GroupingZOut"   value="3"/>
+    <Parameter name="LayerOffset"    value="0"/>
   </SpecPar>
 </SpecParSection>
 

diff --git a/Geometry/HGCalCommonData/data/TB181/June18/hgcalCons.xml b/Geometry/HGCalCommonData/data/TB181/June18/hgcalCons.xml
@@ -269,6 +269,7 @@
     <Parameter name="GroupingZOut"  value="28"/>
     <Parameter name="GroupingZOut"  value="28"/>
     <Parameter name="GroupingZOut"  value="28"/>
+    <Parameter name="LayerOffset"   value="0"/>
   </SpecPar>
 </SpecParSection>
 

diff --git a/Geometry/HGCalCommonData/data/TB181/Oct181/hgcalCons.xml b/Geometry/HGCalCommonData/data/TB181/Oct181/hgcalCons.xml
@@ -280,6 +280,7 @@
     <Parameter name="GroupingZOut"  value="-1"/>
     <Parameter name="GroupingZOut"  value="28"/>
     <Parameter name="GroupingZOut"  value="28"/>
+    <Parameter name="LayerOffset"   value="0"/>
   </SpecPar>
   <SpecPar name="HGCalHESiliconSensitive">
     <PartSelector path="//HGCalHESiliconSensitive.*"/>
@@ -393,6 +394,7 @@
     <Parameter name="GroupingZOut"   value="12"/>
     <Parameter name="GroupingZOut"   value="12"/>
     <Parameter name="GroupingZOut"   value="12"/>
+    <Parameter name="LayerOffset"    value="28"/>
   </SpecPar>
 </SpecParSection>
 

diff --git a/Geometry/HGCalCommonData/data/TB181/Test/hgcalCons.xml b/Geometry/HGCalCommonData/data/TB181/Test/hgcalCons.xml
@@ -125,6 +125,7 @@
     <Parameter name="GroupingZOut"   value="12"/>
     <Parameter name="GroupingZOut"   value="12"/>
     <Parameter name="GroupingZOut"   value="12"/>
+    <Parameter name="LayerOffset"    value="0"/>
   </SpecPar>
 </SpecParSection>
 

diff --git a/Geometry/HGCalCommonData/python/testHGCV7XML_cfi.py b/Geometry/HGCalCommonData/python/testHGCV7XML_cfi.py
diff --git a/Geometry/HGCalCommonData/python/testHGCV8XML_cfi.py b/Geometry/HGCalCommonData/python/testHGCV8XML_cfi.py
diff --git a/Geometry/HGCalCommonData/src/HGCalGeomParameters.cc b/Geometry/HGCalCommonData/src/HGCalGeomParameters.cc
@@ -1173,6 +1173,11 @@ void HGCalGeomParameters::loadSpecParsHexagon(const DDFilteredView& fv,
   php.layerGroupM_ = dbl_to_int(getDDDArray("GroupingZMid", sv, 0));
   php.layerGroupO_ = dbl_to_int(getDDDArray("GroupingZOut", sv, 0));
   php.slopeMin_ = getDDDArray("Slope", sv, 1);
+  const auto& dummy2 = getDDDArray("LayerOffset", sv, 0);
+  if (!dummy2.empty())
+    php.layerOffset_ = dummy2[0];
+  else
+    php.layerOffset_ = 0;
 
   // Wafer size
   std::string attribute = "Volume";
@@ -1223,6 +1228,14 @@ void HGCalGeomParameters::loadSpecParsHexagon(const cms::DDFilteredView& fv,
   php.cellSize_ = fv.get<std::vector<double> >(sdTag3, "CellSize");
   rescale(php.cellSize_, HGCalParameters::k_ScaleFromDD4hepToG4);
 
+  // Layer Offset
+  const auto& dummy2 = fv.get<std::vector<double> >(sdTag1, "LayerOffset");
+  if (!dummy2.empty()) {
+    php.layerOffset_ = dummy2[0];
+  } else {
+    php.layerOffset_ = 0;
+  }
+
   loadSpecParsHexagon(php);
 }
 
@@ -1242,6 +1255,8 @@ void HGCalGeomParameters::loadSpecParsHexagon(const HGCalParameters& php) {
   edm::LogVerbatim("HGCalGeom") << "HGCalGeomParameters: " << php.cellSize_.size() << " cells of sizes:";
   for (unsigned int k = 0; k < php.cellSize_.size(); ++k)
     edm::LogVerbatim("HGCalGeom") << " [" << k << "] " << php.cellSize_[k];
+  edm::LogVerbatim("HGCalGeom") << "HGCalGeomParameters: First Layer " << php.firstLayer_ << " and layer offset "
+                                << php.layerOffset_;
 #endif
 }