From f39ccf8db29ba5063f00abdc901955b32616841b Mon Sep 17 00:00:00 2001
From: Sunanda <sunanda.banerjee@cern.ch>
Date: Fri, 21 Feb 2014 09:52:06 +0100
Subject: [PATCH 1/3] Corrected xml files for HGCal

---
 Geometry/HGCalCommonData/data/v1/hgcal.xml    |  29 +++--
 Geometry/HGCalCommonData/data/v1/hgcalEE.xml  |  60 ++++++++--
 .../HGCalCommonData/data/v1/hgcalHEgem.xml    |  65 +++++------
 .../HGCalCommonData/data/v1/hgcalHEsci.xml    |  52 +++++++--
 .../HGCalCommonData/data/v1/hgcalHEsil.xml    |  40 +++++--
 Geometry/HGCalCommonData/data/v2/hgcal.xml    |  31 +++---
 Geometry/HGCalCommonData/data/v2/hgcalEE.xml  |  73 ++++++++++---
 .../HGCalCommonData/data/v2/hgcalHEgem.xml    |  39 ++++---
 .../HGCalCommonData/data/v2/hgcalHEsci.xml    |  48 ++++++--
 .../HGCalCommonData/data/v2/hgcalHEsil.xml    |  50 ++++++---
 Geometry/HGCalCommonData/data/v3/hgcal.xml    |  99 +++++++++++++++++
 .../HGCalCommonData/data/v3/hgcalHEsci.xml    | 103 ++++++++++++++++++
 .../HGCalCommonData/plugins/DDHGCalEEAlgo.cc  |   2 +-
 .../HGCalCommonData/plugins/DDHGCalHEAlgo.cc  |   2 +-
 14 files changed, 538 insertions(+), 155 deletions(-)
 create mode 100644 Geometry/HGCalCommonData/data/v3/hgcal.xml
 create mode 100644 Geometry/HGCalCommonData/data/v3/hgcalHEsci.xml

diff --git a/Geometry/HGCalCommonData/data/v1/hgcal.xml b/Geometry/HGCalCommonData/data/v1/hgcal.xml
index a28585a557bf8..be15c0aff8d1f 100644
--- a/Geometry/HGCalCommonData/data/v1/hgcal.xml
+++ b/Geometry/HGCalCommonData/data/v1/hgcal.xml
@@ -3,15 +3,17 @@
 
 <ConstantsSection label="hgcal.xml" eval="true">
   <Constant name="zHGCal1"    value="317.0*cm"/>
-  <Constant name="zHGCal3"    value="375.022*cm"/>
-  <Constant name="zHGCal4"    value="449.127*cm"/>
+  <Constant name="zHGCal2"    value="375.022*cm"/>
+  <Constant name="zHGCal3"    value="449.127*cm"/>
+  <Constant name="zHGCal4"    value="519.3*cm"/>
   <Constant name="zHGCal5"    value="554.1*cm"/>
   <Constant name="zMinEE"     value="3187.6*mm"/>
   <Constant name="zMaxEE"     value="3448.6*mm"/>
   <Constant name="zMinHE"     value="3448.6*mm"/>
   <Constant name="zMaxHE"     value="5541.0*mm"/>
   <Constant name="rMinHGCal1" value="[etaMax:slope]*[zHGCal1]"/>
-  <Constant name="rMinHGCal3" value="[etaMax:slope]*[zHGCal3]"/>    
+  <Constant name="rMinHGCal2" value="[etaMax:slope]*[zHGCal2]"/>    
+  <Constant name="rMinHGCal3" value="[etaMax:slope]*[zHGCal3]"/>
   <Constant name="rMinHGCal4" value="[etaMax:slope]*[zHGCal4]"/>
   <Constant name="rMinHGCal5" value="[etaMax:slope]*[zHGCal5]"/>
   <Constant name="rMinEEMin"  value="[etaMax:slope]*[zMinEE]"/>
@@ -19,18 +21,21 @@
   <Constant name="rMinHEMin"  value="[etaMax:slope]*[zMinHE]"/>
   <Constant name="rMinHEMax"  value="[etaMax:slope]*[zMaxHE]"/>
   <Constant name="rMaxHGCal1" value="159.0*cm"/>
-  <Constant name="rMaxHGCal3" value="177.5*cm"/>
-  <Constant name="slope2"     value="([rMaxHGCal3]-[rMaxHGCal1])/([zHGCal3]-[zHGCal1])"/>
-  <Constant name="slope3"     value="([rMaxHGCal4]-[rMaxHGCal3])/([zHGCal4]-[zHGCal3])"/>
-  <Constant name="rMaxHGCal4" value="273.76*cm"/>    
+  <Constant name="rMaxHGCal2" value="177.5*cm"/>
+  <Constant name="slope2"     value="([rMaxHGCal2]-[rMaxHGCal1])/([zHGCal2]-[zHGCal1])"/>
+  <Constant name="slope3"     value="([rMaxHGCal3]-[rMaxHGCal2])/([zHGCal3]-[zHGCal2])"/>
+  <Constant name="rMaxHGCal3" value="273.76*cm"/>    
+  <Constant name="rMaxHGCal4" value="245.90*cm"/>
   <Constant name="rMaxEEMin"  value="([rMaxHGCal1]+[slope2]*([zMinEE]-[zHGCal1]))"/>
   <Constant name="rMaxEEMax"  value="([rMaxHGCal1]+[slope2]*([zMaxEE]-[zHGCal1]))"/>
   <Constant name="rMaxHEMin"  value="([rMaxHGCal1]+[slope2]*([zMinHE]-[zHGCal1]))"/>
-  <Constant name="rMaxHEMax"  value="[rMaxHGCal4]"/>
+  <Constant name="rMaxHEMax"  value="[rMaxHGCal3]"/>
   <Constant name="factor"     value="cos(10*deg)"/>
   <Constant name="rMapHGCal1" value="[rMaxHGCal1]*[factor]"/>
+  <Constant name="rMapHGCal2" value="[rMaxHGCal2]*[factor]"/>
   <Constant name="rMapHGCal3" value="[rMaxHGCal3]*[factor]"/>
   <Constant name="rMapHGCal4" value="[rMaxHGCal4]*[factor]"/>
+  <Constant name="rMapHGCal5" value="[rMaxHGCal5]*[factor]"/>
   <Constant name="rMapEEMin"  value="[rMaxEEMin]*[factor]"/>
   <Constant name="rMapEEMax"  value="[rMaxEEMax]*[factor]"/>
   <Constant name="rMapHEMin"  value="[rMaxHEMin]*[factor]"/>
@@ -40,9 +45,9 @@
 <SolidSection label="hgcal.xml">
   <Polycone name="HGCal" startPhi="0*deg" deltaPhi="360*deg">
     <ZSection z="[zHGCal1]" rMin="[rMinHGCal1]" rMax="[rMaxHGCal1]"/>
+    <ZSection z="[zHGCal2]" rMin="[rMinHGCal2]" rMax="[rMaxHGCal2]"/>
     <ZSection z="[zHGCal3]" rMin="[rMinHGCal3]" rMax="[rMaxHGCal3]"/>
-    <ZSection z="[zHGCal4]" rMin="[rMinHGCal4]" rMax="[rMaxHGCal4]"/>
-    <ZSection z="[zHGCal5]" rMin="[rMinHGCal5]" rMax="[rMaxHGCal4]"/>
+    <ZSection z="[zHGCal5]" rMin="[rMinHGCal5]" rMax="[rMaxHGCal3]"/>
   </Polycone>
   <Polyhedra name="HGCalEE" numSide="18" startPhi="350*deg" deltaPhi="360*deg">
     <ZSection z="[zMinEE]" rMin="[rMinEEMin]" rMax="[rMapEEMin]"/>
@@ -50,9 +55,9 @@
   </Polyhedra>
   <Polyhedra name="HGCalHE" numSide="18" startPhi="350*deg" deltaPhi="360*deg">
     <ZSection z="[zMinHE]"  rMin="[rMinHEMin]"  rMax="[rMapHEMin]"/>
+    <ZSection z="[zHGCal2]" rMin="[rMinHGCal2]" rMax="[rMapHGCal2]"/>
     <ZSection z="[zHGCal3]" rMin="[rMinHGCal3]" rMax="[rMapHGCal3]"/>
-    <ZSection z="[zHGCal4]" rMin="[rMinHGCal4]" rMax="[rMapHGCal4]"/>
-    <ZSection z="[zMaxHE]"  rMin="[rMinHEMax]"  rMax="[rMapHEMax]"/>
+    <ZSection z="[zHGCal5]" rMin="[rMinHGCal5]" rMax="[rMapHGCal3]"/>
   </Polyhedra>
 </SolidSection>
 
diff --git a/Geometry/HGCalCommonData/data/v1/hgcalEE.xml b/Geometry/HGCalCommonData/data/v1/hgcalEE.xml
index 22322ad877d36..24f53c0f9f96b 100644
--- a/Geometry/HGCalCommonData/data/v1/hgcalEE.xml
+++ b/Geometry/HGCalCommonData/data/v1/hgcalEE.xml
@@ -48,23 +48,59 @@
    2, 3, 4, 5, 6, 2, 3, 4, 5, 6, 2, 3, 4, 5, 6, 2, 3, 4, 5, 6, 2, 3, 4, 5, 6
   </Vector>
   <Vector name="HeightType" type="numeric" nEntries="150">
