Merge pull request #31653 from bsunanda/Phase2-hgx263

Phase2-hgx263 Try to resolve the orientation index issue for HGCal V13/V14
cms-sw · Oct 12, 2020 · 2b03e03 · 2b03e03
2 parents 260347d + 11e0f59
commit 2b03e03
Show file tree

Hide file tree

Showing 18 changed files with 92 additions and 10 deletions.
diff --git a/Geometry/ForwardCommonData/data/hfnoseCons/v1/hfnoseCons.xml b/Geometry/ForwardCommonData/data/hfnoseCons/v1/hfnoseCons.xml
@@ -26,6 +26,7 @@
     <Parameter name="FirstMixedLayer"     value="-1"/>
     <Parameter name="DetectorType"        value="1"/>
     <Parameter name="WaferMaskMode"       value="0"/>
+    <Parameter name="WaferZside"          value="1"/>
     <Parameter name="Radius100to200"      value="[hfnose:HFNoseRMax3]"/>
     <Parameter name="Radius100to200"      value="0"/>
     <Parameter name="Radius100to200"      value="0"/>

diff --git a/Geometry/ForwardCommonData/data/hfnoseCons/v1m/hfnoseCons.xml b/Geometry/ForwardCommonData/data/hfnoseCons/v1m/hfnoseCons.xml
@@ -26,6 +26,7 @@
     <Parameter name="FirstMixedLayer"     value="-1"/>
     <Parameter name="DetectorType"        value="1"/>
     <Parameter name="WaferMaskMode"       value="1"/>
+    <Parameter name="WaferZside"          value="1"/>
     <Parameter name="Radius100to200"      value="[hfnose:HFNoseRMax3]"/>
     <Parameter name="Radius100to200"      value="0"/>
     <Parameter name="Radius100to200"      value="0"/>

diff --git a/Geometry/HGCalCommonData/data/hgcalCons/v10/hgcalCons.xml b/Geometry/HGCalCommonData/data/hgcalCons/v10/hgcalCons.xml
@@ -34,6 +34,7 @@
     <Parameter name="LayerOffset"         value="0"/>
     <Parameter name="DetectorType"        value="1"/>
     <Parameter name="WaferMaskMode"       value="0"/>
+    <Parameter name="WaferZside"          value="-1"/>
     <Parameter name="Radius100to200"      value="[hgcal:rad100200P0]"/>
     <Parameter name="Radius100to200"      value="[hgcal:rad100200P1]"/>
     <Parameter name="Radius100to200"      value="[hgcal:rad100200P2]"/>
@@ -87,6 +88,7 @@
     <Parameter name="LayerOffset"         value="28"/>
     <Parameter name="DetectorType"        value="2"/>
     <Parameter name="WaferMaskMode"       value="0"/>
+    <Parameter name="WaferZside"          value="-1"/>
     <Parameter name="Radius100to200"      value="[hgcal:rad100200P0]"/>
     <Parameter name="Radius100to200"      value="[hgcal:rad100200P1]"/>
     <Parameter name="Radius100to200"      value="[hgcal:rad100200P2]"/>
@@ -138,6 +140,7 @@
     <Parameter name="LayerOffset"         value="28"/>
     <Parameter name="DetectorType"        value="3"/>
     <Parameter name="WaferMaskMode"       value="0"/>
+    <Parameter name="WaferZside"          value="1"/>
     <Parameter name="WaferThickness"      value="[hgcal:ScintillatorThickness]"/>
     <Parameter name="MinimumTileSize"     value="[MinimumTileSize]"/>
     <Parameter name="NPhiBinBH"           value="360"/>

diff --git a/Geometry/HGCalCommonData/data/hgcalCons/v11/hgcalCons.xml b/Geometry/HGCalCommonData/data/hgcalCons/v11/hgcalCons.xml
@@ -34,6 +34,7 @@
     <Parameter name="LayerOffset"         value="0"/>
     <Parameter name="DetectorType"        value="1"/>
     <Parameter name="WaferMaskMode"       value="0"/>
