diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2023HGCalMuonXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2023HGCalMuonXML_cfi.py
index 9fd67b26d64c2..16bb8d331cf49 100644
--- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2023HGCalMuonXML_cfi.py
+++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2023HGCalMuonXML_cfi.py
@@ -60,10 +60,13 @@
'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/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 +108,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',
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 @@
-
-
+
+
+
-
+
+
@@ -19,18 +21,21 @@
-
-
-
-
+
+
+
+
+
-
+
+
+
@@ -40,9 +45,9 @@
+
-
-
+
@@ -50,9 +55,9 @@
+
-
-
+
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
- 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
-
- [hgcal:slope2], [hgcal:slope3], 0
-
- [hgcal:zHGCal1], [hgcal:zHGCal3], [hgcal:zHGCal4]
-
- [hgcal:rMaxHGCal1], [hgcal:rMaxHGCal3], [hgcal:rMaxHGCal4]
+
+ [hgcal:slope2], [hgcal:slope3], 0, 0
+
+ [hgcal:zHGCal1], [hgcal:zHGCal2], [hgcal:zHGCal3], [hgcal:zHGCal4]
+
+ [hgcal:rMaxHGCal1], [hgcal:rMaxHGCal2], [hgcal:rMaxHGCal3], [hgcal:rMaxHGCal4]
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
- 1, 8
- 9, 16
- 17, 24
- 25, 32
- 33, 40
- 41, 48
- 49, 56
+
+
-
-
+
+
@@ -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
- 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
+ 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
-
- [hgcal:slope2], [hgcal:slope3], 0
-
- [hgcal:zHGCal1], [hgcal:zHGCal3], [hgcal:zHGCal4]
-
- [hgcal:rMaxHGCal1], [hgcal:rMaxHGCal3], [hgcal:rMaxHGCal4]
+
+ [hgcal:slope2], [hgcal:slope3], 0, 0
+
+ [hgcal:zHGCal1], [hgcal:zHGCal2], [hgcal:zHGCal3], [hgcal:zHGCal4]
+
+ [hgcal:rMaxHGCal1], [hgcal:rMaxHGCal2], [hgcal:rMaxHGCal3], [hgcal:rMaxHGCal4]
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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 @@
-
-
+
+
@@ -15,7 +15,7 @@
-
+
@@ -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
- 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
+ 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
-
- [hgcal:slope2], [hgcal:slope3], 0
-
- [hgcal:zHGCal1], [hgcal:zHGCal3], [hgcal:zHGCal4]
-
- [hgcal:rMaxHGCal1], [hgcal:rMaxHGCal3], [hgcal:rMaxHGCal4]
+
+ [hgcal:slope2], [hgcal:slope3], 0, 0
+
+ [hgcal:zHGCal1], [hgcal:zHGCal2], [hgcal:zHGCal3], [hgcal:zHGCal4]
+
+ [hgcal:rMaxHGCal1], [hgcal:rMaxHGCal2], [hgcal:rMaxHGCal3], [hgcal:rMaxHGCal4]
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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 @@
-
+
-
+
@@ -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
- 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
-
- [hgcal:slope2], [hgcal:slope3], 0
-
- [hgcal:zHGCal1], [hgcal:zHGCal3], [hgcal:zHGCal4]
-
- [hgcal:rMaxHGCal1], [hgcal:rMaxHGCal3], [hgcal:rMaxHGCal4]
+
+ [hgcal:slope2], [hgcal:slope3], 0, 0
+
+ [hgcal:zHGCal1], [hgcal:zHGCal2], [hgcal:zHGCal3], [hgcal:zHGCal4]
+
+ [hgcal:rMaxHGCal1], [hgcal:rMaxHGCal2], [hgcal:rMaxHGCal3], [hgcal:rMaxHGCal4]
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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 @@
-
-
+
+
+
-
+
+
@@ -19,30 +21,31 @@
-
-
-
-
+
+
+
+
+
-
+
-
-
+
+
+
-
-
+
@@ -50,9 +53,9 @@
+
-
-
+
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
- 1.6*mm, 3.3*mm, 5.6*mm, 3.0*mm, 0.1*mm, 1.0*mm, 1.0*mm
+ 1.6*mm, 3.3*mm, 5.6*mm, 3.0*mm, 0.1*mm, 2.0*mm, 2.0*mm
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
- 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
-
- [hgcal:slope2], [hgcal:slope3], 0
-
- [hgcal:zHGCal1], [hgcal:zHGCal3], [hgcal:zHGCal4]
-
- [hgcal:rMaxHGCal1], [hgcal:rMaxHGCal3], [hgcal:rMaxHGCal4]
+
+ [hgcal:slope2], [hgcal:slope3], 0, 0
+
+ [hgcal:zHGCal1], [hgcal:zHGCal2], [hgcal:zHGCal3], [hgcal:zHGCal4]
+
+ [hgcal:rMaxHGCal1], [hgcal:rMaxHGCal2], [hgcal:rMaxHGCal3], [hgcal:rMaxHGCal4]
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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 @@
-
+
-
+
-
+
@@ -22,7 +22,6 @@
-
@@ -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
- 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
+ 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
-
- [hgcal:slope2], [hgcal:slope3], 0
-
- [hgcal:zHGCal1], [hgcal:zHGCal3], [hgcal:zHGCal4]
-
- [hgcal:rMaxHGCal1], [hgcal:rMaxHGCal3], [hgcal:rMaxHGCal4]
+
+ [hgcal:slope2], [hgcal:slope3], 0, 0
+
+ [hgcal:zHGCal1], [hgcal:zHGCal2], [hgcal:zHGCal3], [hgcal:zHGCal4]
+
+ [hgcal:rMaxHGCal1], [hgcal:rMaxHGCal2], [hgcal:rMaxHGCal3], [hgcal:rMaxHGCal4]
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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 @@
-
-
+
+
@@ -15,7 +15,7 @@
-
+
@@ -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
- 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, 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
-
- [hgcal:slope2], [hgcal:slope3], 0
-
- [hgcal:zHGCal1], [hgcal:zHGCal3], [hgcal:zHGCal4]
-
- [hgcal:rMaxHGCal1], [hgcal:rMaxHGCal3], [hgcal:rMaxHGCal4]
+
+ [hgcal:slope2], [hgcal:slope3], 0, 0
+
+ [hgcal:zHGCal1], [hgcal:zHGCal2], [hgcal:zHGCal3], [hgcal:zHGCal4]
+
+ [hgcal:rMaxHGCal1], [hgcal:rMaxHGCal2], [hgcal:rMaxHGCal3], [hgcal:rMaxHGCal4]
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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 @@
-
+
-
+
@@ -45,7 +45,7 @@
HESiliconAbsorber, HESiliconHeatShield, HESiliconSensitive, HESiliconPCB,
HESiliconAirGap, HESiliconSupport
- 52.0*mm, 3.0*mm, 0.2*mm, 1.0*mm, 1.0*mm, 50*mm
+ 52.0*mm, 3.0*mm, 0.1*mm, 2.0*mm, 2.0*mm, 50*mm
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
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, 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
-
- [hgcal:slope2], [hgcal:slope3], 0
-
- [hgcal:zHGCal1], [hgcal:zHGCal3], [hgcal:zHGCal4]
-
- [hgcal:rMaxHGCal1], [hgcal:rMaxHGCal3], [hgcal:rMaxHGCal4]
+
+ [hgcal:slope2], [hgcal:slope3], 0, 0
+
+ [hgcal:zHGCal1], [hgcal:zHGCal2], [hgcal:zHGCal3], [hgcal:zHGCal4]
+
+ [hgcal:rMaxHGCal1], [hgcal:rMaxHGCal2], [hgcal:rMaxHGCal3], [hgcal:rMaxHGCal4]
+
+ [hgcal:slope2], [hgcal:slope3], 0, 0
+
+ [hgcal:zHGCal1], [hgcal:zHGCal2], [hgcal:zHGCal3], [hgcal:zHGCal4]
+
+ [hgcal:rMaxHGCal1], [hgcal:rMaxHGCal2], [hgcal:rMaxHGCal3], [hgcal:rMaxHGCal4]
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0*deg, 0*deg, 0*deg
+
+
+
+
+ materials:H_Brass, materials:H_Brass, materials:Scintillator
+
+ HEScintillatorAbsorber, HEScintillatorShield,
+ HEScintillatorSensitive
+ 0, 1, -1
+
+ 34.5*mm, 9.0*mm, 9.0*mm
+
+ 4366.5*mm, 4401.0*mm, 4401.0*mm
+ 1, 1, 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, 0, 2, 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
+
+
+
+
+ [hgcal:slope2], [hgcal:slope3], 0, 0
+
+ [hgcal:zHGCal1], [hgcal:zHGCal2], [hgcal:zHGCal3], [hgcal:zHGCal4]
+
+ [hgcal:rMaxHGCal1], [hgcal:rMaxHGCal2], [hgcal:rMaxHGCal3], [hgcal:rMaxHGCal4]
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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 << ", "