-   0, 0, 1, 1, 0, 0, 0, 1, 1, 0, 0, 0, 1, 1, 0, 0, 0, 1, 1, 0, 0, 0, 1, 1, 0,
-   0, 0, 1, 1, 0, 0, 0, 1, 1, 0, 0, 0, 1, 1, 0, 0, 0, 1, 1, 0, 0, 0, 1, 1, 0,
-   0, 0, 1, 1, 0, 0, 0, 1, 1, 0, 0, 0, 1, 1, 0, 0, 0, 1, 1, 0, 0, 0, 1, 1, 0,
-   0, 0, 1, 1, 0, 0, 0, 1, 1, 0, 0, 0, 1, 1, 0, 0, 0, 1, 1, 0, 0, 0, 1, 1, 0,
-   0, 0, 1, 1, 0, 0, 0, 1, 1, 0, 0, 0, 1, 1, 0, 0, 0, 1, 1, 0, 0, 0, 1, 1, 0,
-   0, 0, 1, 1, 0, 0, 0, 1, 1, 0, 0, 0, 1, 1, 0, 0, 0, 1, 1, 0, 0, 0, 1, 1, 0
+   0, 1, 1, 1, 1, 0, 1, 1, 1, 1, 0, 1, 1, 1, 1, 0, 1, 1, 1, 1, 0, 1, 1, 1, 1,
+   0, 1, 1, 1, 1, 0, 1, 1, 1, 1, 0, 1, 1, 1, 1, 0, 1, 1, 1, 1, 0, 1, 1, 1, 1,
+   0, 1, 1, 1, 1, 0, 1, 1, 1, 1, 0, 1, 1, 1, 1, 0, 1, 1, 1, 1, 0, 1, 1, 1, 1,
+   0, 1, 1, 1, 1, 0, 1, 1, 1, 1, 0, 1, 1, 1, 1, 0, 1, 1, 1, 1, 0, 1, 1, 1, 1,
+   0, 1, 1, 1, 1, 0, 1, 1, 1, 1, 0, 1, 1, 1, 1, 0, 1, 1, 1, 1, 0, 1, 1, 1, 1,
+   0, 1, 1, 1, 1, 0, 1, 1, 1, 1, 0, 1, 1, 1, 1, 0, 1, 1, 1, 1, 0, 1, 1, 1, 1
   </Vector>
   <Numeric name="zMinBlock"   value="[hgcal:zMinEE]"/>
   <Numeric name="Sectors"     value="18"/>
   <Numeric name="SlopeBottom" value="[etaMax:slope]"/>
-  <Vector name="SlopeTop" type="numeric" nEntries="3">
-    [hgcal:slope2], [hgcal:slope3], 0</Vector>
-  <Vector name="ZFront" type="numeric" nEntries="3">
-    [hgcal:zHGCal1], [hgcal:zHGCal3], [hgcal:zHGCal4]</Vector>
-  <Vector name="RMaxFront" type="numeric" nEntries="3">
-    [hgcal:rMaxHGCal1], [hgcal:rMaxHGCal3], [hgcal:rMaxHGCal4]</Vector>
+  <Vector name="SlopeTop" type="numeric" nEntries="4">
+    [hgcal:slope2], [hgcal:slope3], 0, 0</Vector>
+  <Vector name="ZFront" type="numeric" nEntries="4">
+    [hgcal:zHGCal1], [hgcal:zHGCal2], [hgcal:zHGCal3], [hgcal:zHGCal4]</Vector>
+  <Vector name="RMaxFront" type="numeric" nEntries="4">
+    [hgcal:rMaxHGCal1], [hgcal:rMaxHGCal2], [hgcal:rMaxHGCal3], [hgcal:rMaxHGCal4]</Vector>
  </Algorithm>
 </PosPartSection> 
 
+<SpecParSection label="hgcalEE.xml">
+  <SpecPar name="HGCalEE readout granularity per layer">
+    <PartSelector path="//HGCalEEM"/>
+    <Parameter name="Granularity" value="2.5*mm"/>
+    <Parameter name="Granularity" value="2.5*mm"/>
+    <Parameter name="Granularity" value="2.5*mm"/>
+    <Parameter name="Granularity" value="2.5*mm"/>
+    <Parameter name="Granularity" value="2.5*mm"/>
+    <Parameter name="Granularity" value="2.5*mm"/>
+    <Parameter name="Granularity" value="2.5*mm"/>
+    <Parameter name="Granularity" value="2.5*mm"/>
+    <Parameter name="Granularity" value="2.5*mm"/>
+    <Parameter name="Granularity" value="2.5*mm"/>
+    <Parameter name="Granularity" value="2.5*mm"/>
+    <Parameter name="Granularity" value="2.5*mm"/>
+    <Parameter name="Granularity" value="2.5*mm"/>
+    <Parameter name="Granularity" value="2.5*mm"/>
+    <Parameter name="Granularity" value="2.5*mm"/>
+    <Parameter name="Granularity" value="2.5*mm"/>
+    <Parameter name="Granularity" value="2.5*mm"/>
+    <Parameter name="Granularity" value="2.5*mm"/>
+    <Parameter name="Granularity" value="2.5*mm"/>
+    <Parameter name="Granularity" value="2.5*mm"/>
+    <Parameter name="Granularity" value="2.5*mm"/>
+    <Parameter name="Granularity" value="2.5*mm"/>
+    <Parameter name="Granularity" value="2.5*mm"/>
+    <Parameter name="Granularity" value="2.5*mm"/>
+    <Parameter name="Granularity" value="2.5*mm"/>
+    <Parameter name="Granularity" value="2.5*mm"/>
+    <Parameter name="Granularity" value="2.5*mm"/>
+    <Parameter name="Granularity" value="2.5*mm"/>
+    <Parameter name="Granularity" value="2.5*mm"/>
+    <Parameter name="Granularity" value="2.5*mm"/>
+  </SpecPar>
+</SpecParSection>
+
 </DDDefinition>
diff --git a/Geometry/HGCalCommonData/data/v1/hgcalHEgem.xml b/Geometry/HGCalCommonData/data/v1/hgcalHEgem.xml
index cb8f443175b5e..4c818e858fe45 100644
--- a/Geometry/HGCalCommonData/data/v1/hgcalHEgem.xml
+++ b/Geometry/HGCalCommonData/data/v1/hgcalHEgem.xml
@@ -2,39 +2,18 @@
 <DDDefinition xmlns="http://www.cern.ch/cms/DDL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.cern.ch/cms/DDL ../../../DetectorDescription/Schema/DDLSchema.xsd">
 
 <ConstantsSection label="hgcalHEgem.xml" eval="true">
-  <Constant name="HEgem_nSegments" value="8"/>
-  <Constant name="dZ_HEgem_absorber" value="34.5*mm"/>
-  <Constant name="dZ_HEgem_spacer" value="9*mm"/>
-  <Constant name="ZminHEgem" value="5193*mm"/>
-  <Constant name="ZmaxHEgem" value="5541*mm"/>
-  <Constant name="XmaxHEgem" value="2481.6*mm"/>
-  <Constant name="ThetaMin" value="0.0994838*rad"/>
-  <Constant name="demiPhi" value="0.174533*rad"/>
-  <Constant name="deltaZ_HEgem_drboard" value="2*mm"/>
-  <Constant name="deltaZ_HEgem_rdboard" value="1.94*mm"/>
-  <Constant name="deltaZ_HEgem_foil" value="0.06*mm"/>
-  <Constant name="deltaZ_HEgem_dreg1" value="3*mm"/>
-  <Constant name="deltaZ_HEgem_dreg2" value="1*mm"/>
-  <Constant name="deltaZ_HEgem_air" value="1*mm"/>
+  <Constant name="ZminHEgem"  value="5193*mm"/>
+  <Constant name="ZmaxHEgem"  value="5541*mm"/>
   <Constant name="rMinHEgem1" value="[etaMax:slope]*[ZminHEgem]"/>
   <Constant name="rMinHEgem2" value="[etaMax:slope]*[ZmaxHEgem]"/>
-  <Constant name="rMaxHEgem1" value="([hgcal:rMaxHGCal4])"/>
-  <Constant name="rMaxHEgem2" value="([hgcal:rMaxHGCal4])"/>
-  <Constant name="rMapHEgem1" value="[rMaxHEgem1]*[hgcal:factor]"/>
-  <Constant name="rMapHEgem2" value="[rMaxHEgem2]*[hgcal:factor]"/>
- <Vector name="HEgem_absorber" type="numeric" nEntries="2"> 1, 8 </Vector>
- <Vector name="HEgem_spacer" type="numeric" nEntries="2"> 9, 16 </Vector>
- <Vector name="HEgem_drbord" type="numeric" nEntries="2"> 17, 24 </Vector>
- <Vector name="HEgem_dreg1" type="numeric" nEntries="2"> 25, 32 </Vector>
- <Vector name="HEgem_foil" type="numeric" nEntries="2"> 33, 40 </Vector>
- <Vector name="HEgem_dreg2" type="numeric" nEntries="2"> 41, 48 </Vector>
- <Vector name="HEgem_rdbord" type="numeric" nEntries="2"> 49, 56 </Vector>
+  <Constant name="rMaxHEgem"  value="[hgcal:rMaxHGCal4]"/>
+  <Constant name="rMapHEgem"  value="[rMaxHEgem]*[hgcal:factor]"/>
 </ConstantsSection> 
 
 <SolidSection label="hgcalHEgem.xml" >
  <Polyhedra name="HGCalHEGem" numSide="1" startPhi="350*deg" deltaPhi="20*deg">
-  <ZSection z="[ZminHEgem]"     rMin="[rMinHEgem1]"       rMax="[rMapHEgem1]"/>
-  <ZSection z="[hgcal:zMaxHE]"  rMin="[hgcal:rMinHEMax]"  rMax="[hgcal:rMapHEMax]"/>
+  <ZSection z="[ZminHEgem]"     rMin="[rMinHEgem1]"       rMax="[rMapHEgem]"/>
+  <ZSection z="[ZmaxHEgem]"     rMin="[rminHEgem1]"       rMax="[rMapHEgem]"/>
  </Polyhedra>
 </SolidSection>
 
@@ -83,19 +62,33 @@
    0, 2, 3, 4, 5, 6, 1, 0, 2, 3, 4, 5, 6, 1, 0, 2, 3, 4, 5, 6, 1,
    0, 2, 3, 4, 5, 6, 1, 0, 2, 3, 4, 5, 6, 1 </Vector>
   <Vector name="HeightType" type="numeric" nEntries="56">
-   0, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 0,
-   0, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 0,
-   0, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 0 </Vector>
+   0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1,
+   0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1,
+   0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1 </Vector>
   <Numeric name="ThickModule" value="43.5*mm"/>
   <Numeric name="Sectors"     value="18"/>
   <Numeric name="SlopeBottom" value="[etaMax:slope]"/>
-  <Vector name="SlopeTop" type="numeric" nEntries="3">
-    [hgcal:slope2], [hgcal:slope3], 0</Vector>
-  <Vector name="ZFront" type="numeric" nEntries="3">
-    [hgcal:zHGCal1], [hgcal:zHGCal3], [hgcal:zHGCal4]</Vector>
-  <Vector name="RMaxFront" type="numeric" nEntries="3">
-    [hgcal:rMaxHGCal1], [hgcal:rMaxHGCal3], [hgcal:rMaxHGCal4]</Vector>
+  <Vector name="SlopeTop" type="numeric" nEntries="4">
+    [hgcal:slope2], [hgcal:slope3], 0, 0</Vector>
+  <Vector name="ZFront" type="numeric" nEntries="4">
+    [hgcal:zHGCal1], [hgcal:zHGCal2], [hgcal:zHGCal3], [hgcal:zHGCal4]</Vector>
+  <Vector name="RMaxFront" type="numeric" nEntries="4">
+    [hgcal:rMaxHGCal1], [hgcal:rMaxHGCal2], [hgcal:rMaxHGCal3], [hgcal:rMaxHGCal4]</Vector>
  </Algorithm>
 </PosPartSection>
 