+    <Parameter name="WaferZside"          value="-1"/>
     <Parameter name="Radius100to200"      value="[hgcal:rad100200P0]"/>
     <Parameter name="Radius100to200"      value="[hgcal:rad100200P1]"/>
     <Parameter name="Radius100to200"      value="[hgcal:rad100200P2]"/>
@@ -87,6 +88,7 @@
     <Parameter name="LayerOffset"         value="28"/>
     <Parameter name="DetectorType"        value="2"/>
     <Parameter name="WaferMaskMode"       value="0"/>
+    <Parameter name="WaferZside"          value="-1"/>
     <Parameter name="Radius100to200"      value="[hgcal:rad100200P0]"/>
     <Parameter name="Radius100to200"      value="[hgcal:rad100200P1]"/>
     <Parameter name="Radius100to200"      value="[hgcal:rad100200P2]"/>
@@ -138,6 +140,7 @@
     <Parameter name="LayerOffset"         value="28"/>
     <Parameter name="DetectorType"        value="3"/>
     <Parameter name="WaferMaskMode"       value="0"/>
+    <Parameter name="WaferZside"          value="1"/>
     <Parameter name="WaferThickness"      value="[hgcal:ScintillatorThickness]"/>
     <Parameter name="MinimumTileSize"     value="[MinimumTileSize]"/>
     <Parameter name="NPhiBinBH"           value="360"/>

diff --git a/Geometry/HGCalCommonData/data/hgcalCons/v11m/hgcalCons.xml b/Geometry/HGCalCommonData/data/hgcalCons/v11m/hgcalCons.xml
@@ -34,6 +34,7 @@
     <Parameter name="LayerOffset"         value="0"/>
     <Parameter name="DetectorType"        value="1"/>
     <Parameter name="WaferMaskMode"       value="1"/>
+    <Parameter name="WaferZside"          value="-1"/>
     <Parameter name="Radius100to200"      value="[hgcal:rad100200P0]"/>
     <Parameter name="Radius100to200"      value="[hgcal:rad100200P1]"/>
     <Parameter name="Radius100to200"      value="[hgcal:rad100200P2]"/>
@@ -87,6 +88,7 @@
     <Parameter name="LayerOffset"         value="28"/>
     <Parameter name="DetectorType"        value="2"/>
     <Parameter name="WaferMaskMode"       value="1"/>
+    <Parameter name="WaferZside"          value="-1"/>
     <Parameter name="Radius100to200"      value="[hgcal:rad100200P0]"/>
     <Parameter name="Radius100to200"      value="[hgcal:rad100200P1]"/>
     <Parameter name="Radius100to200"      value="[hgcal:rad100200P2]"/>
@@ -138,6 +140,7 @@
     <Parameter name="LayerOffset"         value="28"/>
     <Parameter name="DetectorType"        value="3"/>
     <Parameter name="WaferMaskMode"       value="1"/>
+    <Parameter name="WaferZside"          value="1"/>
     <Parameter name="WaferThickness"      value="[hgcal:ScintillatorThickness]"/>
     <Parameter name="MinimumTileSize"     value="[MinimumTileSize]"/>
     <Parameter name="NPhiBinBH"           value="360"/>

diff --git a/Geometry/HGCalCommonData/data/hgcalCons/v12/hgcalCons.xml b/Geometry/HGCalCommonData/data/hgcalCons/v12/hgcalCons.xml
@@ -34,6 +34,7 @@
     <Parameter name="LayerOffset"         value="0"/>
     <Parameter name="DetectorType"        value="1"/>
     <Parameter name="WaferMaskMode"       value="1"/>