+<SpecParSection label="hgcalHEgem.xml">
+  <SpecPar name="HGCalHEGem readout granularity per layer">
+    <PartSelector path="//HGCalHEGem"/>
+    <Parameter name="Granularity" value="10*mm"/>
+    <Parameter name="Granularity" value="10*mm"/>
+    <Parameter name="Granularity" value="10*mm"/>
+    <Parameter name="Granularity" value="10*mm"/>
+    <Parameter name="Granularity" value="10*mm"/>
+    <Parameter name="Granularity" value="10*mm"/>
+    <Parameter name="Granularity" value="10*mm"/>
+    <Parameter name="Granularity" value="10*mm"/>
+  </SpecPar>
+</SpecParSection>
+
 </DDDefinition>
diff --git a/Geometry/HGCalCommonData/data/v1/hgcalHEsci.xml b/Geometry/HGCalCommonData/data/v1/hgcalHEsci.xml
index d1704d501a18b..acc3f9667bca6 100644
--- a/Geometry/HGCalCommonData/data/v1/hgcalHEsci.xml
+++ b/Geometry/HGCalCommonData/data/v1/hgcalHEsci.xml
@@ -6,8 +6,8 @@
   <Constant name="ZmaxHEsci"  value="5193.0*mm"/>
   <Constant name="rMinHEsci1" value="[etaMax:slope]*[ZminHEsci]"/>
   <Constant name="rMinHEsci2" value="[etaMax:slope]*[ZmaxHEsci]"/>
-  <Constant name="rMaxHEsci1" value="([hgcal:rMaxHGCal3]+[hgcal:slope3]*([ZminHEsci]-[hgcal:zHGCal3]))"/>
-  <Constant name="rMaxHEsci2" value="([hgcal:rMaxHGCal4])"/>
+  <Constant name="rMaxHEsci1" value="([hgcal:rMaxHGCal2]+[hgcal:slope3]*([ZminHEsci]-[hgcal:zHGCal2]))"/>
+  <Constant name="rMaxHEsci2" value="([hgcal:rMaxHGCal3])"/>
   <Constant name="rMapHEsci1" value="[rMaxHEsci1]*[hgcal:factor]"/>
   <Constant name="rMapHEsci2" value="[rMaxHEsci2]*[hgcal:factor]"/>
 </ConstantsSection> 
@@ -15,7 +15,7 @@
 <SolidSection label="hgcalHEsci.xml" >
  <Polyhedra name="HGCalHEScintillator" numSide="1" startPhi="350*deg" deltaPhi="20*deg">
   <ZSection z="[ZminHEsci]"     rMin="[rMinHEsci1]"       rMax="[rMapHEsci1]"/>
-  <ZSection z="[hgcal:zHGCal4]" rMin="[hgcal:rMinHGCal4]" rMax="[hgcal:rMapHGCal4]"/>
+  <ZSection z="[hgcal:zHGCal3]" rMin="[hgcal:rMinHGCal3]" rMax="[hgcal:rMapHGCal3]"/>
   <ZSection z="[ZmaxHEsci]"     rMin="[rMinHEsci2]"       rMax="[rMapHEsci2]"/>
  </Polyhedra>
 </SolidSection>
@@ -59,19 +59,47 @@
    0, 2, 1, 0, 2, 1, 0, 2, 1, 0, 2, 1, 0, 2, 1, 0, 2, 1, 0, 2, 1, 0, 2, 1,
    0, 2, 1, 0, 2, 1, 0, 2, 1, 0, 2, 1, 0, 2, 1, 0, 2, 1 </Vector>
   <Vector name="HeightType" type="numeric" nEntries="66">
-   0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0,
-   0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0,
-   0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0 </Vector>
+   0, 1, 1, 0, 1, 1, 0, 1, 1, 0, 1, 1, 0, 1, 1, 0, 1, 1, 0, 1, 1, 0, 1, 1,
+   0, 1, 1, 0, 1, 1, 0, 1, 1, 0, 1, 1, 0, 1, 1, 0, 1, 1, 0, 1, 1, 0, 1, 1,
+   0, 1, 1, 0, 1, 1, 0, 1, 1, 0, 1, 1, 0, 1, 1, 0, 1, 1 </Vector>
   <Numeric name="ThickModule" value="43.5*mm"/>
   <Numeric name="Sectors"     value="18"/>
   <Numeric name="SlopeBottom" value="[etaMax:slope]"/>
-  <Vector name="SlopeTop" type="numeric" nEntries="3">
-    [hgcal:slope2], [hgcal:slope3], 0</Vector>
-  <Vector name="ZFront" type="numeric" nEntries="3">
-    [hgcal:zHGCal1], [hgcal:zHGCal3], [hgcal:zHGCal4]</Vector>
-  <Vector name="RMaxFront" type="numeric" nEntries="3">
-    [hgcal:rMaxHGCal1], [hgcal:rMaxHGCal3], [hgcal:rMaxHGCal4]</Vector>
+  <Vector name="SlopeTop" type="numeric" nEntries="4">
+    [hgcal:slope2], [hgcal:slope3], 0, 0</Vector>
+  <Vector name="ZFront" type="numeric" nEntries="4">
+    [hgcal:zHGCal1], [hgcal:zHGCal2], [hgcal:zHGCal3], [hgcal:zHGCal4]</Vector>
+  <Vector name="RMaxFront" type="numeric" nEntries="4">
+    [hgcal:rMaxHGCal1], [hgcal:rMaxHGCal2], [hgcal:rMaxHGCal3], [hgcal:rMaxHGCal4]</Vector>
  </Algorithm>
 </PosPartSection>
 
+<SpecParSection label="hgcalHEsci.xml">
+  <SpecPar name="HGCalHEScintillator readout granularity per layer">
+    <PartSelector path="//HGCalHEScintillator"/>
+    <Parameter name="Granularity" value="10*mm"/>
+    <Parameter name="Granularity" value="10*mm"/>
+    <Parameter name="Granularity" value="10*mm"/>
+    <Parameter name="Granularity" value="10*mm"/>
+    <Parameter name="Granularity" value="10*mm"/>
+    <Parameter name="Granularity" value="10*mm"/>
+    <Parameter name="Granularity" value="10*mm"/>
+    <Parameter name="Granularity" value="10*mm"/>
+    <Parameter name="Granularity" value="10*mm"/>
+    <Parameter name="Granularity" value="10*mm"/>
+    <Parameter name="Granularity" value="10*mm"/>
+    <Parameter name="Granularity" value="10*mm"/>
+    <Parameter name="Granularity" value="10*mm"/>
+    <Parameter name="Granularity" value="10*mm"/>
+    <Parameter name="Granularity" value="10*mm"/>
+    <Parameter name="Granularity" value="10*mm"/>
+    <Parameter name="Granularity" value="10*mm"/>
+    <Parameter name="Granularity" value="10*mm"/>
+    <Parameter name="Granularity" value="10*mm"/>
+    <Parameter name="Granularity" value="10*mm"/>
+    <Parameter name="Granularity" value="10*mm"/>
+    <Parameter name="Granularity" value="10*mm"/>
+  </SpecPar>
+</SpecParSection>
+
 </DDDefinition>
diff --git a/Geometry/HGCalCommonData/data/v1/hgcalHEsil.xml b/Geometry/HGCalCommonData/data/v1/hgcalHEsil.xml
index 0c02409ef0ee3..133c7776da464 100644
--- a/Geometry/HGCalCommonData/data/v1/hgcalHEsil.xml
+++ b/Geometry/HGCalCommonData/data/v1/hgcalHEsil.xml
@@ -4,14 +4,14 @@
 <ConstantsSection label="hgcalHEsil.xml" eval="true">
   <Constant name="ZmaxHEsil" value="4135*mm"/>
   <Constant name="rMinHEsil" value="[etaMax:slope]*[ZmaxHEsil]"/>
-  <Constant name="rMaxHEsil" value="([hgcal:rMaxHGCal3]+[hgcal:slope3]*([ZmaxHEsil]-[hgcal:zHGCal3]))"/>
+  <Constant name="rMaxHEsil" value="([hgcal:rMaxHGCal2]+[hgcal:slope3]*([ZmaxHEsil]-[hgcal:zHGCal2]))"/>
   <Constant name="rMapHEsil" value="[rMaxHEsil]*[hgcal:factor]"/>
 </ConstantsSection> 
 
 <SolidSection label="hgcalHEsil.xml">
  <Polyhedra name="HGCalHESilicon" numSide="1" startPhi="350*deg" deltaPhi="20*deg">
   <ZSection z="[hgcal:zMinHE]"  rMin="[hgcal:rMinHEMin]"  rMax="[hgcal:rMapHEMin]"/>
-  <ZSection z="[hgcal:zHGCal3]" rMin="[hgcal:rMinHGCal3]" rMax="[hgcal:rMapHGCal3]"/>
+  <ZSection z="[hgcal:zHGCal2]" rMin="[hgcal:rMinHGCal2]" rMax="[hgcal:rMapHGCal2]"/>
   <ZSection z="[ZmaxHEsil]"     rMin="[rMinHEsil]"        rMax="[rMapHEsil]"/>
  </Polyhedra>
 </SolidSection>
@@ -52,19 +52,37 @@
    0, 1, 2, 3, 4, 0, 1, 2, 3, 4, 0, 1, 2, 3, 4, 0, 1, 2, 3, 4, 0, 1, 2, 3, 4,
    0, 1, 2, 3, 4, 0, 1, 2, 3, 4 </Vector>
   <Vector name="HeightType" type="numeric" nEntries="60">
-   0, 0, 1, 1, 0, 0, 0, 1, 1, 0, 0, 0, 1, 1, 0, 0, 0, 1, 1, 0, 0, 0, 1, 1, 0,
-   0, 0, 1, 1, 0, 0, 0, 1, 1, 0, 0, 0, 1, 1, 0, 0, 0, 1, 1, 0, 0, 0, 1, 1, 0,
-   0, 0, 1, 1, 0, 0, 0, 1, 1, 0 </Vector>
+   0, 1, 1, 1, 1, 0, 1, 1, 1, 1, 0, 1, 1, 1, 1, 0, 1, 1, 1, 1, 0, 1, 1, 1, 1,
+   0, 1, 1, 1, 1, 0, 1, 1, 1, 1, 0, 1, 1, 1, 1, 0, 1, 1, 1, 1, 0, 1, 1, 1, 1,
+   0, 1, 1, 1, 1, 0, 1, 1, 1, 1 </Vector>
   <Numeric name="zMinBlock"   value="[hgcal:zMinHE]"/>
   <Numeric name="Sectors"     value="18"/>
   <Numeric name="SlopeBottom" value="[etaMax:slope]"/>