+    <Parameter name="WaferZside"          value="-1"/>
     <Parameter name="Radius100to200"      value="[hgcal:rad100200P0]"/>
     <Parameter name="Radius100to200"      value="[hgcal:rad100200P1]"/>
     <Parameter name="Radius100to200"      value="[hgcal:rad100200P2]"/>
@@ -87,6 +88,7 @@
     <Parameter name="LayerOffset"         value="28"/>
     <Parameter name="DetectorType"        value="2"/>
     <Parameter name="WaferMaskMode"       value="1"/>
+    <Parameter name="WaferZside"          value="-1"/>
     <Parameter name="Radius100to200"      value="[hgcal:rad100200P0]"/>
     <Parameter name="Radius100to200"      value="[hgcal:rad100200P1]"/>
     <Parameter name="Radius100to200"      value="[hgcal:rad100200P2]"/>
@@ -138,6 +140,7 @@
     <Parameter name="LayerOffset"         value="28"/>
     <Parameter name="DetectorType"        value="3"/>
     <Parameter name="WaferMaskMode"       value="1"/>
+    <Parameter name="WaferZside"          value="1"/>
     <Parameter name="WaferThickness"      value="[hgcal:ScintillatorThickness]"/>
     <Parameter name="MinimumTileSize"     value="[MinimumTileSize]"/>
     <Parameter name="NPhiBinBH"           value="360"/>

diff --git a/Geometry/HGCalCommonData/data/hgcalCons/v13/hgcalCons.xml b/Geometry/HGCalCommonData/data/hgcalCons/v13/hgcalCons.xml
@@ -34,6 +34,7 @@
     <Parameter name="LayerOffset"         value="0"/>
     <Parameter name="DetectorType"        value="1"/>
     <Parameter name="WaferMaskMode"       value="2"/>
+    <Parameter name="WaferZside"          value="-1"/>
     <Parameter name="Radius100to200"      value="[hgcal:rad100200P0]"/>
     <Parameter name="Radius100to200"      value="[hgcal:rad100200P1]"/>
     <Parameter name="Radius100to200"      value="[hgcal:rad100200P2]"/>
@@ -87,6 +88,7 @@
     <Parameter name="LayerOffset"         value="28"/>
     <Parameter name="DetectorType"        value="2"/>
     <Parameter name="WaferMaskMode"       value="3"/>
+    <Parameter name="WaferZside"          value="-1"/>
     <Parameter name="Radius100to200"      value="[hgcal:rad100200P0]"/>
     <Parameter name="Radius100to200"      value="[hgcal:rad100200P1]"/>
     <Parameter name="Radius100to200"      value="[hgcal:rad100200P2]"/>
@@ -138,6 +140,7 @@
     <Parameter name="LayerOffset"         value="28"/>
     <Parameter name="DetectorType"        value="3"/>
     <Parameter name="WaferMaskMode"       value="4"/>
+    <Parameter name="WaferZside"          value="1"/>
     <Parameter name="WaferThickness"      value="[hgcal:ScintillatorThickness]"/>
     <Parameter name="MinimumTileSize"     value="[MinimumTileSize]"/>
     <Parameter name="NPhiBinBH"           value="360"/>

diff --git a/Geometry/HGCalCommonData/data/hgcalCons/v14/hgcalCons.xml b/Geometry/HGCalCommonData/data/hgcalCons/v14/hgcalCons.xml
@@ -34,6 +34,7 @@
     <Parameter name="LayerOffset"         value="0"/>
     <Parameter name="DetectorType"        value="1"/>
     <Parameter name="WaferMaskMode"       value="2"/>
+    <Parameter name="WaferZside"          value="-1"/>
     <Parameter name="Radius100to200"      value="[hgcal:rad100200P0]"/>
     <Parameter name="Radius100to200"      value="[hgcal:rad100200P1]"/>
     <Parameter name="Radius100to200"      value="[hgcal:rad100200P2]"/>