-  <Vector name="SlopeTop" type="numeric" nEntries="3">
-    [hgcal:slope2], [hgcal:slope3], 0</Vector>
-  <Vector name="ZFront" type="numeric" nEntries="3">
-    [hgcal:zHGCal1], [hgcal:zHGCal3], [hgcal:zHGCal4]</Vector>
-  <Vector name="RMaxFront" type="numeric" nEntries="3">
-    [hgcal:rMaxHGCal1], [hgcal:rMaxHGCal3], [hgcal:rMaxHGCal4]</Vector>
+  <Vector name="SlopeTop" type="numeric" nEntries="4">
+    [hgcal:slope2], [hgcal:slope3], 0, 0</Vector>
+  <Vector name="ZFront" type="numeric" nEntries="4">
+    [hgcal:zHGCal1], [hgcal:zHGCal2], [hgcal:zHGCal3], [hgcal:zHGCal4]</Vector>
+  <Vector name="RMaxFront" type="numeric" nEntries="4">
+    [hgcal:rMaxHGCal1], [hgcal:rMaxHGCal2], [hgcal:rMaxHGCal3], [hgcal:rMaxHGCal4]</Vector>
  </Algorithm>
 </PosPartSection>
 
+<SpecParSection label="hgcalHEsil.xml">
+  <SpecPar name="HGCalHESilicon readout granularity per layer">
+    <PartSelector path="//HGCalHESilicon"/>
+    <Parameter name="Granularity" value="2.5*mm"/>
+    <Parameter name="Granularity" value="2.5*mm"/>
+    <Parameter name="Granularity" value="2.5*mm"/>
+    <Parameter name="Granularity" value="2.5*mm"/>
+    <Parameter name="Granularity" value="2.5*mm"/>
+    <Parameter name="Granularity" value="2.5*mm"/>
+    <Parameter name="Granularity" value="2.5*mm"/>
+    <Parameter name="Granularity" value="2.5*mm"/>
+    <Parameter name="Granularity" value="2.5*mm"/>
+    <Parameter name="Granularity" value="2.5*mm"/>
+    <Parameter name="Granularity" value="2.5*mm"/>
+    <Parameter name="Granularity" value="2.5*mm"/>
+  </SpecPar>
+</SpecParSection>
+
 </DDDefinition>
diff --git a/Geometry/HGCalCommonData/data/v2/hgcal.xml b/Geometry/HGCalCommonData/data/v2/hgcal.xml
index db8f5fd7679a4..50855d0e16ae1 100644
--- a/Geometry/HGCalCommonData/data/v2/hgcal.xml
+++ b/Geometry/HGCalCommonData/data/v2/hgcal.xml
@@ -3,15 +3,17 @@
 
 <ConstantsSection label="hgcal.xml" eval="true">
   <Constant name="zHGCal1"    value="317.0*cm"/>
-  <Constant name="zHGCal3"    value="375.022*cm"/>
-  <Constant name="zHGCal4"    value="449.127*cm"/>
+  <Constant name="zHGCal2"    value="375.022*cm"/>
+  <Constant name="zHGCal3"    value="449.127*cm"/>
+  <Constant name="zHGCal4"    value="519.3*cm"/>
   <Constant name="zHGCal5"    value="554.1*cm"/>
   <Constant name="zMinEE"     value="3170.0*mm"/>
   <Constant name="zMaxEE"     value="3501.3*mm"/>
   <Constant name="zMinHE"     value="3501.3*mm"/>
   <Constant name="zMaxHE"     value="5541.0*mm"/>
   <Constant name="rMinHGCal1" value="[etaMax:slope]*[zHGCal1]"/>
-  <Constant name="rMinHGCal3" value="[etaMax:slope]*[zHGCal3]"/>    
+  <Constant name="rMinHGCal2" value="[etaMax:slope]*[zHGCal2]"/>    
+  <Constant name="rMinHGCal3" value="[etaMax:slope]*[zHGCal3]"/>
   <Constant name="rMinHGCal4" value="[etaMax:slope]*[zHGCal4]"/>
   <Constant name="rMinHGCal5" value="[etaMax:slope]*[zHGCal5]"/>
   <Constant name="rMinEEMin"  value="[etaMax:slope]*[zMinEE]"/>
@@ -19,30 +21,31 @@
   <Constant name="rMinHEMin"  value="[etaMax:slope]*[zMinHE]"/>
   <Constant name="rMinHEMax"  value="[etaMax:slope]*[zMaxHE]"/>
   <Constant name="rMaxHGCal1" value="159.0*cm"/>
-  <Constant name="rMaxHGCal3" value="177.5*cm"/>
-  <Constant name="slope2"     value="([rMaxHGCal3]-[rMaxHGCal1])/([zHGCal3]-[zHGCal1])"/>
-  <Constant name="slope3"     value="([rMaxHGCal4]-[rMaxHGCal3])/([zHGCal4]-[zHGCal3])"/>
-  <Constant name="rMaxHGCal4" value="273.76*cm"/>    
+  <Constant name="rMaxHGCal2" value="177.5*cm"/>
+  <Constant name="rMaxHGCal3" value="273.76*cm"/>    
+  <Constant name="rMaxHGCal4" value="245.9*cm"/>    
+  <Constant name="slope2"     value="([rMaxHGCal2]-[rMaxHGCal1])/([zHGCal2]-[zHGCal1])"/>
+  <Constant name="slope3"     value="([rMaxHGCal3]-[rMaxHGCal2])/([zHGCal3]-[zHGCal2])"/>
   <Constant name="rMaxEEMin"  value="([rMaxHGCal1]+[slope2]*([zMinEE]-[zHGCal1]))"/>
   <Constant name="rMaxEEMax"  value="([rMaxHGCal1]+[slope2]*([zMaxEE]-[zHGCal1]))"/>
   <Constant name="rMaxHEMin"  value="([rMaxHGCal1]+[slope2]*([zMinHE]-[zHGCal1]))"/>
-  <Constant name="rMaxHEMax"  value="[rMaxHGCal4]"/>
+  <Constant name="rMaxHEMax"  value="[rMaxHGCal3]"/>
   <Constant name="factor1"    value="cos(2.5*deg)"/>
   <Constant name="factor2"    value="cos(10*deg)"/>
   <Constant name="rMapEEMin"  value="[rMaxEEMin]*[factor1]"/>
   <Constant name="rMapEEMax"  value="[rMaxEEMax]*[factor1]"/>
   <Constant name="rMapHEMin"  value="[rMaxHEMin]*[factor1]"/>
-  <Constant name="rMapHGCal3" value="[rMaxHGCal3]*[factor1]"/>
-  <Constant name="rMapHGCal4" value="[rMaxHGCal4]*[factor2]"/>
+  <Constant name="rMapHGCal2" value="[rMaxHGCal2]*[factor1]"/>
+  <Constant name="rMapHGCal3" value="[rMaxHGCal3]*[factor2]"/>
   <Constant name="rMapHEMax"  value="[rMaxHEMax]*[factor2]"/>
 </ConstantsSection>
 
 <SolidSection label="hgcal.xml">
   <Polycone name="HGCal" startPhi="0*deg" deltaPhi="360*deg">
     <ZSection z="[zHGCal1]" rMin="[rMinHGCal1]" rMax="[rMaxHGCal1]"/>
+    <ZSection z="[zHGCal2]" rMin="[rMinHGCal2]" rMax="[rMaxHGCal2]"/>
     <ZSection z="[zHGCal3]" rMin="[rMinHGCal3]" rMax="[rMaxHGCal3]"/>
-    <ZSection z="[zHGCal4]" rMin="[rMinHGCal4]" rMax="[rMaxHGCal4]"/>
-    <ZSection z="[zHGCal5]" rMin="[rMinHGCal5]" rMax="[rMaxHGCal4]"/>
+    <ZSection z="[zHGCal5]" rMin="[rMinHGCal5]" rMax="[rMaxHGCal3]"/>
   </Polycone>
   <Polyhedra name="HGCalEE" numSide="72" startPhi="357.5*deg" deltaPhi="360*deg">
     <ZSection z="[zMinEE]" rMin="[rMinEEMin]" rMax="[rMapEEMin]"/>
@@ -50,9 +53,9 @@
   </Polyhedra>
   <Polycone name="HGCalHE" startPhi="0*deg" deltaPhi="360*deg">
     <ZSection z="[zMinHE]"  rMin="[rMinHEMin]"  rMax="[rMaxHEMin]"/>
+    <ZSection z="[zHGCal2]" rMin="[rMinHGCal2]" rMax="[rMaxHGCal2]"/>
     <ZSection z="[zHGCal3]" rMin="[rMinHGCal3]" rMax="[rMaxHGCal3]"/>
-    <ZSection z="[zHGCal4]" rMin="[rMinHGCal4]" rMax="[rMaxHGCal4]"/>
-    <ZSection z="[zMaxHE]"  rMin="[rMinHEMax]"  rMax="[rMaxHEMax]"/>
+    <ZSection z="[zHGCal5]" rMin="[rMinHGCal5]" rMax="[rMaxHGCal3]"/>
   </Polycone>
 </SolidSection>
 
diff --git a/Geometry/HGCalCommonData/data/v2/hgcalEE.xml b/Geometry/HGCalCommonData/data/v2/hgcalEE.xml
index fc34f8880482b..a075b1ce8f7a6 100644
--- a/Geometry/HGCalCommonData/data/v2/hgcalEE.xml
+++ b/Geometry/HGCalCommonData/data/v2/hgcalEE.xml
@@ -37,7 +37,7 @@
    EEAbsorber1, EEAbsorber2, EEAbsorber3, EEHeatShield, EESensitive, EEPCB, 
    EEAirGap</Vector>
   <Vector name="Thickness" type="numeric" nEntries="7">
-   1.6*mm, 3.3*mm, 5.6*mm, 3.0*mm, 0.1*mm, 1.0*mm, 1.0*mm</Vector>
+   1.6*mm, 3.3*mm, 5.6*mm, 3.0*mm, 0.1*mm, 2.0*mm, 2.0*mm</Vector>
   <String name="Rotation" value="rotations:YXZ4"/>
   <Vector name="LayerType" type="numeric" nEntries="216">
    3, 4, 4, 4, 5, 6,
@@ -53,28 +53,65 @@
    2, 3, 4, 4, 4, 5, 6, 2, 3, 4, 4, 4, 5, 6, 2, 3, 4, 4, 4, 5, 6
   </Vector>
   <Vector name="HeightType" type="numeric" nEntries="216">
-   0, 1, 1, 1, 1, 0,
-   0, 0, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 0,
-   0, 0, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 0,
-   0, 0, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 0,
-   0, 0, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 0,
-   0, 0, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 0,
-   0, 0, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 0,
-   0, 0, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 0,
-   0, 0, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 0,
-   0, 0, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 0,
-   0, 0, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 0
+   0, 1, 1, 1, 1, 1,
+   0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1,
+   0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1,
+   0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1,
+   0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1,
+   0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1,
+   0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1,
+   0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1,
+   0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1,
+   0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1,
+   0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1
   </Vector>
   <Numeric name="zMinBlock"   value="[hgcal:zMinEE]"/>
   <Numeric name="Sectors"     value="72"/>
   <Numeric name="SlopeBottom" value="[etaMax:slope]"/>
-  <Vector name="SlopeTop" type="numeric" nEntries="3">
-    [hgcal:slope2], [hgcal:slope3], 0</Vector>
-  <Vector name="ZFront" type="numeric" nEntries="3">
-    [hgcal:zHGCal1], [hgcal:zHGCal3], [hgcal:zHGCal4]</Vector>
-  <Vector name="RMaxFront" type="numeric" nEntries="3">
-    [hgcal:rMaxHGCal1], [hgcal:rMaxHGCal3], [hgcal:rMaxHGCal4]</Vector>
+  <Vector name="SlopeTop" type="numeric" nEntries="4">
+    [hgcal:slope2], [hgcal:slope3], 0, 0</Vector>
+  <Vector name="ZFront" type="numeric" nEntries="4">
+    [hgcal:zHGCal1], [hgcal:zHGCal2], [hgcal:zHGCal3], [hgcal:zHGCal4]</Vector>
+  <Vector name="RMaxFront" type="numeric" nEntries="4">
+    [hgcal:rMaxHGCal1], [hgcal:rMaxHGCal2], [hgcal:rMaxHGCal3], [hgcal:rMaxHGCal4]</Vector>
  </Algorithm>
 </PosPartSection> 
 
+<SpecParSection label="hgcalEE.xml">
+  <SpecPar name="HGCalEE readout granularity per layer">
+    <PartSelector path="//HGCalEEM"/>
+    <Parameter name="Granularity" value="2.5*mm"/>
+    <Parameter name="Granularity" value="2.5*mm"/>
+    <Parameter name="Granularity" value="2.5*mm"/>
+    <Parameter name="Granularity" value="2.5*mm"/>
+    <Parameter name="Granularity" value="2.5*mm"/>
+    <Parameter name="Granularity" value="2.5*mm"/>
+    <Parameter name="Granularity" value="2.5*mm"/>
+    <Parameter name="Granularity" value="2.5*mm"/>
+    <Parameter name="Granularity" value="2.5*mm"/>
+    <Parameter name="Granularity" value="2.5*mm"/>
+    <Parameter name="Granularity" value="2.5*mm"/>
+    <Parameter name="Granularity" value="2.5*mm"/>
+    <Parameter name="Granularity" value="2.5*mm"/>
+    <Parameter name="Granularity" value="2.5*mm"/>
+    <Parameter name="Granularity" value="2.5*mm"/>
+    <Parameter name="Granularity" value="2.5*mm"/>
+    <Parameter name="Granularity" value="2.5*mm"/>
+    <Parameter name="Granularity" value="2.5*mm"/>
+    <Parameter name="Granularity" value="2.5*mm"/>
+    <Parameter name="Granularity" value="2.5*mm"/>
+    <Parameter name="Granularity" value="2.5*mm"/>
+    <Parameter name="Granularity" value="2.5*mm"/>
+    <Parameter name="Granularity" value="2.5*mm"/>
+    <Parameter name="Granularity" value="2.5*mm"/>
+    <Parameter name="Granularity" value="2.5*mm"/>
+    <Parameter name="Granularity" value="2.5*mm"/>
+    <Parameter name="Granularity" value="2.5*mm"/>
+    <Parameter name="Granularity" value="2.5*mm"/>
+    <Parameter name="Granularity" value="2.5*mm"/>
+    <Parameter name="Granularity" value="2.5*mm"/>
+    <Parameter name="Granularity" value="2.5*mm"/>
+  </SpecPar>
+</SpecParSection>
+
 </DDDefinition>
diff --git a/Geometry/HGCalCommonData/data/v2/hgcalHEgem.xml b/Geometry/HGCalCommonData/data/v2/hgcalHEgem.xml
index e506ae9c38218..787a1c7970a5f 100644
--- a/Geometry/HGCalCommonData/data/v2/hgcalHEgem.xml
+++ b/Geometry/HGCalCommonData/data/v2/hgcalHEgem.xml
@@ -2,16 +2,16 @@
 <DDDefinition xmlns="http://www.cern.ch/cms/DDL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.cern.ch/cms/DDL ../../../DetectorDescription/Schema/DDLSchema.xsd">
 
 <ConstantsSection label="hgcalHEgem.xml" eval="true">
-  <Constant name="ZminHEgem" value="5193*mm"/>
+  <Constant name="ZminHEgem" value="[hgcal:zHGCal4]"/>
   <Constant name="rMinHEgem" value="[etaMax:slope]*[ZminHEgem]"/>
-  <Constant name="rMaxHEgem" value="([hgcal:rMaxHGCal4])"/>
+  <Constant name="rMaxHEgem" value="[hgcal:rMaxHGCal4]"/>
   <Constant name="rMapHEgem" value="[rMaxHEgem]*[hgcal:factor2]"/>
 </ConstantsSection> 
 
 <SolidSection label="hgcalHEgem.xml" >
  <Polyhedra name="HGCalHEGem" numSide="1" startPhi="350*deg" deltaPhi="20*deg">
   <ZSection z="[ZminHEgem]"     rMin="[rMinHEgem]"        rMax="[rMapHEgem]"/>
-  <ZSection z="[hgcal:zMaxHE]"  rMin="[hgcal:rMinHEMax]"  rMax="[hgcal:rMapHEMax]"/>
+  <ZSection z="[hgcal:zMaxHE]"  rMin="[hgcal:rMinHEMax]"  rMax="[rMapHEgem]"/>
  </Polyhedra>
 </SolidSection>
 
@@ -22,7 +22,6 @@
  </LogicalPart>
 </LogicalPartSection>
 
-
 <PosPartSection label="hgcalHEgem.xml">
  <Algorithm name="global:DDAngular">
   <rParent name="hgcal:HGCalHE"/>
@@ -60,19 +59,33 @@
    0, 2, 3, 4, 5, 6, 1, 0, 2, 3, 4, 5, 6, 1, 0, 2, 3, 4, 5, 6, 1,
    0, 2, 3, 4, 5, 6, 1, 0, 2, 3, 4, 5, 6, 1 </Vector>
   <Vector name="HeightType" type="numeric" nEntries="56">
-   0, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 0,
-   0, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 0,
-   0, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 0 </Vector>
+   0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1,
+   0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1,
+   0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1 </Vector>
   <Numeric name="ThickModule" value="43.5*mm"/>
   <Numeric name="Sectors"     value="18"/>
   <Numeric name="SlopeBottom" value="[etaMax:slope]"/>
-  <Vector name="SlopeTop" type="numeric" nEntries="3">
-    [hgcal:slope2], [hgcal:slope3], 0</Vector>
-  <Vector name="ZFront" type="numeric" nEntries="3">
-    [hgcal:zHGCal1], [hgcal:zHGCal3], [hgcal:zHGCal4]</Vector>
-  <Vector name="RMaxFront" type="numeric" nEntries="3">
-    [hgcal:rMaxHGCal1], [hgcal:rMaxHGCal3], [hgcal:rMaxHGCal4]</Vector>
+  <Vector name="SlopeTop" type="numeric" nEntries="4">
+    [hgcal:slope2], [hgcal:slope3], 0, 0</Vector>
+  <Vector name="ZFront" type="numeric" nEntries="4">
+    [hgcal:zHGCal1], [hgcal:zHGCal2], [hgcal:zHGCal3], [hgcal:zHGCal4]</Vector>
+  <Vector name="RMaxFront" type="numeric" nEntries="4">
+    [hgcal:rMaxHGCal1], [hgcal:rMaxHGCal2], [hgcal:rMaxHGCal3], [hgcal:rMaxHGCal4]</Vector>
  </Algorithm>
 </PosPartSection>
 
+<SpecParSection label="hgcalHEgem.xml">
+  <SpecPar name="HGCalHEGem readout granularity per layer">
+    <PartSelector path="//HGCalHEGem"/>
+    <Parameter name="Granularity" value="10*mm"/>
+    <Parameter name="Granularity" value="10*mm"/>
+    <Parameter name="Granularity" value="10*mm"/>
+    <Parameter name="Granularity" value="10*mm"/>
+    <Parameter name="Granularity" value="10*mm"/>
+    <Parameter name="Granularity" value="10*mm"/>
+    <Parameter name="Granularity" value="10*mm"/>
+    <Parameter name="Granularity" value="10*mm"/>
+  </SpecPar>
+</SpecParSection>
+
 </DDDefinition>
diff --git a/Geometry/HGCalCommonData/data/v2/hgcalHEsci.xml b/Geometry/HGCalCommonData/data/v2/hgcalHEsci.xml
index 4678aece71597..f509d7dc6273f 100644
--- a/Geometry/HGCalCommonData/data/v2/hgcalHEsci.xml
+++ b/Geometry/HGCalCommonData/data/v2/hgcalHEsci.xml
@@ -6,8 +6,8 @@
   <Constant name="ZmaxHEsci"  value="5193.0*mm"/>
   <Constant name="rMinHEsci1" value="[etaMax:slope]*[ZminHEsci]"/>
   <Constant name="rMinHEsci2" value="[etaMax:slope]*[ZmaxHEsci]"/>