@@ -87,6 +88,7 @@
     <Parameter name="LayerOffset"         value="28"/>
     <Parameter name="DetectorType"        value="2"/>
     <Parameter name="WaferMaskMode"       value="3"/>
+    <Parameter name="WaferZside"          value="-1"/>
     <Parameter name="Radius100to200"      value="[hgcal:rad100200P0]"/>
     <Parameter name="Radius100to200"      value="[hgcal:rad100200P1]"/>
     <Parameter name="Radius100to200"      value="[hgcal:rad100200P2]"/>
@@ -138,6 +140,7 @@
     <Parameter name="LayerOffset"         value="28"/>
     <Parameter name="DetectorType"        value="3"/>
     <Parameter name="WaferMaskMode"       value="4"/>
+    <Parameter name="WaferZside"          value="1"/>
     <Parameter name="WaferThickness"      value="[hgcal:ScintillatorThickness]"/>
     <Parameter name="MinimumTileSize"     value="[MinimumTileSize]"/>
     <Parameter name="NPhiBinBH"           value="360"/>

diff --git a/Geometry/HGCalCommonData/data/hgcalCons/v9/hgcalCons.xml b/Geometry/HGCalCommonData/data/hgcalCons/v9/hgcalCons.xml
@@ -34,6 +34,7 @@
     <Parameter name="LayerOffset"         value="0"/>
     <Parameter name="DetectorType"        value="1"/>
     <Parameter name="WaferMaskMode"       value="0"/>
+    <Parameter name="WaferZside"          value="-1"/>
     <Parameter name="Radius100to200"      value="[hgcal:rad100200P0]"/>
     <Parameter name="Radius100to200"      value="[hgcal:rad100200P1]"/>
     <Parameter name="Radius100to200"      value="[hgcal:rad100200P2]"/>
@@ -80,6 +81,7 @@
     <Parameter name="FirstMixedLayer"     value="[hgcal:FirstMixedLayer]"/>
     <Parameter name="LayerOffset"         value="28"/>
     <Parameter name="WaferMaskMode"       value="0"/>
+    <Parameter name="WaferZside"          value="-1"/>
     <Parameter name="DetectorType"        value="2"/>
     <Parameter name="Radius100to200"      value="[hgcal:rad100200P0]"/>
     <Parameter name="Radius100to200"      value="[hgcal:rad100200P1]"/>
@@ -126,6 +128,7 @@
     <Parameter name="LayerOffset"         value="28"/>
     <Parameter name="DetectorType"        value="3"/>
     <Parameter name="WaferMaskMode"       value="0"/>
+    <Parameter name="WaferZside"          value="1"/>
     <Parameter name="WaferThickness"      value="[hgcal:ScintillatorThickness]"/>
     <Parameter name="MinimumTileSize"     value="[MinimumTileSize]"/>
     <Parameter name="NPhiBinBH"           value="360"/>

diff --git a/Geometry/HGCalCommonData/data/hgcalCons/v9a/hgcalCons.xml b/Geometry/HGCalCommonData/data/hgcalCons/v9a/hgcalCons.xml
@@ -37,6 +37,7 @@
     <Parameter name="LayerOffset"         value="0"/>
     <Parameter name="DetectorType"        value="1"/>
     <Parameter name="WaferMaskMode"       value="0"/>
+    <Parameter name="WaferZside"          value="-1"/>
     <Parameter name="Radius100to200"      value="[hgcal:rad100200P0]"/>
     <Parameter name="Radius100to200"      value="[hgcal:rad100200P1]"/>
     <Parameter name="Radius100to200"      value="[hgcal:rad100200P2]"/>
@@ -99,6 +100,7 @@
     <Parameter name="LayerOffset"         value="28"/>
     <Parameter name="DetectorType"        value="2"/>
     <Parameter name="WaferMaskMode"       value="0"/>