-  <Constant name="rMaxHEsci1" value="([hgcal:rMaxHGCal3]+[hgcal:slope3]*([ZminHEsci]-[hgcal:zHGCal3]))"/>
-  <Constant name="rMaxHEsci2" value="([hgcal:rMaxHGCal4])"/>
+  <Constant name="rMaxHEsci1" value="([hgcal:rMaxHGCal2]+[hgcal:slope3]*([ZminHEsci]-[hgcal:zHGCal2]))"/>
+  <Constant name="rMaxHEsci2" value="([hgcal:rMaxHGCal3])"/>
   <Constant name="rMapHEsci1" value="[rMaxHEsci1]*[hgcal:factor2]"/>
   <Constant name="rMapHEsci2" value="[rMaxHEsci2]*[hgcal:factor2]"/>
 </ConstantsSection> 
@@ -15,7 +15,7 @@
 <SolidSection label="hgcalHEsci.xml" >
  <Polyhedra name="HGCalHEScintillator" numSide="1" startPhi="350*deg" deltaPhi="20*deg">
   <ZSection z="[ZminHEsci]"     rMin="[rMinHEsci1]"       rMax="[rMapHEsci1]"/>
-  <ZSection z="[hgcal:zHGCal4]" rMin="[hgcal:rMinHGCal4]" rMax="[hgcal:rMapHGCal4]"/>
+  <ZSection z="[hgcal:zHGCal3]" rMin="[hgcal:rMinHGCal3]" rMax="[hgcal:rMapHGCal3]"/>
   <ZSection z="[ZmaxHEsci]"     rMin="[rMinHEsci2]"       rMax="[rMapHEsci2]"/>
  </Polyhedra>
 </SolidSection>
@@ -59,19 +59,43 @@
    0, 2, 1, 0, 2, 1, 0, 2, 1, 0, 2, 1, 0, 2, 1, 0, 2, 1, 0, 2, 1, 0, 2, 1,
    0, 2, 1, 0, 2, 1 </Vector>
   <Vector name="HeightType" type="numeric" nEntries="54">
-   0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0,
-   0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0,
-   0, 1, 0, 0, 1, 0 </Vector>
+   0, 1, 1, 0, 1, 1, 0, 1, 1, 0, 1, 1, 0, 1, 1, 0, 1, 1, 0, 1, 1, 0, 1, 1,
+   0, 1, 1, 0, 1, 1, 0, 1, 1, 0, 1, 1, 0, 1, 1, 0, 1, 1, 0, 1, 1, 0, 1, 1,
+   0, 1, 1, 0, 1, 1 </Vector>
   <Numeric name="ThickModule" value="43.5*mm"/>
   <Numeric name="Sectors"     value="18"/>
   <Numeric name="SlopeBottom" value="[etaMax:slope]"/>
-  <Vector name="SlopeTop" type="numeric" nEntries="3">
-    [hgcal:slope2], [hgcal:slope3], 0</Vector>
-  <Vector name="ZFront" type="numeric" nEntries="3">
-    [hgcal:zHGCal1], [hgcal:zHGCal3], [hgcal:zHGCal4]</Vector>
-  <Vector name="RMaxFront" type="numeric" nEntries="3">
-    [hgcal:rMaxHGCal1], [hgcal:rMaxHGCal3], [hgcal:rMaxHGCal4]</Vector>
+  <Vector name="SlopeTop" type="numeric" nEntries="4">
+    [hgcal:slope2], [hgcal:slope3], 0, 0</Vector>
+  <Vector name="ZFront" type="numeric" nEntries="4">
+    [hgcal:zHGCal1], [hgcal:zHGCal2], [hgcal:zHGCal3], [hgcal:zHGCal4]</Vector>
+  <Vector name="RMaxFront" type="numeric" nEntries="4">
+    [hgcal:rMaxHGCal1], [hgcal:rMaxHGCal2], [hgcal:rMaxHGCal3], [hgcal:rMaxHGCal4]</Vector>
  </Algorithm>
 </PosPartSection>
 
+<SpecParSection label="hgcalHEsci.xml">
+  <SpecPar name="HGCalHEScintillator readout granularity per layer">
+    <PartSelector path="//HGCalHEScintillator"/>
+    <Parameter name="Granularity" value="10*mm"/>
+    <Parameter name="Granularity" value="10*mm"/>
+    <Parameter name="Granularity" value="10*mm"/>
+    <Parameter name="Granularity" value="10*mm"/>
+    <Parameter name="Granularity" value="10*mm"/>
+    <Parameter name="Granularity" value="10*mm"/>
+    <Parameter name="Granularity" value="10*mm"/>
+    <Parameter name="Granularity" value="10*mm"/>
+    <Parameter name="Granularity" value="10*mm"/>
+    <Parameter name="Granularity" value="10*mm"/>
+    <Parameter name="Granularity" value="10*mm"/>
+    <Parameter name="Granularity" value="10*mm"/>
+    <Parameter name="Granularity" value="10*mm"/>
+    <Parameter name="Granularity" value="10*mm"/>
+    <Parameter name="Granularity" value="10*mm"/>
+    <Parameter name="Granularity" value="10*mm"/>
+    <Parameter name="Granularity" value="10*mm"/>
+    <Parameter name="Granularity" value="10*mm"/>
+  </SpecPar>
+</SpecParSection>
+
 </DDDefinition>
diff --git a/Geometry/HGCalCommonData/data/v2/hgcalHEsil.xml b/Geometry/HGCalCommonData/data/v2/hgcalHEsil.xml
index 840854c72ccf7..3bb9468ce8b7f 100644
--- a/Geometry/HGCalCommonData/data/v2/hgcalHEsil.xml
+++ b/Geometry/HGCalCommonData/data/v2/hgcalHEsil.xml
@@ -4,14 +4,14 @@
 <ConstantsSection label="hgcalHEsil.xml" eval="true">
   <Constant name="ZmaxHEsil" value="4262.9*mm"/>
   <Constant name="rMinHEsil" value="[etaMax:slope]*[ZmaxHEsil]"/>
-  <Constant name="rMaxHEsil" value="([hgcal:rMaxHGCal3]+[hgcal:slope3]*([ZmaxHEsil]-[hgcal:zHGCal3]))"/>
+  <Constant name="rMaxHEsil" value="([hgcal:rMaxHGCal2]+[hgcal:slope3]*([ZmaxHEsil]-[hgcal:zHGCal2]))"/>
   <Constant name="rMapHEsil" value="[rMaxHEsil]*[hgcal:factor1]"/>
 </ConstantsSection> 
 
 <SolidSection label="hgcalHEsil.xml">
  <Polyhedra name="HGCalHESilicon" numSide="1" startPhi="357.5*deg" deltaPhi="5*deg">
   <ZSection z="[hgcal:zMinHE]"  rMin="[hgcal:rMinHEMin]"  rMax="[hgcal:rMapHEMin]"/>
-  <ZSection z="[hgcal:zHGCal3]" rMin="[hgcal:rMinHGCal3]" rMax="[hgcal:rMapHGCal3]"/>
+  <ZSection z="[hgcal:zHGCal2]" rMin="[hgcal:rMinHGCal2]" rMax="[hgcal:rMapHGCal2]"/>
   <ZSection z="[ZmaxHEsil]"     rMin="[rMinHEsil]"        rMax="[rMapHEsil]"/>
  </Polyhedra>
 </SolidSection>
@@ -45,7 +45,7 @@
    HESiliconAbsorber, HESiliconHeatShield, HESiliconSensitive, HESiliconPCB,
    HESiliconAirGap, HESiliconSupport</Vector>
   <Vector name="Thickness" type="numeric" nEntries="6">
-   52.0*mm, 3.0*mm, 0.2*mm, 1.0*mm, 1.0*mm, 50*mm</Vector>
+   52.0*mm, 3.0*mm, 0.1*mm, 2.0*mm, 2.0*mm, 50*mm</Vector>
   <String name="Rotation" value="rotations:YXZ4"/>
   <Vector name="LayerType" type="numeric" nEntries="85"> 5,
    0, 1, 2, 2, 2, 3, 4, 0, 1, 2, 2, 2, 3, 4, 0, 1, 2, 2, 2, 3, 4, 
@@ -53,20 +53,44 @@
    0, 1, 2, 2, 2, 3, 4, 0, 1, 2, 2, 2, 3, 4, 0, 1, 2, 2, 2, 3, 4, 
    0, 1, 2, 2, 2, 3, 4, 0, 1, 2, 2, 2, 3, 4, 0, 1, 2, 2, 2, 3, 4 </Vector>
   <Vector name="HeightType" type="numeric" nEntries="85"> 0,
-   0, 0, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 0,
-   0, 0, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 0,
-   0, 0, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 0,
-   0, 0, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 0 </Vector>
+   0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1,
+   0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1,
+   0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1,
+   0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1 </Vector>
   <Numeric name="zMinBlock"   value="[hgcal:zMinHE]"/>
   <Numeric name="Sectors"     value="72"/>
   <Numeric name="SlopeBottom" value="[etaMax:slope]"/>
-  <Vector name="SlopeTop" type="numeric" nEntries="3">
-    [hgcal:slope2], [hgcal:slope3], 0</Vector>
-  <Vector name="ZFront" type="numeric" nEntries="3">
-    [hgcal:zHGCal1], [hgcal:zHGCal3], [hgcal:zHGCal4]</Vector>
-  <Vector name="RMaxFront" type="numeric" nEntries="3">
-    [hgcal:rMaxHGCal1], [hgcal:rMaxHGCal3], [hgcal:rMaxHGCal4]</Vector>
+  <Vector name="SlopeTop" type="numeric" nEntries="4">
+    [hgcal:slope2], [hgcal:slope3], 0, 0</Vector>
+  <Vector name="ZFront" type="numeric" nEntries="4">
+    [hgcal:zHGCal1], [hgcal:zHGCal2], [hgcal:zHGCal3], [hgcal:zHGCal4]</Vector>
+  <Vector name="RMaxFront" type="numeric" nEntries="4">
+    [hgcal:rMaxHGCal1], [hgcal:rMaxHGCal2], [hgcal:rMaxHGCal3], [hgcal:rMaxHGCal4]</Vector>
+  <Vector name="SlopeTop" type="numeric" nEntries="4">
+    [hgcal:slope2], [hgcal:slope3], 0, 0</Vector>
+  <Vector name="ZFront" type="numeric" nEntries="4">
+    [hgcal:zHGCal1], [hgcal:zHGCal2], [hgcal:zHGCal3], [hgcal:zHGCal4]</Vector>
+  <Vector name="RMaxFront" type="numeric" nEntries="4">
+    [hgcal:rMaxHGCal1], [hgcal:rMaxHGCal2], [hgcal:rMaxHGCal3], [hgcal:rMaxHGCal4]</Vector>
  </Algorithm>
 </PosPartSection>
 