+    <Parameter name="WaferZside"          value="-1"/>
     <Parameter name="Radius100to200"      value="[hgcal:rad100200P0]"/>
     <Parameter name="Radius100to200"      value="[hgcal:rad100200P1]"/>
     <Parameter name="Radius100to200"      value="[hgcal:rad100200P2]"/>

diff --git a/Geometry/HGCalCommonData/data/hgcalCons/v9ap/hgcalCons.xml b/Geometry/HGCalCommonData/data/hgcalCons/v9ap/hgcalCons.xml
@@ -37,6 +37,7 @@
     <Parameter name="LayerOffset"         value="0"/>
     <Parameter name="DetectorType"        value="1"/>
     <Parameter name="WaferMaskMode"       value="0"/>
+    <Parameter name="WaferZside"          value="-1"/>
     <Parameter name="Radius100to200"      value="[hgcal:rad100200P0]"/>
     <Parameter name="Radius100to200"      value="[hgcal:rad100200P1]"/>
     <Parameter name="Radius100to200"      value="[hgcal:rad100200P2]"/>
@@ -99,6 +100,7 @@
     <Parameter name="LayerOffset"         value="28"/>
     <Parameter name="DetectorType"        value="2"/>
     <Parameter name="WaferMaskMode"       value="0"/>
+    <Parameter name="WaferZside"          value="-1"/>
     <Parameter name="Radius100to200"      value="[hgcal:rad100200P0]"/>
     <Parameter name="Radius100to200"      value="[hgcal:rad100200P1]"/>
     <Parameter name="Radius100to200"      value="[hgcal:rad100200P2]"/>

diff --git a/Geometry/HGCalCommonData/data/hgcalCons/v9p/hgcalCons.xml b/Geometry/HGCalCommonData/data/hgcalCons/v9p/hgcalCons.xml
@@ -34,6 +34,7 @@
     <Parameter name="LayerOffset"         value="0"/>
     <Parameter name="DetectorType"        value="1"/>
     <Parameter name="WaferMaskMode"       value="0"/>
+    <Parameter name="WaferZside"          value="-1"/>
     <Parameter name="Radius100to200"      value="[hgcal:rad100200P0]"/>
     <Parameter name="Radius100to200"      value="[hgcal:rad100200P1]"/>
     <Parameter name="Radius100to200"      value="[hgcal:rad100200P2]"/>
@@ -81,6 +82,7 @@
     <Parameter name="LayerOffset"         value="28"/>
     <Parameter name="DetectorType"        value="2"/>
     <Parameter name="WaferMaskMode"       value="0"/>
+    <Parameter name="WaferZside"          value="-1"/>
     <Parameter name="Radius100to200"      value="[hgcal:rad100200P0]"/>
     <Parameter name="Radius100to200"      value="[hgcal:rad100200P1]"/>
     <Parameter name="Radius100to200"      value="[hgcal:rad100200P2]"/>

diff --git a/Geometry/HGCalCommonData/interface/HGCalParameters.h b/Geometry/HGCalCommonData/interface/HGCalParameters.h
@@ -171,6 +171,7 @@ class HGCalParameters {
   wafer_map typesInLayers_;
   waferT_map waferTypes_;
   int waferMaskMode_;
+  int waferZSide_;
   waferInfo_map waferInfoMap_;
   tileInfo_map tileInfoMap_;
   std::vector<std::pair<double, double> > tileRingR_;

diff --git a/Geometry/HGCalCommonData/interface/HGCalTypes.h b/Geometry/HGCalCommonData/interface/HGCalTypes.h
@@ -59,6 +59,7 @@ class HGCalTypes {
   };
 
   static constexpr int32_t WaferCornerMin = 3;
+  static constexpr int32_t WaferCornerMax = 6;
 
   enum TileType { TileFine = 0, TileCoarseCast = 1, TileCoarseMould = 2 };
 

diff --git a/Geometry/HGCalCommonData/interface/HGCalWaferMask.h b/Geometry/HGCalCommonData/interface/HGCalWaferMask.h
@@ -19,6 +19,7 @@ class HGCalWaferMask {
 
   static bool maskCell(int u, int v, int N, int ncor, int fcor, int corners);
   static bool goodCell(int u, int v, int N, int type, int rotn);
+  static int getRotation(int zside, int type, int rotn);
   static std::pair<int, int> getTypeMode(const double& xpos,
                                          const double& ypos,
                                          const double& delX,

diff --git a/Geometry/HGCalCommonData/src/HGCalGeomParameters.cc b/Geometry/HGCalCommonData/src/HGCalGeomParameters.cc
@@ -1167,11 +1167,16 @@ void HGCalGeomParameters::loadSpecParsHexagon8(HGCalParameters& php,
                                                const std::vector<int>& waferOrien) {
   // Store parameters from Philip's file
   for (unsigned int k = 0; k < waferIndex.size(); ++k) {
-    php.waferInfoMap_[waferIndex[k]] = HGCalParameters::waferInfo(waferTypes[k], waferParts[k], waferOrien[k]);
+    php.waferInfoMap_[waferIndex[k]] = HGCalParameters::waferInfo(
+        waferTypes[k], waferParts[k], HGCalWaferMask::getRotation(php.waferZSide_, waferParts[k], waferOrien[k]));
 #ifdef EDM_ML_DEBUG
-    edm::LogVerbatim("HGCalGeom") << "[" << k << ":" << waferIndex[k] << "] "
+    edm::LogVerbatim("HGCalGeom") << "[" << k << ":" << waferIndex[k] << ":"
+                                  << HGCalWaferIndex::waferLayer(waferIndex[k]) << ":"
+                                  << HGCalWaferIndex::waferU(waferIndex[k]) << ":"
+                                  << HGCalWaferIndex::waferV(waferIndex[k]) << "] "
                                   << " Type " << waferTypes[k] << " Partial type " << waferParts[k] << " Orientation "
-                                  << waferOrien[k];
+                                  << waferOrien[k] << ":"
+                                  << HGCalWaferMask::getRotation(php.waferZSide_, waferParts[k], waferOrien[k]);
 #endif
   }
 }

diff --git a/Geometry/HGCalCommonData/src/HGCalParametersFromDD.cc b/Geometry/HGCalCommonData/src/HGCalParametersFromDD.cc
@@ -104,6 +104,7 @@ bool HGCalParametersFromDD::build(const DDCompactView* cpv,
       }
       php.minTileSize_ = 0;
       php.waferMaskMode_ = 0;
+      php.waferZSide_ = 0;
     }
     if ((php.mode_ == HGCalGeometryMode::Hexagon8) || (php.mode_ == HGCalGeometryMode::Hexagon8Full) ||
         (php.mode_ == HGCalGeometryMode::Hexagon8File)) {
@@ -115,11 +116,12 @@ bool HGCalParametersFromDD::build(const DDCompactView* cpv,
       php.detectorType_ = static_cast<int>(getDDDValue("DetectorType", sv));
       php.minTileSize_ = 0;
       php.waferMaskMode_ = static_cast<int>(getDDDValue("WaferMaskMode", sv));
+      php.waferZSide_ = static_cast<int>(getDDDValue("WaferZside", sv));
 #ifdef EDM_ML_DEBUG
       edm::LogVerbatim("HGCalGeom") << "Top levels " << php.levelT_[0] << ":" << php.levelT_[1] << " ZSide Level "
                                     << php.levelZSide_ << " first layers " << php.firstLayer_ << ":"
                                     << php.firstMixedLayer_ << " Det Type " << php.detectorType_ << " Wafer Mask Mode "
-                                    << php.waferMaskMode_;
+                                    << php.waferMaskMode_ << " Zside " << php.waferZSide_;
 #endif
       attribute = "OnlyForHGCalNumbering";
       value = namet;
@@ -202,12 +204,12 @@ bool HGCalParametersFromDD::build(const DDCompactView* cpv,
       php.waferSize_ = php.waferR_ = 0;
       php.sensorSeparation_ = php.mouseBite_ = 0;
       php.waferMaskMode_ = static_cast<int>(getDDDValue("WaferMaskMode", sv));
+      php.waferZSide_ = static_cast<int>(getDDDValue("WaferZside", sv));
 #ifdef EDM_ML_DEBUG
       edm::LogVerbatim("HGCalGeom") << "Top levels " << php.levelT_[0] << ":" << php.levelT_[1] << " first layers "
                                     << php.firstLayer_ << ":" << php.firstMixedLayer_ << " Det Type "
                                     << php.detectorType_ << "  thickenss " << php.waferThick_ << " Tile Mask Mode "
-                                    << php.waferMaskMode_;
-      ;
+                                    << php.waferMaskMode_ << " Zside " << php.waferZSide_;
 #endif
       // Load the SpecPars
       geom->loadSpecParsTrapezoid(fv, php);
@@ -277,6 +279,7 @@ bool HGCalParametersFromDD::build(const cms::DDCompactView* cpv,
 #endif
       php.minTileSize_ = 0;
       php.waferMaskMode_ = 0;
+      php.waferZSide_ = 0;
     }
     if ((php.mode_ == HGCalGeometryMode::Hexagon8) || (php.mode_ == HGCalGeometryMode::Hexagon8Full) ||
         (php.mode_ == HGCalGeometryMode::Hexagon8File)) {
@@ -292,12 +295,13 @@ bool HGCalParametersFromDD::build(const cms::DDCompactView* cpv,
       php.minTileSize_ = 0;
       tempD = fv.get<std::vector<double> >(name, "WaferMaskMode");
       php.waferMaskMode_ = static_cast<int>(tempD[0]);
+      tempD = fv.get<std::vector<double> >(name, "WaferZside");
+      php.waferZSide_ = static_cast<int>(tempD[0]);
 #ifdef EDM_ML_DEBUG
       edm::LogVerbatim("HGCalGeom") << "Top levels " << php.levelT_[0] << ":" << php.levelT_[1] << " ZSide Level "
                                     << php.levelZSide_ << " first layers " << php.firstLayer_ << ":"
                                     << php.firstMixedLayer_ << " Det Type " << php.detectorType_ << " Wafer Mask Mode "
-                                    << php.waferMaskMode_;
-      ;
+                                    << php.waferMaskMode_ << " ZSide " << php.waferZSide_;
 #endif
 
       tempS = fv.get<std::vector<std::string> >(namet, "WaferMode");
@@ -389,12 +393,14 @@ bool HGCalParametersFromDD::build(const cms::DDCompactView* cpv,
       php.sensorSeparation_ = php.mouseBite_ = 0;
       tempD = fv.get<std::vector<double> >(name, "WaferMaskMode");
       php.waferMaskMode_ = static_cast<int>(tempD[0]);
+      tempD = fv.get<std::vector<double> >(name, "WaferZside");
+      php.waferZSide_ = static_cast<int>(tempD[0]);
 #ifdef EDM_ML_DEBUG
       edm::LogVerbatim("HGCalGeom") << "Top levels " << php.levelT_[0] << ":" << php.levelT_[1] << " first layers "
                                     << php.firstLayer_ << ":" << php.firstMixedLayer_ << " Det Type "
                                     << php.detectorType_ << "  thickenss " << php.waferThick_ << " min tile size "
-                                    << php.minTileSize_ << " Tile Mask Mode " << php.waferMaskMode_;
-      ;
+                                    << php.minTileSize_ << " Tile Mask Mode " << php.waferMaskMode_ << " ZSide "
+                                    << php.waferZSide_;
 #endif
       // Load the SpecPars
       geom->loadSpecParsTrapezoid(fv, vmap, php, name);