+<SpecParSection label="hgcalHEsil.xml">
+  <SpecPar name="HGCalHESilicon readout granularity per layer">
+    <PartSelector path="//HGCalHESilicon"/>
+    <Parameter name="Granularity" value="2.5*mm"/>
+    <Parameter name="Granularity" value="2.5*mm"/>
+    <Parameter name="Granularity" value="2.5*mm"/>
+    <Parameter name="Granularity" value="2.5*mm"/>
+    <Parameter name="Granularity" value="2.5*mm"/>
+    <Parameter name="Granularity" value="2.5*mm"/>
+    <Parameter name="Granularity" value="2.5*mm"/>
+    <Parameter name="Granularity" value="2.5*mm"/>
+    <Parameter name="Granularity" value="2.5*mm"/>
+    <Parameter name="Granularity" value="2.5*mm"/>
+    <Parameter name="Granularity" value="2.5*mm"/>
+    <Parameter name="Granularity" value="2.5*mm"/>
+  </SpecPar>
+</SpecParSection>
+
 </DDDefinition>
diff --git a/Geometry/HGCalCommonData/data/v3/hgcal.xml b/Geometry/HGCalCommonData/data/v3/hgcal.xml
new file mode 100644
index 0000000000000..59d4e96e3c476
--- /dev/null
+++ b/Geometry/HGCalCommonData/data/v3/hgcal.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0"?>
+<DDDefinition xmlns="http://www.cern.ch/cms/DDL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.cern.ch/cms/DDL ../../../../DetectorDescription/Schema/DDLSchema.xsd">
+
+<ConstantsSection label="hgcal.xml" eval="true">
+  <Constant name="zHGCal1"    value="317.0*cm"/>
+  <Constant name="zHGCal2"    value="390.71*cm"/>
+  <Constant name="zHGCal3"    value="449.7*cm"/>
+  <Constant name="zHGCal4"    value="523.65*cm"/>
+  <Constant name="zMinEE"     value="3170.0*mm"/>
+  <Constant name="zMaxEE"     value="3501.3*mm"/>
+  <Constant name="zMinHE"     value="3501.3*mm"/>
+  <Constant name="zMaxHE"     value="5236.5*mm"/>
+  <Constant name="rMinHGCal1" value="[etaMax:slope]*[zHGCal1]"/>
+  <Constant name="rMinHGCal2" value="[etaMax:slope]*[zHGCal2]"/>    
+  <Constant name="rMinHGCal3" value="[etaMax:slope]*[zHGCal3]"/>
+  <Constant name="rMinHGCal4" value="[etaMax:slope]*[zHGCal4]"/>
+  <Constant name="rMinEEMin"  value="[etaMax:slope]*[zMinEE]"/>
+  <Constant name="rMinEEMax"  value="[etaMax:slope]*[zMaxEE]"/>
+  <Constant name="rMinHEMin"  value="[etaMax:slope]*[zMinHE]"/>
+  <Constant name="rMinHEMax"  value="[etaMax:slope]*[zMaxHE]"/>
+  <Constant name="thetaMax2"  value="25.672*deg"/>
+  <Constant name="thetaMax3"  value="53.0*deg"/>
+  <Constant name="rMaxHGCal1" value="152.371*cm"/>
+  <Constant name="rMaxHGCal2" value="187.801*cm"/>
+  <Constant name="rMaxHGCal3" value="266.083*cm"/>
+  <Constant name="rMaxHGCal4" value="[rMaxHGCal3]"/>
+  <Constant name="slope2"     value="([rMaxHGCal2]-[rMaxHGCal1])/([zHGCal2]-[zHGCal1])"/>
+  <Constant name="slope3"     value="([rMaxHGCal3]-[rMaxHGCal2])/([zHGCal3]-[zHGCal2])"/>
+  <Constant name="rMaxEEMin"  value="([rMaxHGCal1]+[slope2]*([zMinEE]-[zHGCal1]))"/>
+  <Constant name="rMaxEEMax"  value="([rMaxHGCal1]+[slope2]*([zMaxEE]-[zHGCal1]))"/>
+  <Constant name="rMaxHEMin"  value="([rMaxHGCal1]+[slope2]*([zMinHE]-[zHGCal1]))"/>
+  <Constant name="rMaxHEMax"  value="[rMaxHGCal3]"/>
+  <Constant name="factor1"    value="cos(2.5*deg)"/>
+  <Constant name="factor2"    value="cos(10*deg)"/>
+  <Constant name="rMapEEMin"  value="[rMaxEEMin]*[factor1]"/>
+  <Constant name="rMapEEMax"  value="[rMaxEEMax]*[factor1]"/>
+  <Constant name="rMapHEMin"  value="[rMaxHEMin]*[factor1]"/>
+  <Constant name="rMapHGCal2" value="[rMaxHGCal2]*[factor1]"/>
+  <Constant name="rMapHGCal3" value="[rMaxHGCal3]*[factor2]"/>
+  <Constant name="rMapHEMax"  value="[rMaxHEMax]*[factor2]"/>
+</ConstantsSection>
+
+<SolidSection label="hgcal.xml">
+  <Polycone name="HGCal" startPhi="0*deg" deltaPhi="360*deg">
+    <ZSection z="[zHGCal1]" rMin="[rMinHGCal1]" rMax="[rMaxHGCal1]"/>
+    <ZSection z="[zHGCal2]" rMin="[rMinHGCal2]" rMax="[rMaxHGCal2]"/>
+    <ZSection z="[zHGCal3]" rMin="[rMinHGCal3]" rMax="[rMaxHGCal3]"/>
+    <ZSection z="[zHGCal4]" rMin="[rMinHGCal4]" rMax="[rMaxHGCal3]"/>
+  </Polycone>
+  <Polyhedra name="HGCalEE" numSide="72" startPhi="357.5*deg" deltaPhi="360*deg">
+    <ZSection z="[zMinEE]" rMin="[rMinEEMin]" rMax="[rMapEEMin]"/>
+    <ZSection z="[zMaxEE]" rMin="[rMinEEMax]" rMax="[rMapEEMax]"/>
+  </Polyhedra>
+  <Polycone name="HGCalHE" startPhi="0*deg" deltaPhi="360*deg">
+    <ZSection z="[zMinHE]"  rMin="[rMinHEMin]"  rMax="[rMaxHEMin]"/>
+    <ZSection z="[zHGCal2]" rMin="[rMinHGCal2]" rMax="[rMaxHGCal2]"/>
+    <ZSection z="[zHGCal3]" rMin="[rMinHGCal3]" rMax="[rMaxHGCal3]"/>
+    <ZSection z="[zMaxHE]"  rMin="[rMinHEMax]"  rMax="[rMaxHEMax]"/>
+  </Polycone>
+</SolidSection>
+
+<LogicalPartSection label="hgcal.xml">
+  <LogicalPart name="HGCal" category="unspecified">
+    <rSolid name="HGCal"/>
+    <rMaterial name="materials:Air"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalEE" category="unspecified">
+    <rSolid name="HGCalEE"/>
+    <rMaterial name="materials:Air"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalHE" category="unspecified">
+    <rSolid name="HGCalHE"/>
+    <rMaterial name="materials:Air"/>
+  </LogicalPart>
+</LogicalPartSection>
+
+<PosPartSection label="hgcal.xml">
+  <PosPart copyNumber="1">
+    <rParent name="caloBase:CALO"/>
+    <rChild name="HGCal"/>
+    <rRotation name="rotations:000D"/>
+  </PosPart>
+  <PosPart copyNumber="2">
+    <rParent name="caloBase:CALO"/>
+    <rChild name="HGCal"/>
+    <rRotation name="rotations:180D"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="HGCal"/>
+    <rChild name="HGCalEE"/>
+    <rRotation name="rotations:000D"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="HGCal"/>
+    <rChild name="HGCalHE"/>
+    <rRotation name="rotations:000D"/>
+  </PosPart>
+</PosPartSection>
+</DDDefinition>
diff --git a/Geometry/HGCalCommonData/data/v3/hgcalHEsci.xml b/Geometry/HGCalCommonData/data/v3/hgcalHEsci.xml
new file mode 100644
index 0000000000000..2e5b7c00fb17b
--- /dev/null
+++ b/Geometry/HGCalCommonData/data/v3/hgcalHEsci.xml
@@ -0,0 +1,103 @@
+<?xml version="1.0"?>
+<DDDefinition xmlns="http://www.cern.ch/cms/DDL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.cern.ch/cms/DDL ../../../DetectorDescription/Schema/DDLSchema.xsd">
+
+<ConstantsSection label="hgcalHEsci.xml" eval="true">
+  <Constant name="ZminHEsci"  value="4366.5*mm"/>
+  <Constant name="ZmaxHEsci"  value="5236.5*mm"/>
+  <Constant name="rMinHEsci1" value="[etaMax:slope]*[ZminHEsci]"/>
+  <Constant name="rMinHEsci2" value="[etaMax:slope]*[ZmaxHEsci]"/>
+  <Constant name="rMaxHEsci1" value="([hgcal:rMaxHGCal2]+[hgcal:slope3]*([ZminHEsci]-[hgcal:zHGCal2]))"/>
+  <Constant name="rMaxHEsci2" value="([hgcal:rMaxHGCal3])"/>
+  <Constant name="rMapHEsci1" value="[rMaxHEsci1]*[hgcal:factor2]"/>
+  <Constant name="rMapHEsci2" value="[rMaxHEsci2]*[hgcal:factor2]"/>
+</ConstantsSection> 
+
+<SolidSection label="hgcalHEsci.xml" >
+ <Polyhedra name="HGCalHEScintillator" numSide="1" startPhi="350*deg" deltaPhi="20*deg">
+  <ZSection z="[ZminHEsci]"     rMin="[rMinHEsci1]"       rMax="[rMapHEsci1]"/>
+  <ZSection z="[hgcal:zHGCal3]" rMin="[hgcal:rMinHGCal3]" rMax="[hgcal:rMapHGCal3]"/>
+  <ZSection z="[ZmaxHEsci]"     rMin="[rMinHEsci2]"       rMax="[rMapHEsci2]"/>
+ </Polyhedra>
+</SolidSection>
+
+<LogicalPartSection label="hgcalHEsci.xml">
+ <LogicalPart name="HGCalHEScintillator" category="unspecified">
+  <rSolid name="HGCalHEScintillator"/>
+  <rMaterial name="materials:Air"/>
+ </LogicalPart>
+</LogicalPartSection>
+
+<PosPartSection label="hgcalHEsci.xml">
+ <Algorithm name="global:DDAngular">
+  <rParent name="hgcal:HGCalHE"/>
+  <String name="ChildName"    value="HGCalHEScintillator"/>
+  <Numeric name="StartCopyNo" value="1"/>
+  <Numeric name="IncrCopyNo"  value="1"/>
+  <Numeric name="N"           value="18"/>
+  <Numeric name="StartAngle"  value="0*deg"/>
+  <Numeric name="RangeAngle"  value="360*deg"/>
+  <Numeric name="Radius"      value="0*m"/>
+  <Vector name="RotateSolid" type="numeric" nEntries="3">
+   0*deg, 0*deg, 0*deg </Vector>
+ </Algorithm>
+  <Algorithm name="hgcal:DDHGCalHEAlgo">
+  <rParent name="hgcalHEsci:HGCalHEScintillator"/>
+  <Vector name="MaterialNames" type="string" nEntries="3">
+   materials:H_Brass, materials:H_Brass, materials:Scintillator</Vector>
+  <Vector name="VolumeNames" type="string" nEntries="3">
+   HEScintillatorAbsorber, HEScintillatorShield, 
+   HEScintillatorSensitive</Vector>
+  <Vector name="Type" type="numeric" nEntries="3">0, 1, -1</Vector>
+  <Vector name="Thickness" type="numeric" nEntries="3">
+   34.5*mm, 9.0*mm, 9.0*mm </Vector>
+  <Vector name="ZMinType" type="numeric" nEntries="3">
+   4366.5*mm, 4401.0*mm, 4401.0*mm</Vector>
+  <Vector name="Offsets" type="numeric" nEntries="3"> 1, 1, 1</Vector>
+  <String name="Rotation"     value="rotations:YXZ4"/>
+  <Vector name="LayerType" type="numeric" nEntries="60">
+   0, 2, 1, 0, 2, 1, 0, 2, 1, 0, 2, 1, 0, 2, 1, 0, 2, 1, 0, 2, 1, 0, 2, 1,
+   0, 2, 1, 0, 2, 1, 0, 2, 1, 0, 2, 1, 0, 2, 1, 0, 2, 1, 0, 2, 1, 0, 2, 1,
+   0, 2, 1, 0, 2, 1, 0, 2, 1, 0, 2, 1 </Vector>
+  <Vector name="HeightType" type="numeric" nEntries="60">
+   0, 1, 1, 0, 1, 1, 0, 1, 1, 0, 1, 1, 0, 1, 1, 0, 1, 1, 0, 1, 1, 0, 1, 1,
+   0, 1, 1, 0, 1, 1, 0, 1, 1, 0, 1, 1, 0, 1, 1, 0, 1, 1, 0, 1, 1, 0, 1, 1,
+   0, 1, 1, 0, 1, 1, 0, 1, 1, 0, 1, 1 </Vector>
+  <Numeric name="ThickModule" value="43.5*mm"/>
+  <Numeric name="Sectors"     value="18"/>
+  <Numeric name="SlopeBottom" value="[etaMax:slope]"/>
+  <Vector name="SlopeTop" type="numeric" nEntries="4">
+    [hgcal:slope2], [hgcal:slope3], 0, 0</Vector>
+  <Vector name="ZFront" type="numeric" nEntries="4">
+    [hgcal:zHGCal1], [hgcal:zHGCal2], [hgcal:zHGCal3], [hgcal:zHGCal4]</Vector>
+  <Vector name="RMaxFront" type="numeric" nEntries="4">
+    [hgcal:rMaxHGCal1], [hgcal:rMaxHGCal2], [hgcal:rMaxHGCal3], [hgcal:rMaxHGCal4]</Vector>
+ </Algorithm>
+</PosPartSection>
+
+<SpecParSection label="hgcalHEsci.xml">
+  <SpecPar name="HGCalHEScintillator readout granularity per layer">
+    <PartSelector path="//HGCalHEScintillator"/>
+    <Parameter name="Granularity" value="10*mm"/>
+    <Parameter name="Granularity" value="10*mm"/>
+    <Parameter name="Granularity" value="10*mm"/>
+    <Parameter name="Granularity" value="10*mm"/>
+    <Parameter name="Granularity" value="10*mm"/>
+    <Parameter name="Granularity" value="10*mm"/>
+    <Parameter name="Granularity" value="10*mm"/>
+    <Parameter name="Granularity" value="10*mm"/>
+    <Parameter name="Granularity" value="10*mm"/>
+    <Parameter name="Granularity" value="10*mm"/>
+    <Parameter name="Granularity" value="10*mm"/>
+    <Parameter name="Granularity" value="10*mm"/>
+    <Parameter name="Granularity" value="10*mm"/>
+    <Parameter name="Granularity" value="10*mm"/>
+    <Parameter name="Granularity" value="10*mm"/>
+    <Parameter name="Granularity" value="10*mm"/>
+    <Parameter name="Granularity" value="10*mm"/>
+    <Parameter name="Granularity" value="10*mm"/>
+    <Parameter name="Granularity" value="10*mm"/>
+    <Parameter name="Granularity" value="10*mm"/>
+  </SpecPar>
+</SpecParSection>
+
+</DDDefinition>
diff --git a/Geometry/HGCalCommonData/plugins/DDHGCalEEAlgo.cc b/Geometry/HGCalCommonData/plugins/DDHGCalEEAlgo.cc
index 44a3cc0aa27dd..0d7a2bb52e1cb 100644
--- a/Geometry/HGCalCommonData/plugins/DDHGCalEEAlgo.cc
+++ b/Geometry/HGCalCommonData/plugins/DDHGCalEEAlgo.cc
@@ -102,7 +102,7 @@ void DDHGCalEEAlgo::constructLayers(DDLogicalPart module, DDCompactView& cpv) {
     double  rinB   = zo * slopeB;
     double  routF  = (heightType[i] == 0) ? rMax(zi) : rMax(zz);
     double  routB  = rMax(zo);
-    if (heightType[i] == 0) zz = zo;
+    if (heightType[i] == 0) zz = zi;
     std::string name = "HGCal"+names[ii]+dbl_to_string(copy);
     edm::LogInfo("HGCalGeom") << "DDHGCalEEAlgo test: Layer " << i << ":" 
 			      << ii << " Front " << zi << ", " << rinF << ", " 
diff --git a/Geometry/HGCalCommonData/plugins/DDHGCalHEAlgo.cc b/Geometry/HGCalCommonData/plugins/DDHGCalHEAlgo.cc
index 1a577d3f3db62..b163b28605d25 100644
--- a/Geometry/HGCalCommonData/plugins/DDHGCalHEAlgo.cc
+++ b/Geometry/HGCalCommonData/plugins/DDHGCalHEAlgo.cc
@@ -106,7 +106,7 @@ void DDHGCalHEAlgo::constructLayers(DDLogicalPart module, DDCompactView& cpv) {
     double rinB    = zo * slopeB;
     double routF   = (heightType[i] == 0) ? rMax(zi) : rMax(zz);
     double routB   = rMax(zo);
-    if (heightType[i] == 0) zz = zo;
+    if (heightType[i] == 0) zz = zi;
     std::string name = "HGCal"+names[ii]+dbl_to_string(copy);
     edm::LogInfo("HGCalGeom") << "DDHGCalEEAlgo test: Layer " << i << ":" 
 			      << ii << ":" << ityp << " Front " << zi << ", " 

From e86ad6b6b05b786646346bb7f81bab141a041d35 Mon Sep 17 00:00:00 2001
From: Sunanda <sunanda.banerjee@cern.ch>
Date: Fri, 21 Feb 2014 10:04:05 +0100
Subject: [PATCH 2/3] Update the 2023 HGC scenario

---
 .../python/cmsExtendedGeometry2023HGCalMuonXML_cfi.py  | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2023HGCalMuonXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2023HGCalMuonXML_cfi.py
index 9fd67b26d64c2..948f570ab6a6d 100644
--- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2023HGCalMuonXML_cfi.py
+++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2023HGCalMuonXML_cfi.py
@@ -61,9 +61,10 @@
         'Geometry/HcalCommonData/data/hcalouteralgo.xml',
         'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
         'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
-        'Geometry/HGCalCommonData/data/hgcal.xml',
-        'Geometry/HGCalCommonData/data/hgcalEE.xml',
-        'Geometry/HGCalCommonData/data/hgcalHE.xml',
+        'Geometry/HGCalCommonData/data/v3/hgcal.xml',
+        'Geometry/HGCalCommonData/data/v2/hgcalEE.xml',
+        'Geometry/HGCalCommonData/data/v2/hgcalHEsil.xml',
+        'Geometry/HGCalCommonData/data/v3/hgcalHEsci.xml',
         'Geometry/MuonCommonData/data/v1/mbCommon.xml',
         'Geometry/MuonCommonData/data/v1/mb1.xml',
         'Geometry/MuonCommonData/data/v1/mb2.xml',
@@ -105,6 +106,9 @@
         'Geometry/HcalSimData/data/hfpmt.xml',
         'Geometry/HcalSimData/data/hffibrebundle.xml',
         'Geometry/HcalSimData/data/CaloUtil.xml',
+        'Geometry/HGCalSimData/data/hgcsens.xml',
+        'Geometry/HGCalSimData/data/hgccons.xml',
+        'Geometry/HGCalSimData/data/hgcProdCuts.xml',
         'Geometry/MuonSimData/data/PhaseII/v2/muonSens.xml',
         'Geometry/DTGeometryBuilder/data/dtSpecsFilter.xml',
         'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',

From 7f85f9a33a770efa0584185e9c7b3fe96a80b26a Mon Sep 17 00:00:00 2001
From: Sunanda <sunanda.banerjee@cern.ch>
Date: Fri, 21 Feb 2014 11:56:01 +0100
Subject: [PATCH 3/3] Missing fie in the scenario

---
 .../python/cmsExtendedGeometry2023HGCalMuonXML_cfi.py           | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2023HGCalMuonXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2023HGCalMuonXML_cfi.py
index 948f570ab6a6d..16bb8d331cf49 100644
--- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2023HGCalMuonXML_cfi.py
+++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2023HGCalMuonXML_cfi.py
@@ -60,6 +60,8 @@
         'Geometry/HcalCommonData/data/hcalbarrelalgo.xml',
         'Geometry/HcalCommonData/data/hcalouteralgo.xml',
         'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
+        'Geometry/HcalCommonData/data/PhaseII/NoHE/hcalSimNumbering.xml',
+        'Geometry/HcalCommonData/data/PhaseII/NoHE/hcalRecNumbering.xml',
         'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
         'Geometry/HGCalCommonData/data/v3/hgcal.xml',
         'Geometry/HGCalCommonData/data/v2/hgcalEE.xml',