From abb49281afbf42601e0b6de30d42c2d3ec404ae9 Mon Sep 17 00:00:00 2001
From: Sunanda <sunanda.banerjee@cern.ch>
Date: Mon, 21 Nov 2022 09:54:41 +0100
Subject: [PATCH] Transfer most of the HGCal TB related geometry file to the
 new branch Geometry/HGCalTBCommonData

---
 .../data/TB160/16Module/hgcalCons.xml         | 168 ++++++
 .../data/TB160/16Module/hgcalEE.xml           |  91 ++++
 .../data/TB160/4Module/hgcalCons.xml          |  60 +++
 .../data/TB160/4Module/hgcalEE.xml            |  80 +++
 Geometry/HGCalTBCommonData/data/TB160/cms.xml |  35 ++
 .../data/TB160/hgcProdCuts.xml                |  15 +
 .../HGCalTBCommonData/data/TB160/hgcal.xml    |  58 +++
 .../data/TB160/hgcalBeam.xml                  | 481 ++++++++++++++++++
 .../data/TB160/hgcalCons.xml                  | 277 ++++++++++
 .../HGCalTBCommonData/data/TB160/hgcalEE.xml  | 102 ++++
 .../data/TB160/hgcalExtra.xml                 |  28 +
 .../data/TB160/hgcalsense.xml                 |  11 +
 .../data/TB161/1Module/hgcalCons.xml          |  33 ++
 .../data/TB161/1Module/hgcalEE.xml            |  70 +++
 .../data/TB161/8Module/hgcalCons.xml          |  96 ++++
 .../data/TB161/8Module/hgcalEE.xml            |  97 ++++
 .../data/TB161/8ModuleV2/hgcalEE.xml          | 102 ++++
 .../data/TB161/TimingLayer/hgcalBeam.xml      | 434 ++++++++++++++++
 .../data/TB161/TimingLayer/hgcalCons.xml      |  33 ++
 .../data/TB161/TimingLayer/hgcalEE.xml        |  80 +++
 Geometry/HGCalTBCommonData/data/TB161/cms.xml |  35 ++
 .../data/TB161/hgcProdCuts.xml                |  15 +
 .../HGCalTBCommonData/data/TB161/hgcal.xml    |  58 +++
 .../data/TB161/hgcalBeam.xml                  | 418 +++++++++++++++
 .../data/TB161/hgcalsense.xml                 |  11 +
 .../data/TB170/6Module/hgcal.xml              | 161 ++++++
 .../data/TB170/6Module/hgcalHE.xml            |  83 +++
 .../data/TB170/July17/ahcal.xml               | 170 +++++++
 .../data/TB170/July17/hgcal.xml               | 149 ++++++
 .../data/TB170/July17/hgcalBeam.xml           | 431 ++++++++++++++++
 .../data/TB170/July17/hgcalCons.xml           | 104 ++++
 .../data/TB170/July17/hgcalEE.xml             | 113 ++++
 .../data/TB170/July17/hgcalHE.xml             |  89 ++++
 .../data/TB170/Sep17/hgcal.xml                | 149 ++++++
 .../data/TB170/Sep17/hgcalCons.xml            | 193 +++++++
 .../data/TB170/Sep17/hgcalEE.xml              | 102 ++++
 .../data/TB170/Sep17/hgcalHE.xml              | 114 +++++
 .../data/TB170/Shifted/hgcal.xml              | 161 ++++++
 .../HGCalTBCommonData/data/TB170/ahcal.xml    | 170 +++++++
 Geometry/HGCalTBCommonData/data/TB170/cms.xml |  39 ++
 .../data/TB170/hgcProdCuts.xml                |  16 +
 .../HGCalTBCommonData/data/TB170/hgcal.xml    | 161 ++++++
 .../data/TB170/hgcalBeam.xml                  | 418 +++++++++++++++
 .../data/TB170/hgcalCons.xml                  | 401 +++++++++++++++
 .../HGCalTBCommonData/data/TB170/hgcalEE.xml  | 105 ++++
 .../HGCalTBCommonData/data/TB170/hgcalHE.xml  |  91 ++++
 .../data/TB170/hgcalsense.xml                 |  16 +
 .../data/TB180/Absorb12/hgcalAbsorber.xml     |  31 ++
 .../data/TB180/Absorb16/hgcalAbsorber.xml     |  31 ++
 .../data/TB180/Absorb20/hgcalAbsorber.xml     |  31 ++
 .../data/TB180/Absorb22/hgcalAbsorber.xml     |  31 ++
 Geometry/HGCalTBCommonData/data/TB180/cms.xml |  35 ++
 .../data/TB180/hgcProdCuts.xml                |  15 +
 .../HGCalTBCommonData/data/TB180/hgcal.xml    | 113 ++++
 .../data/TB180/hgcalCons.xml                  |  51 ++
 .../HGCalTBCommonData/data/TB180/hgcalEE.xml  | 243 +++++++++
 .../data/TB180/hgcalsense.xml                 |  11 +
 .../data/TB181/June18/hgcProdCuts.xml         |  15 +
 .../data/TB181/June18/hgcal.xml               | 135 +++++
 .../data/TB181/June18/hgcalBeam.xml           | 431 ++++++++++++++++
 .../data/TB181/June18/hgcalCons.xml           | 276 ++++++++++
 .../data/TB181/June18/hgcalEE.xml             | 122 +++++
 .../data/TB181/June18/hgcalsense.xml          |  11 +
 .../data/TB181/Oct180/hgcalBeam.xml           | 403 +++++++++++++++
 .../data/TB181/Oct181/ahcal.xml               | 214 ++++++++
 .../data/TB181/Oct181/cms.xml                 |  39 ++
 .../data/TB181/Oct181/hgcProdCuts.xml         |  16 +
 .../data/TB181/Oct181/hgcal.xml               | 259 ++++++++++
 .../data/TB181/Oct181/hgcalBeam.xml           | 431 ++++++++++++++++
 .../data/TB181/Oct181/hgcalCons.xml           | 401 +++++++++++++++
 .../data/TB181/Oct181/hgcalEE.xml             | 151 ++++++
 .../data/TB181/Oct181/hgcalHE.xml             | 216 ++++++++
 .../data/TB181/Oct181/hgcalsense.xml          |  16 +
 .../data/TB181/Oct182/ahcal.xml               | 214 ++++++++
 .../data/TB181/Oct182/hgcal.xml               | 259 ++++++++++
 .../data/TB181/Oct182/hgcalBeam.xml           | 431 ++++++++++++++++
 .../data/TB181/Oct182/hgcalEE.xml             | 151 ++++++
 .../data/TB181/Oct182/hgcalHE.xml             | 207 ++++++++
 .../data/TB181/Oct183/ahcal.xml               | 214 ++++++++
 .../data/TB181/Oct183/hgcal.xml               | 259 ++++++++++
 .../data/TB181/Oct183/hgcalBeam.xml           | 431 ++++++++++++++++
 .../data/TB181/Oct183/hgcalEE.xml             | 145 ++++++
 .../data/TB181/Oct183/hgcalHE.xml             | 217 ++++++++
 .../data/TB181/Oct184/hgcal.xml               | 259 ++++++++++
 .../data/TB181/Oct184/hgcalEE.xml             | 151 ++++++
 .../data/TB181/Test/hgcProdCuts.xml           |  15 +
 .../data/TB181/Test/hgcalCons.xml             | 132 +++++
 .../data/TB181/Test/hgcalHE.xml               | 132 +++++
 .../data/TB181/Test/hgcalsense.xml            |  11 +
 .../HGCalTBCommonData/data/TB181/ahcal.xml    | 207 ++++++++
 Geometry/HGCalTBCommonData/data/TB181/cms.xml |  39 ++
 .../data/TB181/hgcProdCuts.xml                |  16 +
 .../cms-test-ddhgcalTB181V1-algorithm.xml     |  37 ++
 .../cms-test-ddhgcalTBModule-algorithm.xml    |  33 ++
 .../cms-test-ddhgcalTBModuleX-algorithm.xml   |  34 ++
 .../python/testAHcalModuleAlgoXML_cfi.py      |  13 +
 .../python/testTB160XML_cfi.py                |  17 +
 .../python/testTB161XML_cfi.py                |  17 +
 .../python/testTB181V0XML_cfi.py              |  21 +
 .../python/testTB181V1XML_cfi.py              |  16 +
 .../python/testTB181V2XML_cfi.py              |  16 +
 .../python/testTB181XML_cfi.py                |  21 +
 .../test/python/dumpTBGeometryDDD_cfg.py      |  26 +
 .../test/python/dumpTBModuleDD4hep_cfg.py     |  25 +
 .../test/python/dumpTBModuleDDD_cfg.py        |  57 +++
 .../python/testHGCalTBParametersDD4hep_cfg.py |  51 ++
 .../python/testHGCalTBParametersDDD_cfg.py    |  39 ++
 107 files changed, 13965 insertions(+)
 create mode 100644 Geometry/HGCalTBCommonData/data/TB160/16Module/hgcalCons.xml
 create mode 100644 Geometry/HGCalTBCommonData/data/TB160/16Module/hgcalEE.xml
 create mode 100644 Geometry/HGCalTBCommonData/data/TB160/4Module/hgcalCons.xml
 create mode 100644 Geometry/HGCalTBCommonData/data/TB160/4Module/hgcalEE.xml
 create mode 100644 Geometry/HGCalTBCommonData/data/TB160/cms.xml
 create mode 100644 Geometry/HGCalTBCommonData/data/TB160/hgcProdCuts.xml
 create mode 100644 Geometry/HGCalTBCommonData/data/TB160/hgcal.xml
 create mode 100644 Geometry/HGCalTBCommonData/data/TB160/hgcalBeam.xml
 create mode 100644 Geometry/HGCalTBCommonData/data/TB160/hgcalCons.xml
 create mode 100644 Geometry/HGCalTBCommonData/data/TB160/hgcalEE.xml
 create mode 100644 Geometry/HGCalTBCommonData/data/TB160/hgcalExtra.xml
 create mode 100644 Geometry/HGCalTBCommonData/data/TB160/hgcalsense.xml
 create mode 100644 Geometry/HGCalTBCommonData/data/TB161/1Module/hgcalCons.xml
 create mode 100644 Geometry/HGCalTBCommonData/data/TB161/1Module/hgcalEE.xml
 create mode 100644 Geometry/HGCalTBCommonData/data/TB161/8Module/hgcalCons.xml
 create mode 100644 Geometry/HGCalTBCommonData/data/TB161/8Module/hgcalEE.xml
 create mode 100644 Geometry/HGCalTBCommonData/data/TB161/8ModuleV2/hgcalEE.xml
 create mode 100644 Geometry/HGCalTBCommonData/data/TB161/TimingLayer/hgcalBeam.xml
 create mode 100644 Geometry/HGCalTBCommonData/data/TB161/TimingLayer/hgcalCons.xml
 create mode 100644 Geometry/HGCalTBCommonData/data/TB161/TimingLayer/hgcalEE.xml
 create mode 100644 Geometry/HGCalTBCommonData/data/TB161/cms.xml
 create mode 100644 Geometry/HGCalTBCommonData/data/TB161/hgcProdCuts.xml
 create mode 100644 Geometry/HGCalTBCommonData/data/TB161/hgcal.xml
 create mode 100644 Geometry/HGCalTBCommonData/data/TB161/hgcalBeam.xml
 create mode 100644 Geometry/HGCalTBCommonData/data/TB161/hgcalsense.xml
 create mode 100644 Geometry/HGCalTBCommonData/data/TB170/6Module/hgcal.xml
 create mode 100644 Geometry/HGCalTBCommonData/data/TB170/6Module/hgcalHE.xml
 create mode 100644 Geometry/HGCalTBCommonData/data/TB170/July17/ahcal.xml
 create mode 100644 Geometry/HGCalTBCommonData/data/TB170/July17/hgcal.xml
 create mode 100644 Geometry/HGCalTBCommonData/data/TB170/July17/hgcalBeam.xml
 create mode 100644 Geometry/HGCalTBCommonData/data/TB170/July17/hgcalCons.xml
 create mode 100644 Geometry/HGCalTBCommonData/data/TB170/July17/hgcalEE.xml
 create mode 100644 Geometry/HGCalTBCommonData/data/TB170/July17/hgcalHE.xml
 create mode 100644 Geometry/HGCalTBCommonData/data/TB170/Sep17/hgcal.xml
 create mode 100644 Geometry/HGCalTBCommonData/data/TB170/Sep17/hgcalCons.xml
 create mode 100644 Geometry/HGCalTBCommonData/data/TB170/Sep17/hgcalEE.xml
 create mode 100644 Geometry/HGCalTBCommonData/data/TB170/Sep17/hgcalHE.xml
 create mode 100644 Geometry/HGCalTBCommonData/data/TB170/Shifted/hgcal.xml
 create mode 100644 Geometry/HGCalTBCommonData/data/TB170/ahcal.xml
 create mode 100644 Geometry/HGCalTBCommonData/data/TB170/cms.xml
 create mode 100644 Geometry/HGCalTBCommonData/data/TB170/hgcProdCuts.xml
 create mode 100644 Geometry/HGCalTBCommonData/data/TB170/hgcal.xml
 create mode 100644 Geometry/HGCalTBCommonData/data/TB170/hgcalBeam.xml
 create mode 100644 Geometry/HGCalTBCommonData/data/TB170/hgcalCons.xml
 create mode 100644 Geometry/HGCalTBCommonData/data/TB170/hgcalEE.xml
 create mode 100644 Geometry/HGCalTBCommonData/data/TB170/hgcalHE.xml
 create mode 100644 Geometry/HGCalTBCommonData/data/TB170/hgcalsense.xml
 create mode 100644 Geometry/HGCalTBCommonData/data/TB180/Absorb12/hgcalAbsorber.xml
 create mode 100644 Geometry/HGCalTBCommonData/data/TB180/Absorb16/hgcalAbsorber.xml
 create mode 100644 Geometry/HGCalTBCommonData/data/TB180/Absorb20/hgcalAbsorber.xml
 create mode 100644 Geometry/HGCalTBCommonData/data/TB180/Absorb22/hgcalAbsorber.xml
 create mode 100644 Geometry/HGCalTBCommonData/data/TB180/cms.xml
 create mode 100644 Geometry/HGCalTBCommonData/data/TB180/hgcProdCuts.xml
 create mode 100644 Geometry/HGCalTBCommonData/data/TB180/hgcal.xml
 create mode 100644 Geometry/HGCalTBCommonData/data/TB180/hgcalCons.xml
 create mode 100644 Geometry/HGCalTBCommonData/data/TB180/hgcalEE.xml
 create mode 100644 Geometry/HGCalTBCommonData/data/TB180/hgcalsense.xml
 create mode 100644 Geometry/HGCalTBCommonData/data/TB181/June18/hgcProdCuts.xml
 create mode 100644 Geometry/HGCalTBCommonData/data/TB181/June18/hgcal.xml
 create mode 100644 Geometry/HGCalTBCommonData/data/TB181/June18/hgcalBeam.xml
 create mode 100644 Geometry/HGCalTBCommonData/data/TB181/June18/hgcalCons.xml
 create mode 100644 Geometry/HGCalTBCommonData/data/TB181/June18/hgcalEE.xml
 create mode 100644 Geometry/HGCalTBCommonData/data/TB181/June18/hgcalsense.xml
 create mode 100644 Geometry/HGCalTBCommonData/data/TB181/Oct180/hgcalBeam.xml
 create mode 100644 Geometry/HGCalTBCommonData/data/TB181/Oct181/ahcal.xml
 create mode 100644 Geometry/HGCalTBCommonData/data/TB181/Oct181/cms.xml
 create mode 100644 Geometry/HGCalTBCommonData/data/TB181/Oct181/hgcProdCuts.xml
 create mode 100644 Geometry/HGCalTBCommonData/data/TB181/Oct181/hgcal.xml
 create mode 100644 Geometry/HGCalTBCommonData/data/TB181/Oct181/hgcalBeam.xml
 create mode 100644 Geometry/HGCalTBCommonData/data/TB181/Oct181/hgcalCons.xml
 create mode 100644 Geometry/HGCalTBCommonData/data/TB181/Oct181/hgcalEE.xml
 create mode 100644 Geometry/HGCalTBCommonData/data/TB181/Oct181/hgcalHE.xml
 create mode 100644 Geometry/HGCalTBCommonData/data/TB181/Oct181/hgcalsense.xml
 create mode 100644 Geometry/HGCalTBCommonData/data/TB181/Oct182/ahcal.xml
 create mode 100644 Geometry/HGCalTBCommonData/data/TB181/Oct182/hgcal.xml
 create mode 100644 Geometry/HGCalTBCommonData/data/TB181/Oct182/hgcalBeam.xml
 create mode 100644 Geometry/HGCalTBCommonData/data/TB181/Oct182/hgcalEE.xml
 create mode 100644 Geometry/HGCalTBCommonData/data/TB181/Oct182/hgcalHE.xml
 create mode 100644 Geometry/HGCalTBCommonData/data/TB181/Oct183/ahcal.xml
 create mode 100644 Geometry/HGCalTBCommonData/data/TB181/Oct183/hgcal.xml
 create mode 100644 Geometry/HGCalTBCommonData/data/TB181/Oct183/hgcalBeam.xml
 create mode 100644 Geometry/HGCalTBCommonData/data/TB181/Oct183/hgcalEE.xml
 create mode 100644 Geometry/HGCalTBCommonData/data/TB181/Oct183/hgcalHE.xml
 create mode 100644 Geometry/HGCalTBCommonData/data/TB181/Oct184/hgcal.xml
 create mode 100644 Geometry/HGCalTBCommonData/data/TB181/Oct184/hgcalEE.xml
 create mode 100644 Geometry/HGCalTBCommonData/data/TB181/Test/hgcProdCuts.xml
 create mode 100644 Geometry/HGCalTBCommonData/data/TB181/Test/hgcalCons.xml
 create mode 100644 Geometry/HGCalTBCommonData/data/TB181/Test/hgcalHE.xml
 create mode 100644 Geometry/HGCalTBCommonData/data/TB181/Test/hgcalsense.xml
 create mode 100644 Geometry/HGCalTBCommonData/data/TB181/ahcal.xml
 create mode 100644 Geometry/HGCalTBCommonData/data/TB181/cms.xml
 create mode 100644 Geometry/HGCalTBCommonData/data/TB181/hgcProdCuts.xml
 create mode 100644 Geometry/HGCalTBCommonData/data/dd4hep/cms-test-ddhgcalTB181V1-algorithm.xml
 create mode 100644 Geometry/HGCalTBCommonData/data/dd4hep/cms-test-ddhgcalTBModule-algorithm.xml
 create mode 100644 Geometry/HGCalTBCommonData/data/dd4hep/cms-test-ddhgcalTBModuleX-algorithm.xml
 create mode 100644 Geometry/HGCalTBCommonData/python/testAHcalModuleAlgoXML_cfi.py
 create mode 100644 Geometry/HGCalTBCommonData/python/testTB160XML_cfi.py
 create mode 100644 Geometry/HGCalTBCommonData/python/testTB161XML_cfi.py
 create mode 100644 Geometry/HGCalTBCommonData/python/testTB181V0XML_cfi.py
 create mode 100644 Geometry/HGCalTBCommonData/python/testTB181V1XML_cfi.py
 create mode 100644 Geometry/HGCalTBCommonData/python/testTB181V2XML_cfi.py
 create mode 100644 Geometry/HGCalTBCommonData/python/testTB181XML_cfi.py
 create mode 100644 Geometry/HGCalTBCommonData/test/python/dumpTBGeometryDDD_cfg.py
 create mode 100644 Geometry/HGCalTBCommonData/test/python/dumpTBModuleDD4hep_cfg.py
 create mode 100644 Geometry/HGCalTBCommonData/test/python/dumpTBModuleDDD_cfg.py
 create mode 100644 Geometry/HGCalTBCommonData/test/python/testHGCalTBParametersDD4hep_cfg.py
 create mode 100644 Geometry/HGCalTBCommonData/test/python/testHGCalTBParametersDDD_cfg.py

diff --git a/Geometry/HGCalTBCommonData/data/TB160/16Module/hgcalCons.xml b/Geometry/HGCalTBCommonData/data/TB160/16Module/hgcalCons.xml
new file mode 100644
index 0000000000000..b8e9ec8115b76
--- /dev/null
+++ b/Geometry/HGCalTBCommonData/data/TB160/16Module/hgcalCons.xml
@@ -0,0 +1,168 @@
+<?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">
+
+<SpecParSection label="hgcalReco.xml" eval="true">
+  <SpecPar name="HGCalEEWafer">
+    <PartSelector path="//HGCalEEWafer.*"/>
+    <Parameter name="Volume" value="HGCalEEWafer" eval="false"/>
+    <Parameter name="WaferSize"      value="[hgcal:WaferW]"/>
+  </SpecPar>
+  <SpecPar name="HGCalEECell">
+    <PartSelector path="//HGCalEECell.*"/>
+    <Parameter name="Volume" value="HGCalEECell" eval="false"/>
+    <Parameter name="CellSize"      value="[hgcalwafer:CellWF]"/>
+    <Parameter name="CellSize"      value="[hgcalwafer:CellWC]"/>
+  </SpecPar>
+  <SpecPar name="HGCalEESensitive">
+    <PartSelector path="//HGCalEESensitive.*"/>
+    <Parameter name="Volume" value="HGCalEESensitive" eval="false"/>
+    <Parameter name="Slope"          value="0.0"/>
+    <Parameter name="GroupingZFine"  value="1"/>
+    <Parameter name="GroupingZFine"  value="1"/>
+    <Parameter name="GroupingZFine"  value="-1"/>
+    <Parameter name="GroupingZFine"  value="-1"/>
+    <Parameter name="GroupingZFine"  value="2"/>
+    <Parameter name="GroupingZFine"  value="2"/>
+    <Parameter name="GroupingZFine"  value="3"/>
+    <Parameter name="GroupingZFine"  value="3"/>
+    <Parameter name="GroupingZFine"  value="-1"/>
+    <Parameter name="GroupingZFine"  value="-1"/>
+    <Parameter name="GroupingZFine"  value="4"/>
+    <Parameter name="GroupingZFine"  value="4"/>
+    <Parameter name="GroupingZFine"  value="5"/>
+    <Parameter name="GroupingZFine"  value="5"/>
+    <Parameter name="GroupingZFine"  value="-1"/>
+    <Parameter name="GroupingZFine"  value="-1"/>
+    <Parameter name="GroupingZFine"  value="6"/>
+    <Parameter name="GroupingZFine"  value="6"/>
+    <Parameter name="GroupingZFine"  value="7"/>
+    <Parameter name="GroupingZFine"  value="7"/>
+    <Parameter name="GroupingZFine"  value="-1"/>
+    <Parameter name="GroupingZFine"  value="-1"/>
+    <Parameter name="GroupingZFine"  value="8"/>
+    <Parameter name="GroupingZFine"  value="8"/>
+    <Parameter name="GroupingZFine"  value="9"/>
+    <Parameter name="GroupingZFine"  value="9"/>
+    <Parameter name="GroupingZFine"  value="-1"/>
+    <Parameter name="GroupingZFine"  value="-1"/>
+    <Parameter name="GroupingZFine"  value="10"/>
+    <Parameter name="GroupingZFine"  value="10"/>
+    <Parameter name="GroupingZFine"  value="11"/>
+    <Parameter name="GroupingZFine"  value="11"/>
+    <Parameter name="GroupingZFine"  value="-1"/>
+    <Parameter name="GroupingZFine"  value="-1"/>
+    <Parameter name="GroupingZFine"  value="12"/>
+    <Parameter name="GroupingZFine"  value="12"/>
+    <Parameter name="GroupingZFine"  value="13"/>
+    <Parameter name="GroupingZFine"  value="13"/>
+    <Parameter name="GroupingZFine"  value="-1"/>
+    <Parameter name="GroupingZFine"  value="-1"/>
+    <Parameter name="GroupingZFine"  value="14"/>
+    <Parameter name="GroupingZFine"  value="14"/>
+    <Parameter name="GroupingZFine"  value="15"/>
+    <Parameter name="GroupingZFine"  value="15"/>
+    <Parameter name="GroupingZFine"  value="-1"/>
+    <Parameter name="GroupingZFine"  value="-1"/>
+    <Parameter name="GroupingZFine"  value="16"/>
+    <Parameter name="GroupingZFine"  value="16"/>
+    <Parameter name="GroupingZMid"   value="1"/>
+    <Parameter name="GroupingZMid"   value="1"/>
+    <Parameter name="GroupingZMid"   value="-1"/>
+    <Parameter name="GroupingZMid"   value="-1"/>
+    <Parameter name="GroupingZMid"   value="2"/>
+    <Parameter name="GroupingZMid"   value="2"/>
+    <Parameter name="GroupingZMid"   value="3"/>
+    <Parameter name="GroupingZMid"   value="3"/>
+    <Parameter name="GroupingZMid"   value="-1"/>
+    <Parameter name="GroupingZMid"   value="-1"/>
+    <Parameter name="GroupingZMid"   value="4"/>
+    <Parameter name="GroupingZMid"   value="4"/>
+    <Parameter name="GroupingZMid"   value="5"/>
+    <Parameter name="GroupingZMid"   value="5"/>
+    <Parameter name="GroupingZMid"   value="-1"/>
+    <Parameter name="GroupingZMid"   value="-1"/>
+    <Parameter name="GroupingZMid"   value="6"/>
+    <Parameter name="GroupingZMid"   value="6"/>
+    <Parameter name="GroupingZMid"   value="7"/>
+    <Parameter name="GroupingZMid"   value="7"/>
+    <Parameter name="GroupingZMid"   value="-1"/>
+    <Parameter name="GroupingZMid"   value="-1"/>
+    <Parameter name="GroupingZMid"   value="8"/>
+    <Parameter name="GroupingZMid"   value="8"/>
+    <Parameter name="GroupingZMid"   value="9"/>
+    <Parameter name="GroupingZMid"   value="9"/>
+    <Parameter name="GroupingZMid"   value="-1"/>
+    <Parameter name="GroupingZMid"   value="-1"/>
+    <Parameter name="GroupingZMid"   value="10"/>
+    <Parameter name="GroupingZMid"   value="10"/>
+    <Parameter name="GroupingZMid"   value="11"/>
+    <Parameter name="GroupingZMid"   value="11"/>
+    <Parameter name="GroupingZMid"   value="-1"/>
+    <Parameter name="GroupingZMid"   value="-1"/>
+    <Parameter name="GroupingZMid"   value="12"/>
+    <Parameter name="GroupingZMid"   value="12"/>
+    <Parameter name="GroupingZMid"   value="13"/>
+    <Parameter name="GroupingZMid"   value="13"/>
+    <Parameter name="GroupingZMid"   value="-1"/>
+    <Parameter name="GroupingZMid"   value="-1"/>
+    <Parameter name="GroupingZMid"   value="14"/>
+    <Parameter name="GroupingZMid"   value="14"/>
+    <Parameter name="GroupingZMid"   value="15"/>
+    <Parameter name="GroupingZMid"   value="15"/>
+    <Parameter name="GroupingZMid"   value="-1"/>
+    <Parameter name="GroupingZMid"   value="-1"/>
+    <Parameter name="GroupingZMid"   value="16"/>
+    <Parameter name="GroupingZMid"   value="16"/>
+    <Parameter name="GroupingZOut"   value="1"/>
+    <Parameter name="GroupingZOut"   value="1"/>
+    <Parameter name="GroupingZOut"   value="-1"/>
+    <Parameter name="GroupingZOut"   value="-1"/>
+    <Parameter name="GroupingZOut"   value="2"/>
+    <Parameter name="GroupingZOut"   value="2"/>
+    <Parameter name="GroupingZOut"   value="3"/>
+    <Parameter name="GroupingZOut"   value="3"/>
+    <Parameter name="GroupingZOut"   value="-1"/>
+    <Parameter name="GroupingZOut"   value="-1"/>
+    <Parameter name="GroupingZOut"   value="4"/>
+    <Parameter name="GroupingZOut"   value="4"/>
+    <Parameter name="GroupingZOut"   value="5"/>
+    <Parameter name="GroupingZOut"   value="5"/>
+    <Parameter name="GroupingZOut"   value="-1"/>
+    <Parameter name="GroupingZOut"   value="-1"/>
+    <Parameter name="GroupingZOut"   value="6"/>
+    <Parameter name="GroupingZOut"   value="6"/>
+    <Parameter name="GroupingZOut"   value="7"/>
+    <Parameter name="GroupingZOut"   value="7"/>
+    <Parameter name="GroupingZOut"   value="-1"/>
+    <Parameter name="GroupingZOut"   value="-1"/>
+    <Parameter name="GroupingZOut"   value="8"/>
+    <Parameter name="GroupingZOut"   value="8"/>
+    <Parameter name="GroupingZOut"   value="9"/>
+    <Parameter name="GroupingZOut"   value="9"/>
+    <Parameter name="GroupingZOut"   value="-1"/>
+    <Parameter name="GroupingZOut"   value="-1"/>
+    <Parameter name="GroupingZOut"   value="10"/>
+    <Parameter name="GroupingZOut"   value="10"/>
+    <Parameter name="GroupingZOut"   value="11"/>
+    <Parameter name="GroupingZOut"   value="11"/>
+    <Parameter name="GroupingZOut"   value="-1"/>
+    <Parameter name="GroupingZOut"   value="-1"/>
+    <Parameter name="GroupingZOut"   value="12"/>
+    <Parameter name="GroupingZOut"   value="12"/>
+    <Parameter name="GroupingZOut"   value="13"/>
+    <Parameter name="GroupingZOut"   value="13"/>
+    <Parameter name="GroupingZOut"   value="-1"/>
+    <Parameter name="GroupingZOut"   value="-1"/>
+    <Parameter name="GroupingZOut"   value="14"/>
+    <Parameter name="GroupingZOut"   value="14"/>
+    <Parameter name="GroupingZOut"   value="15"/>
+    <Parameter name="GroupingZOut"   value="15"/>
+    <Parameter name="GroupingZOut"   value="-1"/>
+    <Parameter name="GroupingZOut"   value="-1"/>
+    <Parameter name="GroupingZOut"   value="16"/>
+    <Parameter name="GroupingZOut"   value="16"/>
+    <Parameter name="LayerOffset"    value="0"/>
+  </SpecPar>
+</SpecParSection>
+
+</DDDefinition>
diff --git a/Geometry/HGCalTBCommonData/data/TB160/16Module/hgcalEE.xml b/Geometry/HGCalTBCommonData/data/TB160/16Module/hgcalEE.xml
new file mode 100644
index 0000000000000..3c43ce0d14991
--- /dev/null
+++ b/Geometry/HGCalTBCommonData/data/TB160/16Module/hgcalEE.xml
@@ -0,0 +1,91 @@
+<?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="hgcalEE.xml" eval="true">
+  <Constant name="rMinFine"   value="0.0*fm"/>
+  <Constant name="rMaxFine"   value="0.0*cm"/>
+  <Constant name="rMaxMiddle" value="120.0*cm"/>
+  <Constant name="rMaxCoarse" value="2000.0*cm"/>
+  <Constant name="rMin"       value="0.0*fm"/>
+  <Constant name="rMax"       value="10.0*cm"/>
+</ConstantsSection>
+
+<PosPartSection label="hgcalEE.xml">
+  <Algorithm name="hgcal:DDHGCalModuleAlgo">
+    <rParent name="hgcal:HGCalEE"/>
+    <Vector name="WaferName" type="string" nEntries="2">
+      hgcalwafer:HGCalEEWaferFine, hgcalwafer:HGCalEEWaferCoarse</Vector>
+    <Vector name="MaterialNames" type="string" nEntries="15">
+      materials:Graph.Epoxy Sup., materials:Tungsten,
+      materials:Tungsten, materials:Tungsten, hgcal:WCu, hgcal:WCu,
+      hgcal:WCu, materials:Copper, materials:Copper, materials:Air, 
+      materials:G10, materials:G10, materials:Kapton, materials:Air, 
+      materials:Air</Vector>
+    <Vector name="VolumeNames" type="string" nEntries="15">
+      EEGlue,      EEAbsorber1, EEAbsorber2, EEAbsorber3,  EEAbsorber4, 
+      EEAbsorber5, EEAbsorber6, EECuFrame,   EEHeatShield, EESensitive,
+      EEPCB1,      EEPCB2,      EEKapton,    EEAirGap1,    EEAirGap2</Vector>
+    <Vector name="Thickness" type="numeric" nEntries="15">
+      0.1*mm, 2.1*mm,  2.8*mm,  4.2*mm,  0.6*mm,  1.2*mm, 2.2*mm, 
+      0.5*mm, 6.0*mm, 0.10*mm,  0.5*mm,  1.0*mm, 0.01*mm, 6.0*mm,
+      0.2*mm</Vector>
+    <Vector name="Layers" type="numeric" nEntries="8"> 
+      18, 18, 18, 18, 18, 18, 18, 19</Vector>
+    <Vector name="LayerThick" type="numeric" nEntries="8"> 
+     24.30*mm, 24.30*mm, 24.90*mm, 26.20*mm, 26.20*mm,
+     28.20*mm, 30.60*mm, 34.80*mm</Vector>
+    <Vector name="LayerType" type="numeric" nEntries="145"> 
+      1, 10, 13, 10,  9,  9,  9, 14,  4,  8,  4, 14,  9,  9,  9, 10, 13, 10,
+      1, 10, 13, 10,  9,  9,  9, 14,  4,  8,  4, 14,  9,  9,  9, 10, 13, 10,
+      1, 10, 13, 10,  9,  9,  9, 14,  4,  8,  5, 14,  9,  9,  9, 10, 13, 10,
+      2, 10, 13, 10,  9,  9,  9, 14,  5,  8,  5, 14,  9,  9,  9, 10, 13, 10,
+      2, 10, 13, 10,  9,  9,  9, 14,  5,  8,  5, 14,  9,  9,  9, 10, 13, 10,
+      2, 10, 13, 10,  9,  9,  9, 14,  6,  8,  6, 14,  9,  9,  9, 10, 13, 10,
+      3, 11, 13, 11,  9,  9,  9, 14,  6,  8,  6, 14,  9,  9,  9, 10, 13, 10,
+      3, 11, 13, 11,  9,  9,  9, 14,  6,  8,  6, 14,  9,  9,  9, 10, 13, 10,
+      3
+    </Vector>
+    <Vector name="LayerSense" type="numeric" nEntries="145">
+      0,  0,  0,  0,  1,  1,  1,  0,  0,  0,  0,  0,  1,  1,  1,  0,  0,  0,
+      0,  0,  0,  0,  1,  1,  1,  0,  0,  0,  0,  0,  1,  1,  1,  0,  0,  0,
+      0,  0,  0,  0,  1,  1,  1,  0,  0,  0,  0,  0,  1,  1,  1,  0,  0,  0,
+      0,  0,  0,  0,  1,  1,  1,  0,  0,  0,  0,  0,  1,  1,  1,  0,  0,  0,
+      0,  0,  0,  0,  1,  1,  1,  0,  0,  0,  0,  0,  1,  1,  1,  0,  0,  0,
+      0,  0,  0,  0,  1,  1,  1,  0,  0,  0,  0,  0,  1,  1,  1,  0,  0,  0,
+      0,  0,  0,  0,  1,  1,  1,  0,  0,  0,  0,  0,  1,  1,  1,  0,  0,  0,
+      0,  0,  0,  0,  1,  1,  1,  0,  0,  0,  0,  0,  1,  1,  1,  0,  0,  0,
+      0
+    </Vector>
+    <Numeric name="zMinBlock"   value="[hgcal:zminEE]"/>
+    <Numeric name="rMaxFine"    value="[rMaxFine]"/>
+    <Numeric name="waferW"      value="[hgcal:WaferW]"/>
+    <Numeric name="waferGap"    value="0.0*fm"/>
+    <Numeric name="Sectors"     value="12"/>
+    <Vector name="SlopeBottom" type="numeric" nEntries="2">
+      0.0, 0.0</Vector>
+    <Vector name="SlopeTop" type="numeric" nEntries="2">
+      0, 0</Vector>
+    <Vector name="ZFront" type="numeric" nEntries="2">
+      [hgcal:zminEE], [hgcal:zmaxEE]</Vector>
+    <Vector name="RMaxFront" type="numeric" nEntries="2">
+      [hgcal:rmaxEE], [hgcal:rmaxEE]</Vector>
+    <String name="RotNameSpace" value="hgcalmodule"/>
+  </Algorithm>
+</PosPartSection> 
+
+<SpecParSection label="hgcalEE.xml" eval="true">
+  <SpecPar name="HGCalEE">
+    <PartSelector path="//HGCalEESensitive.*"/>    
+    <Parameter name="Volume" value="HGCalEESensitive" eval="false"/>
+    <Parameter name="GeometryMode" value="HGCalGeometryMode::Hexagon" eval="false"/>
+    <Parameter name="RadiusBound"  value="[rMinFine]"/>
+    <Parameter name="RadiusBound"  value="[rMaxFine]"/>
+    <Parameter name="RadiusBound"  value="[rMaxMiddle]"/>
+    <Parameter name="RadiusBound"  value="[rMaxCoarse]"/>
+    <Parameter name="RadiusLimits" value="[rMin]"/>
+    <Parameter name="RadiusLimits" value="[rMax]"/>
+    <Parameter name="LevelTop"     value="99"/>
+  </SpecPar>
+</SpecParSection>
+
+</DDDefinition>
diff --git a/Geometry/HGCalTBCommonData/data/TB160/4Module/hgcalCons.xml b/Geometry/HGCalTBCommonData/data/TB160/4Module/hgcalCons.xml
new file mode 100644
index 0000000000000..2a0c167c83e7c
--- /dev/null
+++ b/Geometry/HGCalTBCommonData/data/TB160/4Module/hgcalCons.xml
@@ -0,0 +1,60 @@
+<?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">
+
+<SpecParSection label="hgcalReco.xml" eval="true">
+  <SpecPar name="HGCalEEWafer">
+    <PartSelector path="//HGCalEEWafer.*"/>
+    <Parameter name="Volume" value="HGCalEEWafer" eval="false"/>
+    <Parameter name="WaferSize"      value="[hgcal:WaferW]"/>
+  </SpecPar>
+  <SpecPar name="HGCalEECell">
+    <PartSelector path="//HGCalEECell.*"/>
+    <Parameter name="Volume" value="HGCalEECell" eval="false"/>
+    <Parameter name="CellSize"      value="[hgcalwafer:CellWF]"/>
+    <Parameter name="CellSize"      value="[hgcalwafer:CellWC]"/>
+  </SpecPar>
+  <SpecPar name="HGCalEESensitive">
+    <PartSelector path="//HGCalEESensitive.*"/>
+    <Parameter name="Volume" value="HGCalEESensitive" eval="false"/>
+    <Parameter name="Slope"          value="0.0"/>
+    <Parameter name="GroupingZFine"  value="-1"/>
+    <Parameter name="GroupingZFine"  value="1"/>
+    <Parameter name="GroupingZFine"  value="1"/>
+    <Parameter name="GroupingZFine"  value="-1"/>
+    <Parameter name="GroupingZFine"  value="2"/>
+    <Parameter name="GroupingZFine"  value="2"/>
+    <Parameter name="GroupingZFine"  value="-1"/>
+    <Parameter name="GroupingZFine"  value="3"/>
+    <Parameter name="GroupingZFine"  value="3"/>
+    <Parameter name="GroupingZFine"  value="-1"/>
+    <Parameter name="GroupingZFine"  value="4"/>
+    <Parameter name="GroupingZFine"  value="4"/>
+    <Parameter name="GroupingZMid"   value="-1"/>
+    <Parameter name="GroupingZMid"   value="1"/>
+    <Parameter name="GroupingZMid"   value="1"/>
+    <Parameter name="GroupingZMid"   value="-1"/>
+    <Parameter name="GroupingZMid"   value="2"/>
+    <Parameter name="GroupingZMid"   value="2"/>
+    <Parameter name="GroupingZMid"   value="-1"/>
+    <Parameter name="GroupingZMid"   value="3"/>
+    <Parameter name="GroupingZMid"   value="3"/>
+    <Parameter name="GroupingZMid"   value="-1"/>
+    <Parameter name="GroupingZMid"   value="4"/>
+    <Parameter name="GroupingZMid"   value="4"/>
+    <Parameter name="GroupingZOut"   value="-1"/>
+    <Parameter name="GroupingZOut"   value="1"/>
+    <Parameter name="GroupingZOut"   value="1"/>
+    <Parameter name="GroupingZOut"   value="-1"/>
+    <Parameter name="GroupingZOut"   value="2"/>
+    <Parameter name="GroupingZOut"   value="2"/>
+    <Parameter name="GroupingZOut"   value="-1"/>
+    <Parameter name="GroupingZOut"   value="3"/>
+    <Parameter name="GroupingZOut"   value="3"/>
+    <Parameter name="GroupingZOut"   value="-1"/>
+    <Parameter name="GroupingZOut"   value="4"/>
+    <Parameter name="GroupingZOut"   value="4"/>
+    <Parameter name="LayerOffset"    value="0"/>
+  </SpecPar>
+</SpecParSection>
+
+</DDDefinition>
diff --git a/Geometry/HGCalTBCommonData/data/TB160/4Module/hgcalEE.xml b/Geometry/HGCalTBCommonData/data/TB160/4Module/hgcalEE.xml
new file mode 100644
index 0000000000000..f1765a42fd4a2
--- /dev/null
+++ b/Geometry/HGCalTBCommonData/data/TB160/4Module/hgcalEE.xml
@@ -0,0 +1,80 @@
+<?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="hgcalEE.xml" eval="true">
+  <Constant name="rMinFine"   value="0.0*fm"/>
+  <Constant name="rMaxFine"   value="0.0*cm"/>
+  <Constant name="rMaxMiddle" value="120.0*cm"/>
+  <Constant name="rMaxCoarse" value="2000.0*cm"/>
+  <Constant name="rMin"       value="0.0*fm"/>
+  <Constant name="rMax"       value="10.0*cm"/>
+</ConstantsSection>
+
+<PosPartSection label="hgcalEE.xml">
+  <Algorithm name="hgcal:DDHGCalModuleAlgo">
+    <rParent name="hgcal:HGCalEE"/>
+    <Vector name="WaferName" type="string" nEntries="2">
+      hgcalwafer:HGCalEEWaferFine, hgcalwafer:HGCalEEWaferCoarse</Vector>
+    <Vector name="MaterialNames" type="string" nEntries="15">
+      materials:Graph.Epoxy Sup., materials:Tungsten,
+      materials:Tungsten, materials:Tungsten, hgcal:WCu, hgcal:WCu,
+      hgcal:WCu, materials:Copper, materials:Copper, materials:Air, 
+      materials:G10, materials:G10, materials:Kapton, materials:Air,
+      materials:Air</Vector>
+    <Vector name="VolumeNames" type="string" nEntries="15">
+      EEGlue,      EEAbsorber1, EEAbsorber2, EEAbsorber3,  EEAbsorber4, 
+      EEAbsorber5, EEAbsorber6, EECuFrame,   EEHeatShield, EESensitive,
+      EEPCB1,      EEPCB2,      EEKapton,    EEAirGap1,    EEAirGap2</Vector>
+    <Vector name="Thickness" type="numeric" nEntries="15">
+      0.1*mm, 2.1*mm,  2.8*mm,  4.2*mm,  0.6*mm,  1.2*mm, 2.2*mm, 
+      0.5*mm, 6.0*mm, 0.10*mm,  0.5*mm,  1.0*mm, 0.01*mm, 3.0*mm,
+      0.2*mm</Vector>
+    <Vector name="Layers" type="numeric" nEntries="4"> 
+      15, 15, 15, 15</Vector>
+    <Vector name="LayerThick" type="numeric" nEntries="4"> 
+      32.70*mm, 32.70*mm, 31.70*mm, 30.70*mm</Vector>
+    <Vector name="LayerType" type="numeric" nEntries="60"> 
+      3, 13, 13,  2, 13,  8,  6, 14,  9,  9,  9, 11, 13, 13, 11,
+      3, 13, 13,  2, 13,  8,  6, 14,  9,  9,  9, 11, 13, 13, 11,
+      3, 13, 13,  2, 13,  8,  6, 14,  9,  9,  9, 10, 13, 13, 10,
+      3, 13, 13,  2, 13,  8,  5, 14,  9,  9,  9, 10, 13, 13, 10
+    </Vector>
+    <Vector name="LayerSense" type="numeric" nEntries="60">
+      0,  0,  0,  0,  0,  0,  0,  0,  1,  1,  1,  0,  0,  0,  0,
+      0,  0,  0,  0,  0,  0,  0,  0,  1,  1,  1,  0,  0,  0,  0,
+      0,  0,  0,  0,  0,  0,  0,  0,  1,  1,  1,  0,  0,  0,  0,
+      0,  0,  0,  0,  0,  0,  0,  0,  1,  1,  1,  0,  0,  0,  0
+    </Vector>
+    <Numeric name="zMinBlock"   value="[hgcal:zminEE]"/>
+    <Numeric name="rMaxFine"    value="[rMaxFine]"/>
+    <Numeric name="waferW"      value="[hgcal:WaferW]"/>
+    <Numeric name="waferGap"    value="0.0*fm"/>
+    <Numeric name="Sectors"     value="12"/>
+    <Vector name="SlopeBottom" type="numeric" nEntries="2">
+      0.0, 0.0</Vector>
+    <Vector name="SlopeTop" type="numeric" nEntries="2">
+      0, 0</Vector>
+    <Vector name="ZFront" type="numeric" nEntries="2">
+      [hgcal:zminEE], [hgcal:zmaxEE]</Vector>
+    <Vector name="RMaxFront" type="numeric" nEntries="2">
+      [hgcal:rmaxEE], [hgcal:rmaxEE]</Vector>
+    <String name="RotNameSpace" value="hgcalmodule"/>
+  </Algorithm>
+</PosPartSection> 
+
+<SpecParSection label="hgcalEE.xml" eval="true">
+  <SpecPar name="HGCalEE">
+    <PartSelector path="//HGCalEESensitive.*"/>    
+    <Parameter name="Volume" value="HGCalEESensitive" eval="false"/>
+    <Parameter name="GeometryMode" value="HGCalGeometryMode::Hexagon" eval="false"/>
+    <Parameter name="RadiusBound"  value="[rMinFine]"/>
+    <Parameter name="RadiusBound"  value="[rMaxFine]"/>
+    <Parameter name="RadiusBound"  value="[rMaxMiddle]"/>
+    <Parameter name="RadiusBound"  value="[rMaxCoarse]"/>
+    <Parameter name="RadiusLimits" value="[rMin]"/>
+    <Parameter name="RadiusLimits" value="[rMax]"/>
+    <Parameter name="LevelTop"     value="99"/>
+  </SpecPar>
+</SpecParSection>
+
+</DDDefinition>
diff --git a/Geometry/HGCalTBCommonData/data/TB160/cms.xml b/Geometry/HGCalTBCommonData/data/TB160/cms.xml
new file mode 100644
index 0000000000000..cf97d9b61c069
--- /dev/null
+++ b/Geometry/HGCalTBCommonData/data/TB160/cms.xml
@@ -0,0 +1,35 @@
+<?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">
+
+<SolidSection label="hgcalwafer.xml">
+  <Tubs name="OCMS" rMin="0.0*fm" rMax="2.0*m" dz="40.0*m" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="CMSE" rMin="0.0*fm" rMax="2.0*m" dz="40.0*m" startPhi="0*deg" deltaPhi="360*deg"/>
+</SolidSection>
+
+<LogicalPartSection label="cms.xml">
+  <LogicalPart name="World" category="unspecified">
+    <rSolid name="OCMS"/>
+    <rMaterial name="materials:Air"/>
+  </LogicalPart>
+  <LogicalPart name="OCMS" category="unspecified">
+    <rSolid name="OCMS"/>
+    <rMaterial name="materials:Air"/>
+  </LogicalPart>
+  <LogicalPart name="CMSE" category="unspecified">
+    <rSolid name="CMSE"/>
+    <rMaterial name="materials:Air"/>
+  </LogicalPart>
+</LogicalPartSection>
+
+<PosPartSection label="cmsMother.xml">
+  <PosPart copyNumber="1">
+    <rParent name="cms:World"/>
+    <rChild name="cms:OCMS"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="cms:OCMS"/>
+    <rChild name="cms:CMSE"/>
+  </PosPart>
+</PosPartSection>
+
+</DDDefinition>
diff --git a/Geometry/HGCalTBCommonData/data/TB160/hgcProdCuts.xml b/Geometry/HGCalTBCommonData/data/TB160/hgcProdCuts.xml
new file mode 100644
index 0000000000000..3e605131eeb7c
--- /dev/null
+++ b/Geometry/HGCalTBCommonData/data/TB160/hgcProdCuts.xml
@@ -0,0 +1,15 @@
+<?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">
+
+<SpecParSection label="hgcProdCuts.xml" eval="true">
+  <SpecPar name="hgcProdCutsEE">
+    <PartSelector path="//HGCalEE"/>
+    <Parameter name="CMSCutsRegion" value="HGCalRegion" eval="false"/>
+    <Parameter name="ProdCutsForElectrons" value="0.03*mm"/>
+<Parameter name="ProdCutsForProtons" value="0.03*mm"/>
+    <Parameter name="ProdCutsForPositrons" value="0.03*mm"/>
+    <Parameter name="ProdCutsForGamma" value="0.03*mm"/>
+  </SpecPar>
+</SpecParSection>
+
+</DDDefinition>
diff --git a/Geometry/HGCalTBCommonData/data/TB160/hgcal.xml b/Geometry/HGCalTBCommonData/data/TB160/hgcal.xml
new file mode 100644
index 0000000000000..debf5b45925ae
--- /dev/null
+++ b/Geometry/HGCalTBCommonData/data/TB160/hgcal.xml
@@ -0,0 +1,58 @@
+<?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="rmax"        value="50.*cm"/>
+  <Constant name="rmaxEE"      value="10.0*cm"/>
+  <Constant name="zCalor"      value="20.0*cm"/>
+  <Constant name="zminEE"      value="0.0*fm"/>
+  <Constant name="zmaxEE"      value="25.896*cm"/>
+  <Constant name="zposCalo"    value="20.0*cm"/>
+  <Constant name="zposEE"      value="-[zCalor]"/>
+  <Constant name="WaferW"      value="123.7*mm"/>
+</ConstantsSection>
+
+<MaterialSection label="hgcal.xml">
+  <CompositeMaterial name="WCu" density="14.979*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.75">
+      <rMaterial name="materials:Tungsten"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.25">
+      <rMaterial name="materials:Copper"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+</MaterialSection>
+
+<SolidSection label="hgcal.xml">
+  <Tubs name="HGCal" rMin="0.0*fm" rMax="[rmax]" dz="[zCalor]" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Polycone name="HGCalEE" startPhi="0*deg" deltaPhi="360*deg">
+    <ZSection z="[zminEE]" rMin="0.0*fm" rMax="[rmaxEE]"/>
+    <ZSection z="[zmaxEE]" rMin="0.0*fm" rMax="[rmaxEE]"/>
+  </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>
+</LogicalPartSection>
+
+<PosPartSection label="hgcal.xml">
+  <PosPart copyNumber="1">
+    <rParent name="cms:CMSE"/>
+    <rChild name="hgcal:HGCal"/>
+    <Translation x="0*fm" y="0*fm" z="[zposCalo]"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcal:HGCal"/>
+    <rChild name="hgcal:HGCalEE"/>
+    <Translation x="0*fm" y="0*fm" z="[zposEE]"/>
+    <rRotation name="rotations:000D"/>
+  </PosPart>
+</PosPartSection>
+</DDDefinition>
diff --git a/Geometry/HGCalTBCommonData/data/TB160/hgcalBeam.xml b/Geometry/HGCalTBCommonData/data/TB160/hgcalBeam.xml
new file mode 100644
index 0000000000000..b73190f4972a1
--- /dev/null
+++ b/Geometry/HGCalTBCommonData/data/TB160/hgcalBeam.xml
@@ -0,0 +1,481 @@
+<?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="hgcalBeam.xml" eval="true">
+  <Constant name="dzCerenkov"  value="15600.0*mm"/>
+  <Constant name="dzMT6SC1"    value="6.25*mm"/>
+  <Constant name="dzAirSC1Tel" value="2996.75*mm"/>
+  <Constant name="dzTelescope" value="1020.0*mm"/>
+  <Constant name="dzAirSC2Tel" value="6450.0*mm"/>
+  <Constant name="dzMT6SC2"    value="3.2*mm"/>
+  <Constant name="dzAirSC23"   value="4626.8*mm"/>
+  <Constant name="dzMT6SC3"    value="3.2*mm"/>
+  <Constant name="dzAirGap1"   value="37.5*mm"/>
+  <Constant name="dzHeTube"    value="1550.0*mm"/>
+  <Constant name="dzAirGap2"   value="100.0*mm"/>
+  <Constant name="dzFeChamber" value="100.0*mm"/>
+  <Constant name="dzAirGap3"   value="1500.0*mm"/>
+  <Constant name="dzScint1"    value="5.0*mm"/>
+  <Constant name="dzAirGap4"   value="775.0*mm"/>
+  <Constant name="dzAirGap5"   value="50.0*mm"/>
+  <Constant name="dzScint2"    value="6.25*mm"/>
+  <Constant name="dzAirGap6"   value="25.0*mm"/>
+  <Constant name="dzAirGap7"   value="200.0*mm"/>
+  <Constant name="dzCFSiTrack" value="25.0*mm"/>
+  <Constant name="dzAirGap8"   value="437.5*mm"/>
+  <Constant name="dzAlPlate"   value="1.56*mm"/>
+  <Constant name="dzBox1"      value="([dzCerenkov]+[dzMT6SC1]+[dzAirSC1Tel]+
+				      [dzTelescope]+[dzAirSC2Tel]+
+				      [dzMT6SC2]+[dzAirSC23])"/>
+  <Constant name="dzBox"       value="([dzBox1]+
+				      [dzMT6SC3]+[dzAirGap1]+[dzHeTube]+
+				      [dzAirGap2]+[dzFeChamber]+[dzAirGap3]+
+				      [dzScint1]+[dzAirGap4]+[dzFeChamber]+
+				      [dzAirGap5]+[dzScint2]+[dzAirGap6]+
+				      [dzScint2]+[dzAirGap7]+[dzCFSiTrack]+
+				      [dzAirGap8]+[dzAlPlate])"/>
+  <Constant name="zCerenkov"   value="0.5*([dzCerenkov]-[dzBox])"/>
+  <Constant name="zMT6SC1"     value="-2209.505*mm"/>
+<!--
+  <Constant name="zMT6SC1"     value="([dzCerenkov]+0.5*([dzMT6SC1]-[dzBox])"/>
+  <Constant name="zTelescope"  value="([zMT6SC1]+[dzAirSC1Tel]+
+				      0.5*([dzTelescope]+[dzMT6SC1])"/>
+  <Constant name="zMT6SC2"     value="([zTelescope]+[dzAirSC2Tel]+
+				      0.5*([dzTelescope]+[dzMT6SC2])"/>
+-->
+  <Constant name="zTelescope"  value="1300.37*mm"/>
+  <Constant name="zMT6SC2"     value="8261.97*mm"/>
+  <Constant name="zMT6SC3"     value="([dzBox1]+0.5*([dzMT6SC3]-[dzBox]))"/>
+  <Constant name="zHeTube"     value="([zMT6SC3]+[dzAirGap1]+
+				      0.5*([dzMT6SC3]+[dzHeTube]))"/>
+  <Constant name="zFeChamber1" value="([zHeTube]+[dzAirGap2]+
+				      0.5*([dzHeTube]+[dzFeChamber]))"/>
+  <Constant name="zScint1"     value="([zFeChamber1]+[dzAirGap3]+
+				      0.5*([dzScint1]+[dzFeChamber]))"/>
+  <Constant name="zFeChamber2" value="([zScint1]+[dzAirGap4]+
+				      0.5*([dzScint1]+[dzFeChamber]))"/>
+  <Constant name="zScint2"     value="([zFeChamber2]+[dzAirGap5]+
+                                      0.5*([dzScint2]+[dzFeChamber]))"/>
+  <Constant name="zScint3"     value="([zScint2]+[dzAirGap6]+[dzScint2])"/>
+  <Constant name="zCFSiTrack"  value="([zScint3]+[dzAirGap7]+
+				      0.5*([dzScint2]+[dzCFSiTrack]))"/>
+  <Constant name="zAlPlate"    value="([zCFSiTrack]+[dzAirGap8]+
+				      0.5*([dzAlPlate]+[dzCFSiTrack]))"/>
+  <Constant name="dzAlChamb"   value="0.625*mm"/>
+  <Constant name="dzGasChamb"  value="18.75*mm"/>
+  <Constant name="zAlChamb"    value="-0.5*[dzAlChamb]"/>
+  <Constant name="zGasChamb"   value="0.5*[dzGasChamb]"/>
+  <Constant name="dzCFTrack"   value="0.70*mm"/>
+  <Constant name="dzSiTrack"   value="0.30*mm"/>
+  <Constant name="zSiTrack1"   value="0.5*([dzSiTrack]-[dzCFSiTrack])"/>
+  <Constant name="zCFTrack1"   value="([zSiTrack1]+0.5*([dzSiTrack]+[dzCFTrack]))"/>
+  <Constant name="zCFTrack2"   value="0.5*([dzCFSiTrack]-[dzCFTrack])"/>
+  <Constant name="zSiTrack2"   value="([zCFTrack2]-0.5*([dzSiTrack]+[dzCFTrack]))"/>
+  <Constant name="dzGlass"     value="2.5*mm"/>
+  <Constant name="zGlass1"     value="0.5*([dzGlass]-[dzCerenkov])"/>
+  <Constant name="zGlass2"     value="([zGlass1]+2920.0*mm)"/>
+  <Constant name="zGlass4"     value="0.5*([dzCerenkov]-[dzGlass])"/>
+  <Constant name="zGlass3"     value="([zGlass4]-2920.0*mm)"/>
+  <Constant name="dzSilicon1"  value="0.6*mm"/>
+  <Constant name="dzCFiber1"   value="1.0*mm"/>
+  <Constant name="dzFR4"       value="1.0*mm"/>
+  <Constant name="dzSilicon2"  value="0.3*mm"/>
+  <Constant name="dzCFiber2"   value="0.5*mm"/>
+  <Constant name="dzChamber1"  value="2.0*([dzSilicon1]+[dzFR4]+[dzCFiber1]+
+				      [dzSilicon2]+[dzCFiber2])"/>
+  <Constant name="dzChamber2"  value="6.0*([dzSilicon2]+[dzCFiber2])"/>
+  <Constant name="zposTB"      value="-0.5*[dzBox]"/>
+</ConstantsSection>
+
+<SolidSection label="hgcalBeam.xml">
+  <Box  name="HGCalTB"      dx="10.0*cm" dy="10.0*cm" dz="[dzBox]/2"/>
+  <Box  name="HGCCerenkov"  dx="5.0*cm"  dy="5.0*cm"  dz="[dzCerenkov]/2"/>
+  <Box  name="HGCTelescope" dx="8.5*cm"  dy="8.5*cm"  dz="[dzTelescope]/2"/>
+  <Box  name="HGCMT6SC1"    dx="5.0*cm"  dy="5.0*cm"  dz="[dzMT6SC1]/2"/>
+  <Box  name="HGCMT6SC2"    dx="5.0*cm"  dy="5.0*cm"  dz="[dzMT6SC2]/2"/>
+  <Box  name="HGCMT6SC3"    dx="5.0*cm"  dy="5.0*cm"  dz="[dzMT6SC3]/2"/>
+  <Tubs name="HGCHeTube" rMin="0.0*fm" rMax="5.0*cm" dz="[dzHeTube]/2" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Box  name="HGCFeChamber" dx="5.0*cm"  dy="5.0*cm"  dz="[dzFeChamber]/2"/>
+  <Box  name="HGCScint1"    dx="4.0*cm"  dy="4.75*cm" dz="[dzScint1]/2"/>
+  <Box  name="HGCScint2"    dx="3.5*cm"  dy="3.5*cm"  dz="[dzScint2]/2"/>
+  <Box  name="HGCFSiTrack"  dx="1.62*cm" dy="0.81*cm" dz="[dzCFSiTrack]/2"/>
+  <Box  name="HGCFTrack"    dx="1.62*cm" dy="0.81*cm" dz="[dzCFTrack]/2"/>
+  <Box  name="HGCAlPlate"   dx="5.0*cm"  dy="5.0*cm"  dz="[dzAlPlate]/2"/>
+  <Box  name="HGCCerWindw"  dx="5.0*cm"  dy="5.0*cm"  dz="[dzGlass]/2"/>
+  <Box  name="HGCAlChamb"   dx="5.0*cm"  dy="5.0*cm"  dz="[dzAlChamb]/2"/>
+  <Box  name="HGCGasChamb"  dx="5.0*cm"  dy="5.0*cm"  dz="[dzGasChamb]/2"/>
+  <Box  name="HGCChamber1"  dx="8.5*cm"  dy="8.5*cm"  dz="[dzChamber1]/2"/>
+  <Box  name="HGCChamber2"  dx="8.5*cm"  dy="8.5*cm"  dz="[dzChamber2]/2"/>
+  <Box  name="HGCSilicon1"  dx="8.5*cm"  dy="8.5*cm"  dz="[dzSilicon1]/2"/>
+  <Box  name="HGCFR4"       dx="8.5*cm"  dy="8.5*cm"  dz="[dzFR4]/2"/>
+  <Box  name="HGCCFiber1"   dx="8.5*cm"  dy="8.5*cm"  dz="[dzCFiber1]/2"/>
+  <Box  name="HGCSilicon2"  dx="8.5*cm"  dy="8.5*cm"  dz="[dzSilicon2]/2"/>
+  <Box  name="HGCCFiber2"   dx="8.5*cm"  dy="8.5*cm"  dz="[dzCFiber2]/2"/>
+  <Box  name="HGCSiTrack"   dx="1.62*cm" dy="0.81*cm" dz="[dzSiTrack]/2"/>
+ </SolidSection>
+
+<LogicalPartSection label="hgcalBeam.xml">
+  <LogicalPart name="HGCalTB" category="unspecified">
+    <rSolid name="HGCalTB"/>
+    <rMaterial name="materials:Air"/>
+  </LogicalPart>
+  <LogicalPart name="HGCCerenkov" category="unspecified">
+    <rSolid name="HGCCerenkov"/>
+    <rMaterial name="materials:Air"/>
+  </LogicalPart>
+  <LogicalPart name="HGCCerWindw" category="unspecified">
+    <rSolid name="HGCCerWindw"/>
+    <rMaterial name="materials:Glass"/>
+  </LogicalPart>
+  <LogicalPart name="HGCMT6SC1" category="unspecified">
+    <rSolid name="HGCMT6SC1"/>
+    <rMaterial name="materials:Scintillator"/>
+  </LogicalPart>
+  <LogicalPart name="HGCTelescope" category="unspecified">
+    <rSolid name="HGCTelescope"/>
+    <rMaterial name="materials:Air"/>
+  </LogicalPart>
+  <LogicalPart name="HGCMT6SC2" category="unspecified">
+    <rSolid name="HGCMT6SC2"/>
+    <rMaterial name="materials:Scintillator"/>
+  </LogicalPart>
+  <LogicalPart name="HGCMT6SC3" category="unspecified">
+    <rSolid name="HGCMT6SC3"/>
+    <rMaterial name="materials:Scintillator"/>
+  </LogicalPart>
+  <LogicalPart name="HGCHeTube" category="unspecified">
+    <rSolid name="HGCHeTube"/>
+    <rMaterial name="materials:Helium"/>
+  </LogicalPart>
+  <LogicalPart name="HGCFeChamber" category="unspecified">
+    <rSolid name="HGCFeChamber"/>
+    <rMaterial name="materials:Air"/>
+  </LogicalPart>
+  <LogicalPart name="HGCAlChamb" category="unspecified">
+    <rSolid name="HGCAlChamb"/>
+    <rMaterial name="materials:Aluminium"/>
+  </LogicalPart>
+  <LogicalPart name="HGCGasChamb" category="unspecified">
+    <rSolid name="HGCGasChamb"/>
+    <rMaterial name="materials:80pct Argon plus 20pct CO_2"/>
+  </LogicalPart>
+  <LogicalPart name="HGCScint1" category="unspecified">
+    <rSolid name="HGCScint1"/>
+    <rMaterial name="materials:Scintillator"/>
+  </LogicalPart>
+  <LogicalPart name="HGCScint2" category="unspecified">
+    <rSolid name="HGCScint2"/>
+    <rMaterial name="materials:Scintillator"/>
+  </LogicalPart>
+  <LogicalPart name="HGCFSiTrack" category="unspecified">
+    <rSolid name="HGCFSiTrack"/>
+    <rMaterial name="materials:Air"/>
+  </LogicalPart>
+  <LogicalPart name="HGCFTrack" category="unspecified">
+    <rSolid name="HGCFTrack"/>
+    <rMaterial name="materials:Carbon fib.str."/>
+  </LogicalPart>
+  <LogicalPart name="HGCSiTrack" category="unspecified">
+    <rSolid name="HGCSiTrack"/>
+    <rMaterial name="materials:Silicon"/>
+  </LogicalPart>
+  <LogicalPart name="HGCAlPlate" category="unspecified">
+    <rSolid name="HGCAlPlate"/>
+    <rMaterial name="materials:Aluminium"/>
+  </LogicalPart>
+  <LogicalPart name="HGCChamber1" category="unspecified">
+    <rSolid name="HGCChamber1"/>
+    <rMaterial name="materials:Air"/>
+  </LogicalPart>
+  <LogicalPart name="HGCChamber2" category="unspecified">
+    <rSolid name="HGCChamber2"/>
+    <rMaterial name="materials:Air"/>
+  </LogicalPart>
+  <LogicalPart name="HGCSilicon1" category="unspecified">
+    <rSolid name="HGCSilicon1"/>
+    <rMaterial name="materials:Silicon"/>
+  </LogicalPart>
+  <LogicalPart name="HGCFR4" category="unspecified">
+    <rSolid name="HGCFR4"/>
+    <rMaterial name="materials:M_NEMA FR4 plate"/>
+  </LogicalPart>
+  <LogicalPart name="HGCCFiber1" category="unspecified">
+    <rSolid name="HGCCFiber1"/>
+    <rMaterial name="materials:Carbon fib.str."/>
+  </LogicalPart>
+  <LogicalPart name="HGCSilicon2" category="unspecified">
+    <rSolid name="HGCSilicon2"/>
+    <rMaterial name="materials:Silicon"/>
+  </LogicalPart>
+  <LogicalPart name="HGCCFiber2" category="unspecified">
+    <rSolid name="HGCCFiber2"/>
+    <rMaterial name="materials:Carbon fib.str."/>
+  </LogicalPart>
+</LogicalPartSection>
+
+<PosPartSection label="hgcalBeam.xml">
+  <PosPart copyNumber="1">
+    <rParent name="cms:CMSE"/>
+    <rChild name="hgcalBeam:HGCalTB"/>
+    <Translation x="0*fm" y="0*fm" z="[zposTB]"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcalBeam:HGCalTB"/>
+    <rChild name="hgcalBeam:HGCCerenkov"/>
+    <Translation x="0*fm" y="0*fm" z="[zCerenkov]"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcalBeam:HGCalTB"/>
+    <rChild name="hgcalBeam:HGCMT6SC1"/>
+    <Translation x="0*fm" y="0*fm" z="[zMT6SC1]"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcalBeam:HGCalTB"/>
+    <rChild name="hgcalBeam:HGCTelescope"/>
+    <Translation x="0*fm" y="0*fm" z="[zTelescope]"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcalBeam:HGCalTB"/>
+    <rChild name="hgcalBeam:HGCMT6SC2"/>
+    <Translation x="0*fm" y="0*fm" z="[zMT6SC2]"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcalBeam:HGCalTB"/>
+    <rChild name="hgcalBeam:HGCMT6SC3"/>
+    <Translation x="0*fm" y="0*fm" z="[zMT6SC3]"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcalBeam:HGCalTB"/>
+    <rChild name="hgcalBeam:HGCHeTube"/>
+    <Translation x="0*fm" y="0*fm" z="[zHeTube]"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcalBeam:HGCalTB"/>
+    <rChild name="hgcalBeam:HGCFeChamber"/>
+    <Translation x="0*fm" y="0*fm" z="[zFeChamber1]"/>
+  </PosPart>
+  <PosPart copyNumber="2">
+    <rParent name="hgcalBeam:HGCalTB"/>
+    <rChild name="hgcalBeam:HGCFeChamber"/>
+    <Translation x="0*fm" y="0*fm" z="[zFeChamber2]"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcalBeam:HGCalTB"/>
+    <rChild name="hgcalBeam:HGCScint1"/>
+    <Translation x="0*fm" y="0*fm" z="[zScint1]"/>
+  </PosPart>
+  <PosPart copyNumber="2">
+    <rParent name="hgcalBeam:HGCalTB"/>
+    <rChild name="hgcalBeam:HGCScint2"/>
+    <Translation x="0*fm" y="0*fm" z="[zScint2]"/>
+  </PosPart>
+  <PosPart copyNumber="3">
+    <rParent name="hgcalBeam:HGCalTB"/>
+    <rChild name="hgcalBeam:HGCScint2"/>
+    <Translation x="0*fm" y="0*fm" z="[zScint3]"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcalBeam:HGCalTB"/>
+    <rChild name="hgcalBeam:HGCFSiTrack"/>
+    <Translation x="0*fm" y="0*fm" z="[zCFSiTrack]"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcalBeam:HGCalTB"/>
+    <rChild name="hgcalBeam:HGCAlPlate"/>
+    <Translation x="0*fm" y="0*fm" z="[zAlPlate]"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcalBeam:HGCCerenkov"/>
+    <rChild name="hgcalBeam:HGCCerWindw"/>
+    <Translation x="0*fm" y="0*fm" z="[zGlass1]"/>
+  </PosPart>
+  <PosPart copyNumber="2">
+    <rParent name="hgcalBeam:HGCCerenkov"/>
+    <rChild name="hgcalBeam:HGCCerWindw"/>
+    <Translation x="0*fm" y="0*fm" z="[zGlass2]"/>
+  </PosPart>
+  <PosPart copyNumber="3">
+    <rParent name="hgcalBeam:HGCCerenkov"/>
+    <rChild name="hgcalBeam:HGCCerWindw"/>
+    <Translation x="0*fm" y="0*fm" z="[zGlass3]"/>
+  </PosPart>
+  <PosPart copyNumber="4">
+    <rParent name="hgcalBeam:HGCCerenkov"/>
+    <rChild name="hgcalBeam:HGCCerWindw"/>
+    <Translation x="0*fm" y="0*fm" z="[zGlass4]"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcalBeam:HGCTelescope"/>
+    <rChild name="hgcalBeam:HGCChamber1"/>
+    <Translation x="0*fm" y="0*fm" z="-360.0*mm"/>
+  </PosPart>
+  <PosPart copyNumber="2">
+    <rParent name="hgcalBeam:HGCTelescope"/>
+    <rChild name="hgcalBeam:HGCChamber1"/>
+    <Translation x="0*fm" y="0*fm" z="-320.0*mm"/>
+  </PosPart>
+  <PosPart copyNumber="3">
+    <rParent name="hgcalBeam:HGCTelescope"/>
+    <rChild name="hgcalBeam:HGCChamber1"/>
+    <Translation x="0*fm" y="0*fm" z="320.0*mm"/>
+  </PosPart>
+  <PosPart copyNumber="4">
+    <rParent name="hgcalBeam:HGCTelescope"/>
+    <rChild name="hgcalBeam:HGCChamber1"/>
+    <Translation x="0*fm" y="0*fm" z="360.0*mm"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcalBeam:HGCTelescope"/>
+    <rChild name="hgcalBeam:HGCChamber2"/>
+    <Translation x="0*fm" y="0*fm" z="0.0*mm"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcalBeam:HGCChamber1"/>
+    <rChild name="hgcalBeam:HGCSilicon1"/>
+    <Translation x="0*fm" y="0*fm" z="-3.1*mm"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcalBeam:HGCChamber1"/>
+    <rChild name="hgcalBeam:HGCFR4"/>
+    <Translation x="0*fm" y="0*fm" z="-2.3*mm"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcalBeam:HGCChamber1"/>
+    <rChild name="hgcalBeam:HGCCFiber1"/>
+    <Translation x="0*fm" y="0*fm" z="-1.3*mm"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcalBeam:HGCChamber1"/>
+    <rChild name="hgcalBeam:HGCSilicon2"/>
+    <Translation x="0*fm" y="0*fm" z="-0.65*mm"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcalBeam:HGCChamber1"/>
+    <rChild name="hgcalBeam:HGCCFiber2"/>
+    <Translation x="0*fm" y="0*fm" z="-0.25*mm"/>
+  </PosPart>
+  <PosPart copyNumber="2">
+    <rParent name="hgcalBeam:HGCChamber1"/>
+    <rChild name="hgcalBeam:HGCSilicon1"/>
+    <Translation x="0*fm" y="0*fm" z="0.30*mm"/>
+  </PosPart>
+  <PosPart copyNumber="2">
+    <rParent name="hgcalBeam:HGCChamber1"/>
+    <rChild name="hgcalBeam:HGCFR4"/>
+    <Translation x="0*fm" y="0*fm" z="1.10*mm"/>
+  </PosPart>
+  <PosPart copyNumber="2">
+    <rParent name="hgcalBeam:HGCChamber1"/>
+    <rChild name="hgcalBeam:HGCCFiber1"/>
+    <Translation x="0*fm" y="0*fm" z="2.10*mm"/>
+  </PosPart>
+  <PosPart copyNumber="2">
+    <rParent name="hgcalBeam:HGCChamber1"/>
+    <rChild name="hgcalBeam:HGCSilicon2"/>
+    <Translation x="0*fm" y="0*fm" z="2.75*mm"/>
+  </PosPart>
+  <PosPart copyNumber="2">
+    <rParent name="hgcalBeam:HGCChamber1"/>
+    <rChild name="hgcalBeam:HGCCFiber2"/>
+    <Translation x="0*fm" y="0*fm" z="3.15*mm"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcalBeam:HGCChamber2"/>
+    <rChild name="hgcalBeam:HGCSilicon2"/>
+    <Translation x="0*fm" y="0*fm" z="-2.25*mm"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcalBeam:HGCChamber2"/>
+    <rChild name="hgcalBeam:HGCCFiber2"/>
+    <Translation x="0*fm" y="0*fm" z="-1.85*mm"/>
+  </PosPart>
+  <PosPart copyNumber="2">
+    <rParent name="hgcalBeam:HGCChamber2"/>
+    <rChild name="hgcalBeam:HGCSilicon2"/>
+    <Translation x="0*fm" y="0*fm" z="-1.45*mm"/>
+  </PosPart>
+  <PosPart copyNumber="2">
+    <rParent name="hgcalBeam:HGCChamber2"/>
+    <rChild name="hgcalBeam:HGCCFiber2"/>
+    <Translation x="0*fm" y="0*fm" z="-1.05*mm"/>
+  </PosPart>
+  <PosPart copyNumber="3">
+    <rParent name="hgcalBeam:HGCChamber2"/>
+    <rChild name="hgcalBeam:HGCSilicon2"/>
+    <Translation x="0*fm" y="0*fm" z="-0.65*mm"/>
+  </PosPart>
+  <PosPart copyNumber="3">
+    <rParent name="hgcalBeam:HGCChamber2"/>
+    <rChild name="hgcalBeam:HGCCFiber2"/>
+    <Translation x="0*fm" y="0*fm" z="-0.25*mm"/>
+  </PosPart>
+  <PosPart copyNumber="4">
+    <rParent name="hgcalBeam:HGCChamber2"/>
+    <rChild name="hgcalBeam:HGCSilicon2"/>
+    <Translation x="0*fm" y="0*fm" z="0.15*mm"/>
+  </PosPart>
+  <PosPart copyNumber="4">
+    <rParent name="hgcalBeam:HGCChamber2"/>
+    <rChild name="hgcalBeam:HGCCFiber2"/>
+    <Translation x="0*fm" y="0*fm" z="0.55*mm"/>
+  </PosPart>
+  <PosPart copyNumber="5">
+    <rParent name="hgcalBeam:HGCChamber2"/>
+    <rChild name="hgcalBeam:HGCSilicon2"/>
+    <Translation x="0*fm" y="0*fm" z="0.95*mm"/>
+  </PosPart>
+  <PosPart copyNumber="5">
+    <rParent name="hgcalBeam:HGCChamber2"/>
+    <rChild name="hgcalBeam:HGCCFiber2"/>
+    <Translation x="0*fm" y="0*fm" z="1.35*mm"/>
+  </PosPart>
+  <PosPart copyNumber="6">
+    <rParent name="hgcalBeam:HGCChamber2"/>
+    <rChild name="hgcalBeam:HGCSilicon2"/>
+    <Translation x="0*fm" y="0*fm" z="1.75*mm"/>
+  </PosPart>
+  <PosPart copyNumber="6">
+    <rParent name="hgcalBeam:HGCChamber2"/>
+    <rChild name="hgcalBeam:HGCCFiber2"/>
+    <Translation x="0*fm" y="0*fm" z="2.15*mm"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcalBeam:HGCFeChamber"/>
+    <rChild name="hgcalBeam:HGCAlChamb"/>
+    <Translation x="0*fm" y="0*fm" z="[zAlChamb]"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcalBeam:HGCFeChamber"/>
+    <rChild name="hgcalBeam:HGCGasChamb"/>
+    <Translation x="0*fm" y="0*fm" z="[zGasChamb]"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcalBeam:HGCFSiTrack"/>
+    <rChild name="hgcalBeam:HGCFTrack"/>
+    <Translation x="0*fm" y="0*fm" z="[zCFTrack1]"/>
+  </PosPart>
+  <PosPart copyNumber="2">
+    <rParent name="hgcalBeam:HGCFSiTrack"/>
+    <rChild name="hgcalBeam:HGCFTrack"/>
+    <Translation x="0*fm" y="0*fm" z="[zCFTrack2]"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcalBeam:HGCFSiTrack"/>
+    <rChild name="hgcalBeam:HGCSiTrack"/>
+    <Translation x="0*fm" y="0*fm" z="[zSiTrack1]"/>
+  </PosPart>
+  <PosPart copyNumber="2">
+    <rParent name="hgcalBeam:HGCFSiTrack"/>
+    <rChild name="hgcalBeam:HGCSiTrack"/>
+    <Translation x="0*fm" y="0*fm" z="[zSiTrack2]"/>
+  </PosPart>
+</PosPartSection>
+
+<SpecParSection label="hgcalBeam.xml" eval="true">
+  <SpecPar name="hgcalBeam">
+    <PartSelector path="//HGCScint.*"/>
+    <Parameter name="SensitiveDetector" value="HGCalTB1601SensitiveDetector" eval="false"/>
+    <Parameter name="ReadOutName" value="HcalTB06BeamHits" eval="false"/>
+  </SpecPar>
+</SpecParSection>
+</DDDefinition>
diff --git a/Geometry/HGCalTBCommonData/data/TB160/hgcalCons.xml b/Geometry/HGCalTBCommonData/data/TB160/hgcalCons.xml
new file mode 100644
index 0000000000000..eada262817499
--- /dev/null
+++ b/Geometry/HGCalTBCommonData/data/TB160/hgcalCons.xml
@@ -0,0 +1,277 @@
+<?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">
+
+<SpecParSection label="hgcalReco.xml" eval="true">
+  <SpecPar name="HGCalEEWafer">
+    <PartSelector path="//HGCalEEWafer.*"/>
+    <Parameter name="Volume" value="HGCalEEWafer" eval="false"/>
+    <Parameter name="WaferSize"      value="[hgcal:WaferW]"/>
+  </SpecPar>
+  <SpecPar name="HGCalEECell">
+    <PartSelector path="//HGCalEECell.*"/>
+    <Parameter name="Volume" value="HGCalEECell" eval="false"/>
+    <Parameter name="CellSize"      value="[hgcalwafer:CellWF]"/>
+    <Parameter name="CellSize"      value="[hgcalwafer:CellWC]"/>
+  </SpecPar>
+  <SpecPar name="HGCalEESensitive">
+    <PartSelector path="//HGCalEESensitive.*"/>
+    <Parameter name="Volume" value="HGCalEESensitive" eval="false"/>
+    <Parameter name="Slope"          value="0.0"/>
+    <Parameter name="GroupingZFine"  value="1"/>
+    <Parameter name="GroupingZFine"  value="1"/>
+    <Parameter name="GroupingZFine"  value="-1"/>
+    <Parameter name="GroupingZFine"  value="-1"/>
+    <Parameter name="GroupingZFine"  value="2"/>
+    <Parameter name="GroupingZFine"  value="2"/>
+    <Parameter name="GroupingZFine"  value="3"/>
+    <Parameter name="GroupingZFine"  value="3"/>
+    <Parameter name="GroupingZFine"  value="-1"/>
+    <Parameter name="GroupingZFine"  value="-1"/>
+    <Parameter name="GroupingZFine"  value="4"/>
+    <Parameter name="GroupingZFine"  value="4"/>
+    <Parameter name="GroupingZFine"  value="5"/>
+    <Parameter name="GroupingZFine"  value="5"/>
+    <Parameter name="GroupingZFine"  value="-1"/>
+    <Parameter name="GroupingZFine"  value="-1"/>
+    <Parameter name="GroupingZFine"  value="6"/>
+    <Parameter name="GroupingZFine"  value="6"/>
+    <Parameter name="GroupingZFine"  value="7"/>
+    <Parameter name="GroupingZFine"  value="7"/>
+    <Parameter name="GroupingZFine"  value="-1"/>
+    <Parameter name="GroupingZFine"  value="-1"/>
+    <Parameter name="GroupingZFine"  value="8"/>
+    <Parameter name="GroupingZFine"  value="8"/>
+    <Parameter name="GroupingZFine"  value="9"/>
+    <Parameter name="GroupingZFine"  value="9"/>
+    <Parameter name="GroupingZFine"  value="-1"/>
+    <Parameter name="GroupingZFine"  value="-1"/>
+    <Parameter name="GroupingZFine"  value="10"/>
+    <Parameter name="GroupingZFine"  value="10"/>
+    <Parameter name="GroupingZFine"  value="11"/>
+    <Parameter name="GroupingZFine"  value="11"/>
+    <Parameter name="GroupingZFine"  value="-1"/>
+    <Parameter name="GroupingZFine"  value="-1"/>
+    <Parameter name="GroupingZFine"  value="12"/>
+    <Parameter name="GroupingZFine"  value="12"/>
+    <Parameter name="GroupingZFine"  value="13"/>
+    <Parameter name="GroupingZFine"  value="13"/>
+    <Parameter name="GroupingZFine"  value="-1"/>
+    <Parameter name="GroupingZFine"  value="-1"/>
+    <Parameter name="GroupingZFine"  value="14"/>
+    <Parameter name="GroupingZFine"  value="14"/>
+    <Parameter name="GroupingZFine"  value="15"/>
+    <Parameter name="GroupingZFine"  value="15"/>
+    <Parameter name="GroupingZFine"  value="-1"/>
+    <Parameter name="GroupingZFine"  value="-1"/>
+    <Parameter name="GroupingZFine"  value="16"/>
+    <Parameter name="GroupingZFine"  value="16"/>
+    <Parameter name="GroupingZFine"  value="17"/>
+    <Parameter name="GroupingZFine"  value="17"/>
+    <Parameter name="GroupingZFine"  value="-1"/>
+    <Parameter name="GroupingZFine"  value="-1"/>
+    <Parameter name="GroupingZFine"  value="18"/>
+    <Parameter name="GroupingZFine"  value="18"/>
+    <Parameter name="GroupingZFine"  value="19"/>
+    <Parameter name="GroupingZFine"  value="19"/>
+    <Parameter name="GroupingZFine"  value="-1"/>
+    <Parameter name="GroupingZFine"  value="-1"/>
+    <Parameter name="GroupingZFine"  value="20"/>
+    <Parameter name="GroupingZFine"  value="20"/>
+    <Parameter name="GroupingZFine"  value="21"/>
+    <Parameter name="GroupingZFine"  value="21"/>
+    <Parameter name="GroupingZFine"  value="-1"/>
+    <Parameter name="GroupingZFine"  value="-1"/>
+    <Parameter name="GroupingZFine"  value="22"/>
+    <Parameter name="GroupingZFine"  value="22"/>
+    <Parameter name="GroupingZFine"  value="23"/>
+    <Parameter name="GroupingZFine"  value="23"/>
+    <Parameter name="GroupingZFine"  value="-1"/>
+    <Parameter name="GroupingZFine"  value="-1"/>
+    <Parameter name="GroupingZFine"  value="24"/>
+    <Parameter name="GroupingZFine"  value="24"/>
+    <Parameter name="GroupingZFine"  value="25"/>
+    <Parameter name="GroupingZFine"  value="25"/>
+    <Parameter name="GroupingZFine"  value="-1"/>
+    <Parameter name="GroupingZFine"  value="-1"/>
+    <Parameter name="GroupingZFine"  value="26"/>
+    <Parameter name="GroupingZFine"  value="26"/>
+    <Parameter name="GroupingZFine"  value="27"/>
+    <Parameter name="GroupingZFine"  value="27"/>
+    <Parameter name="GroupingZFine"  value="-1"/>
+    <Parameter name="GroupingZFine"  value="-1"/>
+    <Parameter name="GroupingZFine"  value="28"/>
+    <Parameter name="GroupingZFine"  value="28"/>
+    <Parameter name="GroupingZMid"   value="1"/>
+    <Parameter name="GroupingZMid"   value="1"/>
+    <Parameter name="GroupingZMid"   value="-1"/>
+    <Parameter name="GroupingZMid"   value="-1"/>
+    <Parameter name="GroupingZMid"   value="2"/>
+    <Parameter name="GroupingZMid"   value="2"/>
+    <Parameter name="GroupingZMid"   value="3"/>
+    <Parameter name="GroupingZMid"   value="3"/>
+    <Parameter name="GroupingZMid"   value="-1"/>
+    <Parameter name="GroupingZMid"   value="-1"/>
+    <Parameter name="GroupingZMid"   value="4"/>
+    <Parameter name="GroupingZMid"   value="4"/>
+    <Parameter name="GroupingZMid"   value="5"/>
+    <Parameter name="GroupingZMid"   value="5"/>
+    <Parameter name="GroupingZMid"   value="-1"/>
+    <Parameter name="GroupingZMid"   value="-1"/>
+    <Parameter name="GroupingZMid"   value="6"/>
+    <Parameter name="GroupingZMid"   value="6"/>
+    <Parameter name="GroupingZMid"   value="7"/>
+    <Parameter name="GroupingZMid"   value="7"/>
+    <Parameter name="GroupingZMid"   value="-1"/>
+    <Parameter name="GroupingZMid"   value="-1"/>
+    <Parameter name="GroupingZMid"   value="8"/>
+    <Parameter name="GroupingZMid"   value="8"/>
+    <Parameter name="GroupingZMid"   value="9"/>
+    <Parameter name="GroupingZMid"   value="9"/>
+    <Parameter name="GroupingZMid"   value="-1"/>
+    <Parameter name="GroupingZMid"   value="-1"/>
+    <Parameter name="GroupingZMid"   value="10"/>
+    <Parameter name="GroupingZMid"   value="10"/>
+    <Parameter name="GroupingZMid"   value="11"/>
+    <Parameter name="GroupingZMid"   value="11"/>
+    <Parameter name="GroupingZMid"   value="-1"/>
+    <Parameter name="GroupingZMid"   value="-1"/>
+    <Parameter name="GroupingZMid"   value="12"/>
+    <Parameter name="GroupingZMid"   value="12"/>
+    <Parameter name="GroupingZMid"   value="13"/>
+    <Parameter name="GroupingZMid"   value="13"/>
+    <Parameter name="GroupingZMid"   value="-1"/>
+    <Parameter name="GroupingZMid"   value="-1"/>
+    <Parameter name="GroupingZMid"   value="14"/>
+    <Parameter name="GroupingZMid"   value="14"/>
+    <Parameter name="GroupingZMid"   value="15"/>
+    <Parameter name="GroupingZMid"   value="15"/>
+    <Parameter name="GroupingZMid"   value="-1"/>
+    <Parameter name="GroupingZMid"   value="-1"/>
+    <Parameter name="GroupingZMid"   value="16"/>
+    <Parameter name="GroupingZMid"   value="16"/>
+    <Parameter name="GroupingZMid"   value="17"/>
+    <Parameter name="GroupingZMid"   value="17"/>
+    <Parameter name="GroupingZMid"   value="-1"/>
+    <Parameter name="GroupingZMid"   value="-1"/>
+    <Parameter name="GroupingZMid"   value="18"/>
+    <Parameter name="GroupingZMid"   value="18"/>
+    <Parameter name="GroupingZMid"   value="19"/>
+    <Parameter name="GroupingZMid"   value="19"/>
+    <Parameter name="GroupingZMid"   value="-1"/>
+    <Parameter name="GroupingZMid"   value="-10"/>
+    <Parameter name="GroupingZMid"   value="20"/>
+    <Parameter name="GroupingZMid"   value="20"/>
+    <Parameter name="GroupingZMid"   value="21"/>
+    <Parameter name="GroupingZMid"   value="21"/>
+    <Parameter name="GroupingZMid"   value="-1"/>
+    <Parameter name="GroupingZMid"   value="-1"/>
+    <Parameter name="GroupingZMid"   value="22"/>
+    <Parameter name="GroupingZMid"   value="22"/>
+    <Parameter name="GroupingZMid"   value="23"/>
+    <Parameter name="GroupingZMid"   value="23"/>
+    <Parameter name="GroupingZMid"   value="-1"/>
+    <Parameter name="GroupingZMid"   value="-1"/>
+    <Parameter name="GroupingZMid"   value="24"/>
+    <Parameter name="GroupingZMid"   value="24"/>
+    <Parameter name="GroupingZMid"   value="25"/>
+    <Parameter name="GroupingZMid"   value="25"/>
+    <Parameter name="GroupingZMid"   value="-1"/>
+    <Parameter name="GroupingZMid"   value="-1"/>
+    <Parameter name="GroupingZMid"   value="26"/>
+    <Parameter name="GroupingZMid"   value="26"/>
+    <Parameter name="GroupingZMid"   value="27"/>
+    <Parameter name="GroupingZMid"   value="27"/>
+    <Parameter name="GroupingZMid"   value="-1"/>
+    <Parameter name="GroupingZMid"   value="-1"/>
+    <Parameter name="GroupingZMid"   value="28"/>
+    <Parameter name="GroupingZMid"   value="28"/>
+    <Parameter name="GroupingZOut"   value="1"/>
+    <Parameter name="GroupingZOut"   value="1"/>
+    <Parameter name="GroupingZOut"   value="1"/>
+    <Parameter name="GroupingZOut"   value="2"/>
+    <Parameter name="GroupingZOut"   value="2"/>
+    <Parameter name="GroupingZOut"   value="2"/>
+    <Parameter name="GroupingZOut"   value="3"/>
+    <Parameter name="GroupingZOut"   value="3"/>
+    <Parameter name="GroupingZOut"   value="3"/>
+    <Parameter name="GroupingZOut"   value="4"/>
+    <Parameter name="GroupingZOut"   value="4"/>
+    <Parameter name="GroupingZOut"   value="4"/>
+    <Parameter name="GroupingZOut"   value="5"/>
+    <Parameter name="GroupingZOut"   value="5"/>
+    <Parameter name="GroupingZOut"   value="5"/>
+    <Parameter name="GroupingZOut"   value="6"/>
+    <Parameter name="GroupingZOut"   value="6"/>
+    <Parameter name="GroupingZOut"   value="6"/>
+    <Parameter name="GroupingZOut"   value="7"/>
+    <Parameter name="GroupingZOut"   value="7"/>
+    <Parameter name="GroupingZOut"   value="7"/>
+    <Parameter name="GroupingZOut"   value="8"/>
+    <Parameter name="GroupingZOut"   value="8"/>
+    <Parameter name="GroupingZOut"   value="8"/>
+    <Parameter name="GroupingZOut"   value="9"/>
+    <Parameter name="GroupingZOut"   value="9"/>
+    <Parameter name="GroupingZOut"   value="9"/>
+    <Parameter name="GroupingZOut"   value="10"/>
+    <Parameter name="GroupingZOut"   value="10"/>
+    <Parameter name="GroupingZOut"   value="10"/>
+    <Parameter name="GroupingZOut"   value="11"/>
+    <Parameter name="GroupingZOut"   value="11"/>
+    <Parameter name="GroupingZOut"   value="11"/>
+    <Parameter name="GroupingZOut"   value="12"/>
+    <Parameter name="GroupingZOut"   value="12"/>
+    <Parameter name="GroupingZOut"   value="12"/>
+    <Parameter name="GroupingZOut"   value="13"/>
+    <Parameter name="GroupingZOut"   value="13"/>
+    <Parameter name="GroupingZOut"   value="13"/>
+    <Parameter name="GroupingZOut"   value="14"/>
+    <Parameter name="GroupingZOut"   value="14"/>
+    <Parameter name="GroupingZOut"   value="14"/>
+    <Parameter name="GroupingZOut"   value="15"/>
+    <Parameter name="GroupingZOut"   value="15"/>
+    <Parameter name="GroupingZOut"   value="15"/>
+    <Parameter name="GroupingZOut"   value="16"/>
+    <Parameter name="GroupingZOut"   value="16"/>
+    <Parameter name="GroupingZOut"   value="16"/>
+    <Parameter name="GroupingZOut"   value="17"/>
+    <Parameter name="GroupingZOut"   value="17"/>
+    <Parameter name="GroupingZOut"   value="17"/>
+    <Parameter name="GroupingZOut"   value="18"/>
+    <Parameter name="GroupingZOut"   value="18"/>
+    <Parameter name="GroupingZOut"   value="18"/>
+    <Parameter name="GroupingZOut"   value="19"/>
+    <Parameter name="GroupingZOut"   value="19"/>
+    <Parameter name="GroupingZOut"   value="19"/>
+    <Parameter name="GroupingZOut"   value="20"/>
+    <Parameter name="GroupingZOut"   value="20"/>
+    <Parameter name="GroupingZOut"   value="20"/>
+    <Parameter name="GroupingZOut"   value="21"/>
+    <Parameter name="GroupingZOut"   value="21"/>
+    <Parameter name="GroupingZOut"   value="21"/>
+    <Parameter name="GroupingZOut"   value="22"/>
+    <Parameter name="GroupingZOut"   value="22"/>
+    <Parameter name="GroupingZOut"   value="22"/>
+    <Parameter name="GroupingZOut"   value="23"/>
+    <Parameter name="GroupingZOut"   value="23"/>
+    <Parameter name="GroupingZOut"   value="23"/>
+    <Parameter name="GroupingZOut"   value="24"/>
+    <Parameter name="GroupingZOut"   value="24"/>
+    <Parameter name="GroupingZOut"   value="24"/>
+    <Parameter name="GroupingZOut"   value="25"/>
+    <Parameter name="GroupingZOut"   value="25"/>
+    <Parameter name="GroupingZOut"   value="25"/>
+    <Parameter name="GroupingZOut"   value="26"/>
+    <Parameter name="GroupingZOut"   value="26"/>
+    <Parameter name="GroupingZOut"   value="26"/>
+    <Parameter name="GroupingZOut"   value="27"/>
+    <Parameter name="GroupingZOut"   value="27"/>
+    <Parameter name="GroupingZOut"   value="27"/>
+    <Parameter name="GroupingZOut"   value="28"/>
+    <Parameter name="GroupingZOut"   value="28"/>
+    <Parameter name="GroupingZOut"   value="28"/>
+    <Parameter name="LayerOffset"    value="0"/>
+    <Parameter name="LayerOffset"    value="0"/>
+  </SpecPar>
+</SpecParSection>
+
+</DDDefinition>
diff --git a/Geometry/HGCalTBCommonData/data/TB160/hgcalEE.xml b/Geometry/HGCalTBCommonData/data/TB160/hgcalEE.xml
new file mode 100644
index 0000000000000..45932eec5741c
--- /dev/null
+++ b/Geometry/HGCalTBCommonData/data/TB160/hgcalEE.xml
@@ -0,0 +1,102 @@
+<?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="hgcalEE.xml" eval="true">
+  <Constant name="rMinFine"   value="0.0*fm"/>
+  <Constant name="rMaxFine"   value="0.0*cm"/>
+  <Constant name="rMaxMiddle" value="120.0*cm"/>
+  <Constant name="rMaxCoarse" value="2000.0*cm"/>
+  <Constant name="rMin"       value="0.0*fm"/>
+  <Constant name="rMax"       value="10.0*cm"/>
+</ConstantsSection>
+
+<PosPartSection label="hgcalEE.xml">
+  <Algorithm name="hgcal:DDHGCalModuleAlgo">
+    <rParent name="hgcal:HGCalEE"/>
+    <Vector name="WaferName" type="string" nEntries="2">
+      hgcalwafer:HGCalEEWaferFine, hgcalwafer:HGCalEEWaferCoarse</Vector>
+    <Vector name="MaterialNames" type="string" nEntries="15">
+      materials:Carbon_fibre_str_Upgrade2, materials:Tungsten,
+      materials:Tungsten, materials:Tungsten, hgcal:WCu, hgcal:WCu,
+      hgcal:WCu, materials:Copper, materials:Copper, materials:Air, 
+      materials:G10, materials:M_NEMA FR4 plate, materials:Kapton,
+      materials:Air, materials:Graph.Epoxy Sup.</Vector>
+    <Vector name="VolumeNames" type="string" nEntries="15">
+      EEModule,    EEAbsorber1, EEAbsorber2, EEAbsorber3,  EEAbsorber4, 
+      EEAbsorber5, EEAbsorber6, EECuFrame,   EEHeatShield, EESensitive,
+      EEPCB,       EECover,     EEKapton,    EEAirGap,     EEGlue</Vector>
+    <Vector name="Thickness" type="numeric" nEntries="15">
+      0.5*mm, 2.1*mm,  2.8*mm,  4.2*mm,  0.6*mm,  1.2*mm, 2.2*mm, 
+      0.5*mm, 6.0*mm, 0.10*mm,  1.2*mm,  0.5*mm, 0.01*mm, 1.0*mm,
+      0.5*mm</Vector>
+    <Vector name="Layers" type="numeric" nEntries="14"> 
+      21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21</Vector>
+    <Vector name="LayerThick" type="numeric" nEntries="14"> 
+      15.84*mm, 15.84*mm, 15.84*mm, 15.84*mm, 15.84*mm, 17.74*mm, 17.74*mm,
+      17.74*mm, 17.74*mm, 17.74*mm, 21.14*mm, 21.14*mm, 21.14*mm, 21.14*mm
+    </Vector>
+    <Vector name="LayerType" type="numeric" nEntries="294"> 
+      1, 13, 11, 14, 10, 12, 9, 9, 9, 12, 4, 8, 4, 12, 9, 9, 9, 12, 10, 14, 13,
+      1, 13, 11, 14, 10, 12, 9, 9, 9, 12, 4, 8, 4, 12, 9, 9, 9, 12, 10, 14, 13,
+      1, 13, 11, 14, 10, 12, 9, 9, 9, 12, 4, 8, 4, 12, 9, 9, 9, 12, 10, 14, 13,
+      1, 13, 11, 14, 10, 12, 9, 9, 9, 12, 4, 8, 4, 12, 9, 9, 9, 12, 10, 14, 13,
+      1, 13, 11, 14, 10, 12, 9, 9, 9, 12, 4, 8, 4, 12, 9, 9, 9, 12, 10, 14, 13,
+      2, 13, 11, 14, 10, 12, 9, 9, 9, 12, 5, 8, 5, 12, 9, 9, 9, 12, 10, 14, 13,
+      2, 13, 11, 14, 10, 12, 9, 9, 9, 12, 5, 8, 5, 12, 9, 9, 9, 12, 10, 14, 13,
+      2, 13, 11, 14, 10, 12, 9, 9, 9, 12, 5, 8, 5, 12, 9, 9, 9, 12, 10, 14, 13,
+      2, 13, 11, 14, 10, 12, 9, 9, 9, 12, 5, 8, 5, 12, 9, 9, 9, 12, 10, 14, 13,
+      2, 13, 11, 14, 10, 12, 9, 9, 9, 12, 5, 8, 5, 12, 9, 9, 9, 12, 10, 14, 13,
+      3, 13, 11, 14, 10, 12, 9, 9, 9, 12, 6, 8, 6, 12, 9, 9, 9, 12, 10, 14, 13,
+      3, 13, 11, 14, 10, 12, 9, 9, 9, 12, 6, 8, 6, 12, 9, 9, 9, 12, 10, 14, 13,
+      3, 13, 11, 14, 10, 12, 9, 9, 9, 12, 6, 8, 6, 12, 9, 9, 9, 12, 10, 14, 13,
+      3, 13, 11, 14, 10, 12, 9, 9, 9, 12, 6, 8, 6, 12, 9, 9, 9, 12, 10, 14, 13
+    </Vector>
+    <Vector name="LayerSense" type="numeric" nEntries="294">
+      0,  0,  0,  0,  0,  0, 1, 1, 1,  0, 0, 0, 0,  0, 1, 1, 1,  0,  0,  0,  0,
+      0,  0,  0,  0,  0,  0, 1, 1, 1,  0, 0, 0, 0,  0, 1, 1, 1,  0,  0,  0,  0,
+      0,  0,  0,  0,  0,  0, 1, 1, 1,  0, 0, 0, 0,  0, 1, 1, 1,  0,  0,  0,  0,
+      0,  0,  0,  0,  0,  0, 1, 1, 1,  0, 0, 0, 0,  0, 1, 1, 1,  0,  0,  0,  0,
+      0,  0,  0,  0,  0,  0, 1, 1, 1,  0, 0, 0, 0,  0, 1, 1, 1,  0,  0,  0,  0,
+      0,  0,  0,  0,  0,  0, 1, 1, 1,  0, 0, 0, 0,  0, 1, 1, 1,  0,  0,  0,  0,
+      0,  0,  0,  0,  0,  0, 1, 1, 1,  0, 0, 0, 0,  0, 1, 1, 1,  0,  0,  0,  0,
+      0,  0,  0,  0,  0,  0, 1, 1, 1,  0, 0, 0, 0,  0, 1, 1, 1,  0,  0,  0,  0,
+      0,  0,  0,  0,  0,  0, 1, 1, 1,  0, 0, 0, 0,  0, 1, 1, 1,  0,  0,  0,  0,
+      0,  0,  0,  0,  0,  0, 1, 1, 1,  0, 0, 0, 0,  0, 1, 1, 1,  0,  0,  0,  0,
+      0,  0,  0,  0,  0,  0, 1, 1, 1,  0, 0, 0, 0,  0, 1, 1, 1,  0,  0,  0,  0,
+      0,  0,  0,  0,  0,  0, 1, 1, 1,  0, 0, 0, 0,  0, 1, 1, 1,  0,  0,  0,  0,
+      0,  0,  0,  0,  0,  0, 1, 1, 1,  0, 0, 0, 0,  0, 1, 1, 1,  0,  0,  0,  0,
+      0,  0,  0,  0,  0,  0, 1, 1, 1,  0, 0, 0, 0,  0, 1, 1, 1,  0,  0,  0,  0
+    </Vector>
+    <Numeric name="zMinBlock"   value="[hgcal:zminEE]"/>
+    <Numeric name="rMaxFine"    value="[rMaxFine]"/>
+    <Numeric name="waferW"      value="[hgcal:WaferW]"/>
+    <Numeric name="waferGap"    value="0.0*fm"/>
+    <Numeric name="Sectors"     value="12"/>
+    <Vector name="SlopeBottom" type="numeric" nEntries="2">
+      0.0, 0.0</Vector>
+    <Vector name="SlopeTop" type="numeric" nEntries="2">
+      0, 0</Vector>
+    <Vector name="ZFront" type="numeric" nEntries="2">
+      [hgcal:zminEE], [hgcal:zmaxEE]</Vector>
+    <Vector name="RMaxFront" type="numeric" nEntries="2">
+      [hgcal:rmaxEE], [hgcal:rmaxEE]</Vector>
+    <String name="RotNameSpace" value="hgcalmodule"/>
+  </Algorithm>
+</PosPartSection> 
+
+<SpecParSection label="hgcalEE.xml" eval="true">
+  <SpecPar name="HGCalEE">
+    <PartSelector path="//HGCalEESensitive.*"/>    
+    <Parameter name="Volume" value="HGCalEESensitive" eval="false"/>
+    <Parameter name="GeometryMode" value="HGCalGeometryMode::Hexagon" eval="false"/>
+    <Parameter name="RadiusBound"  value="[rMinFine]"/>
+    <Parameter name="RadiusBound"  value="[rMaxFine]"/>
+    <Parameter name="RadiusBound"  value="[rMaxMiddle]"/>
+    <Parameter name="RadiusBound"  value="[rMaxCoarse]"/>
+    <Parameter name="RadiusLimits" value="[rMin]"/>
+    <Parameter name="RadiusLimits" value="[rMax]"/>
+    <Parameter name="LevelTop"     value="99"/>
+  </SpecPar>
+</SpecParSection>
+
+</DDDefinition>
diff --git a/Geometry/HGCalTBCommonData/data/TB160/hgcalExtra.xml b/Geometry/HGCalTBCommonData/data/TB160/hgcalExtra.xml
new file mode 100644
index 0000000000000..804efa53283bb
--- /dev/null
+++ b/Geometry/HGCalTBCommonData/data/TB160/hgcalExtra.xml
@@ -0,0 +1,28 @@
+<?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="hgcalExtra.xml" eval="true">
+  <Constant name="rmaxExtra"   value="5.*cm"/>
+  <Constant name="zmaxExtra"   value="3.0*cm"/>
+  <Constant name="zposExtra"   value="-30.0*m"/>
+</ConstantsSection>
+
+<SolidSection label="hgcalExtra.xml">
+  <Tubs name="HGCalExtra" rMin="0.0*fm" rMax="[rmaxExtra]" dz="[zmaxExtra]" startPhi="0*deg" deltaPhi="360*deg"/>
+ </SolidSection>
+
+<LogicalPartSection label="hgcalExtra.xml">
+  <LogicalPart name="HGCalExtra" category="unspecified">
+    <rSolid name="HGCalExtra"/>
+    <rMaterial name="materials:Glass"/>
+  </LogicalPart>
+</LogicalPartSection>
+
+<PosPartSection label="hgcalExtra.xml">
+  <PosPart copyNumber="1">
+    <rParent name="cms:CMSE"/>
+    <rChild name="hgcalExtra:HGCalExtra"/>
+    <Translation x="0*fm" y="0*fm" z="[zposExtra]"/>
+  </PosPart>
+</PosPartSection>
+</DDDefinition>
diff --git a/Geometry/HGCalTBCommonData/data/TB160/hgcalsense.xml b/Geometry/HGCalTBCommonData/data/TB160/hgcalsense.xml
new file mode 100644
index 0000000000000..2f2587f5dbfaa
--- /dev/null
+++ b/Geometry/HGCalTBCommonData/data/TB160/hgcalsense.xml
@@ -0,0 +1,11 @@
+<?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">
+
+<SpecParSection label="hgcalsense.xml" eval="true">
+  <SpecPar name="hgcee">
+    <PartSelector path="//HGCalEECell.*"/>
+    <Parameter name="SensitiveDetector" value="HGCSensitiveDetector" eval="false"/>
+    <Parameter name="ReadOutName" value="HGCHitsEE" eval="false"/>
+  </SpecPar>
+</SpecParSection>
+</DDDefinition>
diff --git a/Geometry/HGCalTBCommonData/data/TB161/1Module/hgcalCons.xml b/Geometry/HGCalTBCommonData/data/TB161/1Module/hgcalCons.xml
new file mode 100644
index 0000000000000..5f23696c805c0
--- /dev/null
+++ b/Geometry/HGCalTBCommonData/data/TB161/1Module/hgcalCons.xml
@@ -0,0 +1,33 @@
+<?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">
+
+<SpecParSection label="hgcalReco.xml" eval="true">
+  <SpecPar name="HGCalEEWafer">
+    <PartSelector path="//HGCalEEWafer.*"/>
+    <Parameter name="Volume" value="HGCalEEWafer" eval="false"/>
+    <Parameter name="WaferSize"      value="[hgcal:WaferW]"/>
+  </SpecPar>
+  <SpecPar name="HGCalEECell">
+    <PartSelector path="//HGCalEECell.*"/>
+    <Parameter name="Volume" value="HGCalEECell" eval="false"/>
+    <Parameter name="CellSize"      value="[hgcalwafer:CellWF]"/>
+    <Parameter name="CellSize"      value="[hgcalwafer:CellWC]"/>
+  </SpecPar>
+  <SpecPar name="HGCalEESensitive">
+    <PartSelector path="//HGCalEESensitive.*"/>
+    <Parameter name="Volume" value="HGCalEESensitive" eval="false"/>
+    <Parameter name="Slope"          value="0.0"/>
+    <Parameter name="GroupingZFine"  value="1"/>
+    <Parameter name="GroupingZFine"  value="1"/>
+    <Parameter name="GroupingZFine"  value="-1"/>
+    <Parameter name="GroupingZMid"   value="1"/>
+    <Parameter name="GroupingZMid"   value="1"/>
+    <Parameter name="GroupingZMid"   value="-1"/>
+    <Parameter name="GroupingZOut"   value="1"/>
+    <Parameter name="GroupingZOut"   value="1"/>
+    <Parameter name="GroupingZOut"   value="-1"/>
+    <Parameter name="LayerOffset"    value="0"/>
+  </SpecPar>
+</SpecParSection>
+
+</DDDefinition>
diff --git a/Geometry/HGCalTBCommonData/data/TB161/1Module/hgcalEE.xml b/Geometry/HGCalTBCommonData/data/TB161/1Module/hgcalEE.xml
new file mode 100644
index 0000000000000..4933bb9999005
--- /dev/null
+++ b/Geometry/HGCalTBCommonData/data/TB161/1Module/hgcalEE.xml
@@ -0,0 +1,70 @@
+<?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="hgcalEE.xml" eval="true">
+  <Constant name="rMinFine"   value="0.0*fm"/>
+  <Constant name="rMaxFine"   value="0.0*cm"/>
+  <Constant name="rMaxMiddle" value="120.0*cm"/>
+  <Constant name="rMaxCoarse" value="2000.0*cm"/>
+  <Constant name="rMin"       value="0.0*fm"/>
+  <Constant name="rMax"       value="10.0*cm"/>
+</ConstantsSection>
+
+<PosPartSection label="hgcalEE.xml">
+  <Algorithm name="hgcal:DDHGCalModuleAlgo">
+    <rParent name="hgcal:HGCalEE"/>
+    <Vector name="WaferName" type="string" nEntries="2">
+      hgcalwafer:HGCalEEWaferFine, hgcalwafer:HGCalEEWaferCoarse</Vector>
+    <Vector name="MaterialNames" type="string" nEntries="8">
+      materials:Lead, materials:Tungsten, hgcal:WCu, materials:Copper,
+      materials:G10, materials:Silicon, materials:Air, materials:Plexiglas</Vector>
+    <Vector name="VolumeNames" type="string" nEntries="8">
+      EEAbsorber1, EEAbsorber2, EEAbsorber3, EEHeatShield, EEPCB,
+      EESensitive, EEAirGap, EEPlasticSupport</Vector>
+    <Vector name="Thickness" type="numeric" nEntries="8">
+      51.0*mm, 28.0*mm,  2.2*mm,  6.0*mm,  2.0*mm,  0.10*mm, 1.0*mm, 10.0*mm
+    </Vector>
+    <Vector name="Layers" type="numeric" nEntries="1"> 
+       8</Vector>
+    <Vector name="LayerThick" type="numeric" nEntries="1"> 
+      71.5*mm
+    </Vector>
+    <Vector name="LayerType" type="numeric" nEntries="8"> 
+      0, 7, 3, 2, 5, 5, 5, 4
+    </Vector>
+    <Vector name="LayerSense" type="numeric" nEntries="8">
+      0, 0, 0, 0, 1, 1, 1, 0
+    </Vector>
+    <Numeric name="zMinBlock"   value="[hgcal:zminEE]"/>
+    <Numeric name="rMaxFine"    value="[rMaxFine]"/>
+    <Numeric name="waferW"      value="[hgcal:WaferW]"/>
+    <Numeric name="waferGap"    value="0.0*fm"/>
+    <Numeric name="Sectors"     value="12"/>
+    <Vector name="SlopeBottom" type="numeric" nEntries="2">
+      0.0, 0.0</Vector>
+    <Vector name="SlopeTop" type="numeric" nEntries="2">
+      0, 0</Vector>
+    <Vector name="ZFront" type="numeric" nEntries="2">
+      [hgcal:zminEE], [hgcal:zmaxEE]</Vector>
+    <Vector name="RMaxFront" type="numeric" nEntries="2">
+      [hgcal:rmaxEE], [hgcal:rmaxEE]</Vector>
+    <String name="RotNameSpace" value="hgcalmodule"/>
+  </Algorithm>
+</PosPartSection> 
+
+<SpecParSection label="hgcalEE.xml" eval="true">
+  <SpecPar name="HGCalEE">
+    <PartSelector path="//HGCalEESensitive.*"/>    
+    <Parameter name="Volume" value="HGCalEESensitive" eval="false"/>
+    <Parameter name="GeometryMode" value="HGCalGeometryMode::Hexagon" eval="false"/>
+    <Parameter name="RadiusBound"  value="[rMinFine]"/>
+    <Parameter name="RadiusBound"  value="[rMaxFine]"/>
+    <Parameter name="RadiusBound"  value="[rMaxMiddle]"/>
+    <Parameter name="RadiusBound"  value="[rMaxCoarse]"/>
+    <Parameter name="RadiusLimits" value="[rMin]"/>
+    <Parameter name="RadiusLimits" value="[rMax]"/>
+    <Parameter name="LevelTop"     value="99"/>
+  </SpecPar>
+</SpecParSection>
+
+</DDDefinition>
diff --git a/Geometry/HGCalTBCommonData/data/TB161/8Module/hgcalCons.xml b/Geometry/HGCalTBCommonData/data/TB161/8Module/hgcalCons.xml
new file mode 100644
index 0000000000000..11b4d664aae4c
--- /dev/null
+++ b/Geometry/HGCalTBCommonData/data/TB161/8Module/hgcalCons.xml
@@ -0,0 +1,96 @@
+<?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">
+
+<SpecParSection label="hgcalReco.xml" eval="true">
+  <SpecPar name="HGCalEEWafer">
+    <PartSelector path="//HGCalEEWafer.*"/>
+    <Parameter name="Volume" value="HGCalEEWafer" eval="false"/>
+    <Parameter name="WaferSize"      value="[hgcal:WaferW]"/>
+  </SpecPar>
+  <SpecPar name="HGCalEECell">
+    <PartSelector path="//HGCalEECell.*"/>
+    <Parameter name="Volume" value="HGCalEECell" eval="false"/>
+    <Parameter name="CellSize"      value="[hgcalwafer:CellWF]"/>
+    <Parameter name="CellSize"      value="[hgcalwafer:CellWC]"/>
+  </SpecPar>
+  <SpecPar name="HGCalEESensitive">
+    <PartSelector path="//HGCalEESensitive.*"/>
+    <Parameter name="Volume" value="HGCalEESensitive" eval="false"/>
+    <Parameter name="Slope"          value="0.0"/>
+    <Parameter name="GroupingZFine"  value="-1"/>
+    <Parameter name="GroupingZFine"  value="1"/>
+    <Parameter name="GroupingZFine"  value="1"/>
+    <Parameter name="GroupingZFine"  value="-1"/>
+    <Parameter name="GroupingZFine"  value="2"/>
+    <Parameter name="GroupingZFine"  value="2"/>
+    <Parameter name="GroupingZFine"  value="-1"/>
+    <Parameter name="GroupingZFine"  value="3"/>
+    <Parameter name="GroupingZFine"  value="3"/>
+    <Parameter name="GroupingZFine"  value="-1"/>
+    <Parameter name="GroupingZFine"  value="4"/>
+    <Parameter name="GroupingZFine"  value="4"/>
+    <Parameter name="GroupingZFine"  value="5"/>
+    <Parameter name="GroupingZFine"  value="5"/>
+    <Parameter name="GroupingZFine"  value="-1"/>
+    <Parameter name="GroupingZFine"  value="-1"/>
+    <Parameter name="GroupingZFine"  value="6"/>
+    <Parameter name="GroupingZFine"  value="6"/>
+    <Parameter name="GroupingZFine"  value="7"/>
+    <Parameter name="GroupingZFine"  value="7"/>
+    <Parameter name="GroupingZFine"  value="-1"/>
+    <Parameter name="GroupingZFine"  value="-1"/>
+    <Parameter name="GroupingZFine"  value="8"/>
+    <Parameter name="GroupingZFine"  value="8"/>
+    <Parameter name="GroupingZMid"   value="-1"/>
+    <Parameter name="GroupingZMid"   value="1"/>
+    <Parameter name="GroupingZMid"   value="1"/>
+    <Parameter name="GroupingZMid"   value="-1"/>
+    <Parameter name="GroupingZMid"   value="2"/>
+    <Parameter name="GroupingZMid"   value="2"/>
+    <Parameter name="GroupingZMid"   value="-1"/>
+    <Parameter name="GroupingZMid"   value="3"/>
+    <Parameter name="GroupingZMid"   value="3"/>
+    <Parameter name="GroupingZMid"   value="-1"/>
+    <Parameter name="GroupingZMid"   value="4"/>
+    <Parameter name="GroupingZMid"   value="4"/>
+    <Parameter name="GroupingZMid"   value="5"/>
+    <Parameter name="GroupingZMid"   value="5"/>
+    <Parameter name="GroupingZMid"   value="-1"/>
+    <Parameter name="GroupingZMid"   value="-1"/>
+    <Parameter name="GroupingZMid"   value="6"/>
+    <Parameter name="GroupingZMid"   value="6"/>
+    <Parameter name="GroupingZMid"   value="7"/>
+    <Parameter name="GroupingZMid"   value="7"/>
+    <Parameter name="GroupingZMid"   value="-1"/>
+    <Parameter name="GroupingZMid"   value="-1"/>
+    <Parameter name="GroupingZMid"   value="8"/>
+    <Parameter name="GroupingZMid"   value="8"/>
+    <Parameter name="GroupingZOut"   value="-1"/>
+    <Parameter name="GroupingZOut"   value="1"/>
+    <Parameter name="GroupingZOut"   value="1"/>
+    <Parameter name="GroupingZOut"   value="-1"/>
+    <Parameter name="GroupingZOut"   value="2"/>
+    <Parameter name="GroupingZOut"   value="2"/>
+    <Parameter name="GroupingZOut"   value="-1"/>
+    <Parameter name="GroupingZOut"   value="3"/>
+    <Parameter name="GroupingZOut"   value="3"/>
+    <Parameter name="GroupingZOut"   value="-1"/>
+    <Parameter name="GroupingZOut"   value="4"/>
+    <Parameter name="GroupingZOut"   value="4"/>
+    <Parameter name="GroupingZOut"   value="5"/>
+    <Parameter name="GroupingZOut"   value="5"/>
+    <Parameter name="GroupingZOut"   value="-1"/>
+    <Parameter name="GroupingZOut"   value="-1"/>
+    <Parameter name="GroupingZOut"   value="6"/>
+    <Parameter name="GroupingZOut"   value="6"/>
+    <Parameter name="GroupingZOut"   value="7"/>
+    <Parameter name="GroupingZOut"   value="7"/>
+    <Parameter name="GroupingZOut"   value="-1"/>
+    <Parameter name="GroupingZOut"   value="-1"/>
+    <Parameter name="GroupingZOut"   value="8"/>
+    <Parameter name="GroupingZOut"   value="8"/>
+    <Parameter name="LayerOffset"    value="0"/>
+  </SpecPar>
+</SpecParSection>
+
+</DDDefinition>
diff --git a/Geometry/HGCalTBCommonData/data/TB161/8Module/hgcalEE.xml b/Geometry/HGCalTBCommonData/data/TB161/8Module/hgcalEE.xml
new file mode 100644
index 0000000000000..1065588c56564
--- /dev/null
+++ b/Geometry/HGCalTBCommonData/data/TB161/8Module/hgcalEE.xml
@@ -0,0 +1,97 @@
+<?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="hgcalEE.xml" eval="true">
+  <Constant name="rMinFine"   value="0.0*fm"/>
+  <Constant name="rMaxFine"   value="0.0*cm"/>
+  <Constant name="rMaxMiddle" value="120.0*cm"/>
+  <Constant name="rMaxCoarse" value="2000.0*cm"/>
+  <Constant name="rMin"       value="0.0*fm"/>
+  <Constant name="rMax"       value="10.0*cm"/>
+</ConstantsSection>
+
+<PosPartSection label="hgcalEE.xml">
+  <Algorithm name="hgcal:DDHGCalModuleAlgo">
+    <rParent name="hgcal:HGCalEE"/>
+    <Vector name="WaferName" type="string" nEntries="2">
+      hgcalwafer:HGCalEEWaferFine, hgcalwafer:HGCalEEWaferCoarse</Vector>
+    <Vector name="MaterialNames" type="string" nEntries="31">
+      materials:Lead, materials:Tungsten, materials:Tungsten, 
+      materials:Tungsten, materials:Tungsten, hgcal:WCu, hgcal:WCu, 
+      hgcal:WCu, materials:Copper, materials:G10, materials:Air, 
+      materials:Air, materials:Air, materials:Air, materials:Air, 
+      materials:Air, materials:Air, materials:Air, materials:Air, 
+      materials:Air, materials:Air, materials:Air, materials:Air, 
+      materials:Air, materials:Air, materials:Copper, materials:Kapton, 
+      materials:M_NEMA FR4 plate,  materials:G10, materials:M_NEMA FR4 plate,
+      materials:Air</Vector>
+    <Vector name="VolumeNames" type="string" nEntries="31">
+      EEAbsorber1, EEAbsorber2, EEAbsorber3, EEAbsorber4, EEAbsorber5, 
+      EEAbsorber6, EEAbsorber7, EEAbsorber8, EEHeatShield, EEPCB,
+      EESensitive, EEAirGap1, EEAirGap2, EEAirGap3, EEAirGap4, EEAirGap5, 
+      EEAirGap6, EEAirGap7, EEAirGap8, EEAirGap9, EEAirGap10, EEAirGap11, 
+      EEAirGap12, EEAirGap13, EEAirGap14, EEHeatShield2, EEKapton, 
+      EECoverPlate, EEPCB2, EECoverPlate2, EEAirGap15</Vector>
+    <Vector name="Thickness" type="numeric" nEntries="31">
+      44.9*mm, 8.0*mm, 4.0*mm, 2.0*mm, 0.0*mm, 2.2*mm, 1.2*mm, 0.6*mm, 6.0*mm,
+      0.5*mm,  0.10*mm, 1.0*mm, 3.0*mm, 4.5*mm, 7.6*mm, 4.8*mm, 13.5*mm, 
+      9.69*mm, 8.09*mm, 10.69*mm, 19.4*mm, 10.59*mm, 22.1*mm, 15.39*mm, 
+      16.29*mm, 12.0*mm, 0.01*mm, 0.5*mm, 1.0*mm, 1.0*mm, 4.8*mm </Vector>
+    <Vector name="Layers" type="numeric" nEntries="6"> 
+       19, 12, 12, 12, 20, 24</Vector>
+    <Vector name="LayerThick" type="numeric" nEntries="6"> 
+      67.91*mm, 52.2*mm, 50.4*mm, 38.5*mm, 52.0*mm, 58.8*mm
+    </Vector>
+    <Vector name="LayerType" type="numeric" nEntries="99"> 
+      2, 14, 2, 14, 2, 14, 2, 14, 2, 30, 8, 7, 26, 10, 10, 10, 9, 15, 27, 
+      23, 3, 22, 8, 7, 26, 10, 10, 10, 9, 15, 27, 
+      24, 3, 20, 8, 7, 26, 10, 10, 10, 9, 15, 27,
+      17, 3, 16, 8, 6, 26, 10, 10, 10, 9, 15, 27,
+      19, 3, 19, 27, 15, 9, 10, 10, 10, 26, 6, 25,
+      5, 26, 10, 10, 10, 28, 15, 29,
+      18, 3, 21, 27, 15, 9, 10, 10, 10, 26, 5, 8,
+      12, 3, 13, 8, 5, 26, 10, 10, 10, 9, 15, 27
+    </Vector>
+    <Vector name="LayerSense" type="numeric" nEntries="99">
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0,
+      0, 0, 1, 1, 1, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0
+    </Vector>
+    <Numeric name="zMinBlock"   value="[hgcal:zminEE]"/>
+    <Numeric name="rMaxFine"    value="[rMaxFine]"/>
+    <Numeric name="waferW"      value="[hgcal:WaferW]"/>
+    <Numeric name="waferGap"    value="0.0*fm"/>
+    <Numeric name="Sectors"     value="12"/>
+    <Vector name="SlopeBottom" type="numeric" nEntries="2">
+      0.0, 0.0</Vector>
+    <Vector name="SlopeTop" type="numeric" nEntries="2">
+      0, 0</Vector>
+    <Vector name="ZFront" type="numeric" nEntries="2">
+      [hgcal:zminEE], [hgcal:zmaxEE]</Vector>
+    <Vector name="RMaxFront" type="numeric" nEntries="2">
+      [hgcal:rmaxEE], [hgcal:rmaxEE]</Vector>
+    <String name="RotNameSpace" value="hgcalmodule"/>
+  </Algorithm>
+</PosPartSection> 
+
+<SpecParSection label="hgcalEE.xml" eval="true">
+  <SpecPar name="HGCalEE">
+    <PartSelector path="//HGCalEESensitive.*"/>    
+    <Parameter name="Volume" value="HGCalEESensitive" eval="false"/>
+    <Parameter name="GeometryMode" value="HGCalGeometryMode::Hexagon" eval="false"/>
+    <Parameter name="RadiusBound"  value="[rMinFine]"/>
+    <Parameter name="RadiusBound"  value="[rMaxFine]"/>
+    <Parameter name="RadiusBound"  value="[rMaxMiddle]"/>
+    <Parameter name="RadiusBound"  value="[rMaxCoarse]"/>
+    <Parameter name="RadiusLimits" value="[rMin]"/>
+    <Parameter name="RadiusLimits" value="[rMax]"/>
+    <Parameter name="LevelTop"     value="99"/>
+  </SpecPar>
+</SpecParSection>
+
+</DDDefinition>
diff --git a/Geometry/HGCalTBCommonData/data/TB161/8ModuleV2/hgcalEE.xml b/Geometry/HGCalTBCommonData/data/TB161/8ModuleV2/hgcalEE.xml
new file mode 100644
index 0000000000000..d6138469941f6
--- /dev/null
+++ b/Geometry/HGCalTBCommonData/data/TB161/8ModuleV2/hgcalEE.xml
@@ -0,0 +1,102 @@
+<?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="hgcalEE.xml" eval="true">
+  <Constant name="rMinFine"   value="0.0*fm"/>
+  <Constant name="rMaxFine"   value="0.0*cm"/>
+  <Constant name="rMaxMiddle" value="120.0*cm"/>
+  <Constant name="rMaxCoarse" value="2000.0*cm"/>
+  <Constant name="rMin"       value="0.0*fm"/>
+  <Constant name="rMax"       value="10.0*cm"/>
+</ConstantsSection>
+
+<PosPartSection label="hgcalEE.xml">
+  <Algorithm name="hgcal:DDHGCalModuleAlgo">
+    <rParent name="hgcal:HGCalEE"/>
+    <Vector name="WaferName" type="string" nEntries="2">
+      hgcalwafer:HGCalEEWaferFine, hgcalwafer:HGCalEEWaferCoarse</Vector>
+    <Vector name="MaterialNames" type="string" nEntries="39">
+      materials:Lead, materials:Tungsten, materials:Tungsten, 
+      materials:Tungsten, materials:Tungsten, hgcal:WCu, hgcal:WCu, 
+      hgcal:WCu, materials:Copper, materials:G10, materials:Air, 
+      materials:Air, materials:Air, materials:Air, materials:Air, 
+      materials:Air, materials:Air, materials:Air, materials:Air, 
+      materials:Air, materials:Air, materials:Air, materials:Air, 
+      materials:Air, materials:Lead, materials:Copper, materials:Kapton,
+      materials:M_NEMA FR4 plate,  materials:G10, 
+      materials:M_NEMA FR4 plate, materials:Air, materials:Air, materials:Air,
+      materials:Air, materials:Air, materials:Air, materials:Air, 
+      materials:Air, materials:Air</Vector>
+    <Vector name="VolumeNames" type="string" nEntries="39">
+      EEAbsorber1, EEAbsorber2, EEAbsorber3, EEAbsorber4, EEAbsorber5, 
+      EEAbsorber6, EEAbsorber7, EEAbsorber8, EEHeatShield1, EEPCB1,
+      EESensitive, EEAirGap1, EEAirGap2, EEAirGap3, EEAirGap4, EEAirGap5, 
+      EEAirGap6, EEAirGap7, EEAirGap8, EEAirGap9, EEAirGap10, EEAirGap11, 
+      EEAirGap12, EEAirGap13, EEAbsorber9, EEHeatShield2, EEKapton, 
+      EECoverPlate1, EEPCB2, EECoverPlate2, EEAirGap14, EEAirGap15, 
+      EEAirGap16, EEAirGap17, EEAirGap18, EEAirGap19, EEAirGap20, 
+      EEAirGap21, EEAirGap22</Vector>
+    <Vector name="Thickness" type="numeric" nEntries="39">
+      25.2*mm, 8.0*mm, 4.0*mm, 2.0*mm, 2.8*mm, 2.2*mm, 1.2*mm, 0.6*mm, 6.0*mm,
+      0.5*mm,  0.10*mm, 2.8*mm, 3.7*mm, 3.8*mm, 6*mm, 6.6*mm, 8*mm, 7.6*mm, 
+      1.29*mm, 1.89*mm, 5.89*mm, 5.4*mm, 7.29*mm, 10.49*mm, 5.6*mm,  
+      12.0*mm, 0.01*mm, 0.5*mm, 1.0*mm, 1.0*mm, 6.8*mm, 8.2*mm, 7.2*mm, 
+      8.6*mm, 6.49*mm, 3.5*mm, 8.2*mm,1.29*mm, 6.2*mm </Vector>
+    <Vector name="Layers" type="numeric" nEntries="6"> 
+       10, 16, 16, 16, 25, 33</Vector>
+    <Vector name="LayerThick" type="numeric" nEntries="6"> 
+      39.11*mm, 43.8*mm, 47.8*mm, 45.4*mm, 63.8*mm, 106.9*mm
+    </Vector> 
+    <Vector name="LayerType" type="numeric" nEntries="116"> 
+      0, 8, 7, 26, 10, 10, 10, 9, 14, 27, 
+      19, 2, 17, 2, 15, 3, 13, 8, 7, 26, 10, 10, 10, 9, 14, 27, 
+      20, 2, 33, 2, 15, 3, 11, 8, 7, 26, 10, 10, 10, 9, 14, 27, 
+      34, 4, 30, 4, 32, 3, 11, 8, 6, 26, 10, 10, 10, 9, 14, 27, 
+      22, 2, 36, 4, 32, 3, 37, 27, 14, 9,10, 10, 10, 26, 6, 8, 8, 
+      5, 26, 10, 10, 10, 28, 14, 29,  
+      23, 24, 4, 38, 3, 20, 27, 14, 9, 10, 10, 10, 26, 5, 8, 16, 24,
+      4, 21, 24, 4, 32, 3, 35, 8, 5, 26, 10, 10, 10, 9, 14, 27
+    </Vector>
+    <Vector name="LayerSense" type="numeric" nEntries="116">
+      0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1, 1, 1, 0, 0, 0, 0, 
+      0, 0, 1, 1, 1, 0, 0, 0,  
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0
+    </Vector>
+    <Numeric name="zMinBlock"   value="[hgcal:zminEE]"/>
+    <Numeric name="rMaxFine"    value="[rMaxFine]"/>
+    <Numeric name="waferW"      value="[hgcal:WaferW]"/>
+    <Numeric name="waferGap"    value="0.0*fm"/>
+    <Numeric name="Sectors"     value="12"/>
+    <Vector name="SlopeBottom" type="numeric" nEntries="2">
+      0.0, 0.0</Vector>
+    <Vector name="SlopeTop" type="numeric" nEntries="2">
+      0, 0</Vector>
+    <Vector name="ZFront" type="numeric" nEntries="2">
+      [hgcal:zminEE], [hgcal:zmaxEE]</Vector>
+    <Vector name="RMaxFront" type="numeric" nEntries="2">
+      [hgcal:rmaxEE], [hgcal:rmaxEE]</Vector>
+    <String name="RotNameSpace" value="hgcalmodule"/>
+  </Algorithm>
+</PosPartSection> 
+
+<SpecParSection label="hgcalEE.xml" eval="true">
+  <SpecPar name="HGCalEE">
+    <PartSelector path="//HGCalEESensitive.*"/>    
+    <Parameter name="Volume" value="HGCalEESensitive" eval="false"/>
+    <Parameter name="GeometryMode" value="HGCalGeometryMode::Hexagon" eval="false"/>
+    <Parameter name="RadiusBound"  value="[rMinFine]"/>
+    <Parameter name="RadiusBound"  value="[rMaxFine]"/>
+    <Parameter name="RadiusBound"  value="[rMaxMiddle]"/>
+    <Parameter name="RadiusBound"  value="[rMaxCoarse]"/>
+    <Parameter name="RadiusLimits" value="[rMin]"/>
+    <Parameter name="RadiusLimits" value="[rMax]"/>
+    <Parameter name="LevelTop"     value="99"/>
+  </SpecPar>
+</SpecParSection>
+
+</DDDefinition>
diff --git a/Geometry/HGCalTBCommonData/data/TB161/TimingLayer/hgcalBeam.xml b/Geometry/HGCalTBCommonData/data/TB161/TimingLayer/hgcalBeam.xml
new file mode 100644
index 0000000000000..7cb5fc972f949
--- /dev/null
+++ b/Geometry/HGCalTBCommonData/data/TB161/TimingLayer/hgcalBeam.xml
@@ -0,0 +1,434 @@
+<?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="hgcalBeam.xml" eval="true">
+  <Constant name="upstreamDxby2" value="100.0*cm"/>
+  <Constant name="upstreamDyby2" value="100.0*cm"/>
+  <Constant name="upstreamDzby2" value="400.0*cm"/>
+  <Constant name="upstreamZ"     value="-400.0*cm"/>
+  <Constant name="tol"           value="0.0*mm"/>
+  <Constant name="chambDxby2"    value="11.0*cm"/>
+  <Constant name="chambAlT"      value="5.0*mm"/>
+  <Constant name="chambKapW"     value="11.0*cm"/>
+  <Constant name="chambKapT"     value="0.025*mm"/>
+  <Constant name="chambVetW"     value="25.0*mm"/>
+  <Constant name="chambVetT"     value="5.0*mm"/>
+  <Constant name="chambVetGap"   value="12.0*cm"/>
+  <Constant name="chambVetL"     value="0.5*([chambVetGap]+[chambVetW])"/>
+  <Constant name="chambVetX"     value="0.5*[chambVetW]"/>
+  <Constant name="chambVetZ"     value="20.0*mm"/>
+  <Constant name="chambGasGap"   value="([chambVetZ]+0.5*[chambVetT]+[tol])"/>
+  <Constant name="chambGasW"     value="([chambVetW]+0.5*[chambVetGap]+[tol])"/>
+  <Constant name="chambDzby2"    value="([chambGasGap]+[chambAlT]+2*[tol])"/>
+  <Constant name="chambAl1L"     value="0.5*([chambDxby2]+0.5*[chambKapW])"/>
+  <Constant name="chambAl1W"     value="0.5*([chambDxby2]-0.5*[chambKapW])"/>
+  <Constant name="chambAl1X"     value="([chambDxby2]-[chambAl1L])"/>
+  <Constant name="chambAl1Y"     value="([chambDxby2]-[chambAl1W])"/>
+  <Constant name="chambAl1Z"     value="([chambGasGap]+0.5*[chambAlT]+[tol])"/>
+  <Constant name="chambAl2L"     value="([chambDxby2]-0.5*[chambAlT])"/>
+  <Constant name="chambAl2X"     value="([chambDxby2]-[chambAl2L])"/>
+  <Constant name="chambAl2Y"     value="([chambDxby2]-0.5*[chambAlT])"/>
+  <Constant name="chamb1Z"       value="-507.6*cm"/>
+  <Constant name="chamb2Z"       value="-400.3*cm"/>
+  <Constant name="chamb3Z"       value="-200.5*cm"/>
+  <Constant name="s1Dxby2"       value="7.0*cm"/>
+  <Constant name="s1Dzby2"       value="5.0*mm"/>
+  <Constant name="s1Z"           value="-375.4*cm"/>
+  <Constant name="s2Dxby2"       value="2.0*cm"/>
+  <Constant name="s2Dzby2"       value="5.0*mm"/>
+  <Constant name="s2Z"           value="-360.5*cm"/>
+  <Constant name="s3Dxby2"       value="1.0*cm"/>
+  <Constant name="s3Dzby2"       value="5.0*mm"/>
+  <Constant name="s3Z"           value="-345.6*cm"/>
+  <Constant name="s4Z"           value="-240.8*cm"/>
+  <Constant name="bhDxby2"       value="50.0*cm"/>
+  <Constant name="bhDyby2"       value="15.0*cm"/>
+  <Constant name="bhDzby2"       value="0.5*cm"/>
+  <Constant name="bhGap"         value="7.5*cm"/>
+  <Constant name="bhX"           value="([bhDxby2]-0.5*[bhGap])"/>
+  <Constant name="bhY"           value="([bhDyby2]+0.5*[bhGap])"/>
+  <Constant name="bhZ1"          value="-229.3*cm"/>
+  <Constant name="bhZ2"          value="-221.3*cm"/>
+  <Constant name="ck3Rad"        value="8.35*cm"/>
+  <Constant name="ck3L"          value="200.0*cm"/>
+  <Constant name="ck3Z"          value="-569.0*cm"/>
+  <Constant name="downstreamDxby2" value="50.0*cm"/>
+  <Constant name="downstreamDyby2" value="50.0*cm"/>
+  <Constant name="downstreamDzby2" value="100.0*cm"/>
+  <Constant name="downstreamZ"     value="900.0*cm"/>
+  <Constant name="chamb4Z"         value="840.8*cm"/>
+  <Constant name="chamb5Z"         value="965.5*cm"/>
+  <Constant name="mcDxby2"         value="40.0*cm"/>
+  <Constant name="mcDzby2"         value="20.0*mm"/>
+  <Constant name="mc1Z"            value="873.5*cm"/>
+  <Constant name="mc2Z"            value="985.5*cm"/>
+  <Constant name="mcps4R"          value="2.0*cm"/>
+  <Constant name="mcps4Dzby2"      value="0.45*cm"/>
+  <Constant name="mcps4Z"          value="1460.5*cm"/>
+</ConstantsSection>
+
+<SolidSection label="hgcalBeam.xml">
+  <Box name="HGCalBeam" dx="[upstreamDxby2]" dy="[upstreamDyby2]" dz="[upstreamDzby2]"/>
+  <Box name="HGCalBeamWChamb" dx="[chambDxby2]" dy="[chambDxby2]" dz="[chambDzby2]"/>
+  <Box name="HGCalBeamWChambGas" dx="[chambGasW]" dy="[chambGasW]" dz="[chambGasGap]"/>
+  <Box name="HGCalBeamWChambVet" dx="[chambVetL]" dy="[chambVetW]/2" dz="[chambVetT]/2"/>
+  <Box name="HGCalBeamWChambWindow" dx="[chambKapW]/2" dy="[chambKapW]/2" dz="[chambKapT]/2"/>
+  <Box name="HGCalBeamWChambAl1" dx="[chambAl1L]" dy="[chambAl1W]" dz="[chambAlT]/2"/>
+  <Box name="HGCalBeamWChambAl2" dx="[chambAl2L]" dy="[chambAlT]/2" dz="[chambGasGap]"/>
+  <Box name="HGCalBeamS1" dx="[s1Dxby2]" dy="[s1Dxby2]" dz="[s1Dzby2]"/>
+  <Box name="HGCalBeamS2" dx="[s2Dxby2]" dy="[s2Dxby2]" dz="[s2Dzby2]"/>
+  <Box name="HGCalBeamS3" dx="[s3Dxby2]" dy="[s3Dxby2]" dz="[s3Dzby2]"/>
+  <Box name="HGCalBeamS4" dx="[s1Dxby2]" dy="[s1Dxby2]" dz="[s1Dzby2]"/>
+  <Box name="HGCalBeamHaloCounter" dx="[bhDxby2]" dy="[bhDyby2]" dz="[bhDzby2]"/>
+  <Tubs name="HGCalBeamCK3" rMin="0*fm" rMax="[ck3Rad]" dz="[ck3L]/2" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Box name="HGCalBeamDown" dx="[downstreamDxby2]" dy="[downstreamDyby2]" dz="[downstreamDzby2]"/>
+  <Box name="HGCalBeamMuonCounter" dx="[mcDxby2]" dy="[mcDxby2]" dz="[mcDzby2]"/>
+  <Tubs name="HGCalBeamMCPS4" rMin="0*fm" rMax="[mcps4R]" dz="[mcps4Dzby2]/2" startPhi="0*deg" deltaPhi="360*deg"/>
+</SolidSection>
+
+<LogicalPartSection label="hgcalBeam.xml">
+  <LogicalPart name="HGCalBeam" category="unspecified">
+    <rSolid name="HGCalBeam"/>
+    <rMaterial name="materials:Air"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamWChamb" category="unspecified">
+    <rSolid name="HGCalBeamWChamb"/>
+    <rMaterial name="materials:Air"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamWChambGas" category="unspecified">
+    <rSolid name="HGCalBeamWChambGas"/>
+    <rMaterial name="materials:Ar 50pct plus CO_2 50pct"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamWChambVet" category="unspecified">
+    <rSolid name="HGCalBeamWChambVet"/>
+    <rMaterial name="materials:Polyethylene"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamWChambWindow" category="unspecified">
+    <rSolid name="HGCalBeamWChambWindow"/>
+    <rMaterial name="materials:Kapton"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamWChambAl1" category="unspecified">
+    <rSolid name="HGCalBeamWChambAl1"/>
+    <rMaterial name="materials:Aluminium"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamWChambAl2" category="unspecified">
+    <rSolid name="HGCalBeamWChambAl2"/>
+    <rMaterial name="materials:Aluminium"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamS1" category="unspecified">
+    <rSolid name="HGCalBeamS1"/>
+    <rMaterial name="materials:Scintillator"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamS2" category="unspecified">
+    <rSolid name="HGCalBeamS2"/>
+    <rMaterial name="materials:Scintillator"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamS3" category="unspecified">
+    <rSolid name="HGCalBeamS3"/>
+    <rMaterial name="materials:Scintillator"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamS4" category="unspecified">
+    <rSolid name="HGCalBeamS4"/>
+    <rMaterial name="materials:Scintillator"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamHaloCounter" category="unspecified">
+    <rSolid name="HGCalBeamHaloCounter"/>
+    <rMaterial name="materials:Scintillator"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamCK3" category="unspecified">
+    <rSolid name="HGCalBeamCK3"/>
+    <rMaterial name="materials:Freon-12"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamDown" category="unspecified">
+    <rSolid name="HGCalBeamDown"/>
+    <rMaterial name="materials:Air"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamMuonCounter" category="unspecified">
+    <rSolid name="HGCalBeamMuonCounter"/>
+    <rMaterial name="materials:Scintillator"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamMCPS4" category="unspecified">
+    <rSolid name="HGCalBeamMCPS4"/>
+    <rMaterial name="materials:Quartz"/>
+  </LogicalPart>
+</LogicalPartSection>
+
+<RotationSection label="hgcalBeam.xml">
+  <Rotation name="R1" phiX="90*deg" thetaX="90*deg" phiY="180*deg" thetaY="90*deg" phiZ="0*deg" thetaZ="0*deg"/>
+</RotationSection>
+
+<PosPartSection label="hgcalBeam.xml">
+  <PosPart copyNumber="1">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambGas"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl1"/>
+    <Translation x="[chambAl1X]" y="[chambAl1Y]" z="[chambAl1Z]"/>
+  </PosPart>
+  <PosPart copyNumber="2">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl1"/>
+    <Translation x="-[chambAl1Y]" y="[chambAl1X]" z="[chambAl1Z]"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="3">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl1"/>
+    <Translation x="-[chambAl1X]" y="-[chambAl1Y]" z="[chambAl1Z]"/>
+  </PosPart>
+  <PosPart copyNumber="4">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl1"/>
+    <Translation x="[chambAl1Y]" y="-[chambAl1X]" z="[chambAl1Z]"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="5">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl1"/>
+    <Translation x="[chambAl1X]" y="[chambAl1Y]" z="-[chambAl1Z]"/>
+  </PosPart>
+  <PosPart copyNumber="6">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl1"/>
+    <Translation x="-[chambAl1Y]" y="[chambAl1X]" z="-[chambAl1Z]"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="7">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl1"/>
+    <Translation x="-[chambAl1X]" y="-[chambAl1Y]" z="-[chambAl1Z]"/>
+  </PosPart>
+  <PosPart copyNumber="8">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl1"/>
+    <Translation x="[chambAl1Y]" y="-[chambAl1X]" z="-[chambAl1Z]"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl2"/>
+    <Translation x="[chambAl2X]" y="[chambAl2Y]" z="0*fm"/>
+  </PosPart>
+  <PosPart copyNumber="2">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl2"/>
+    <Translation x="-[chambAl2Y]" y="[chambAl2X]" z="0*fm"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="3">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl2"/>
+    <Translation x="-[chambAl2X]" y="-[chambAl2Y]" z="0*fm"/>
+  </PosPart>
+  <PosPart copyNumber="4">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl2"/>
+    <Translation x="[chambAl2Y]" y="-[chambAl2X]" z="0*fm"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambWindow"/>
+    <Translation x="0*fm" y="0*fm" z="([chambDzby2]-0.5*[chambKapT])"/>
+  </PosPart>
+  <PosPart copyNumber="2">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambWindow"/>
+    <Translation x="0*fm" y="0*fm" z="-([chambDzby2]-0.5*[chambKapT])"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="[chambVetX]" y="[chambVetL]" z="[chambVetZ]"/>
+  </PosPart>
+  <PosPart copyNumber="2">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="-[chambVetL]" y="[chambVetX]" z="[chambVetZ]"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="3">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="-[chambVetX]" y="-[chambVetL]" z="[chambVetZ]"/>
+  </PosPart>
+  <PosPart copyNumber="4">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="[chambVetL]" y="-[chambVetX]" z="[chambVetZ]"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="5">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="[chambVetX]" y="[chambVetL]" z="0*fm"/>
+  </PosPart>
+  <PosPart copyNumber="6">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="-[chambVetL]" y="[chambVetX]" z="0*fm"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="7">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="-[chambVetX]" y="-[chambVetL]" z="0*fm"/>
+  </PosPart>
+  <PosPart copyNumber="8">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="[chambVetL]" y="-[chambVetX]" z="0*fm"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="9">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="[chambVetX]" y="[chambVetL]" z="-[chambVetZ]"/>
+  </PosPart>
+  <PosPart copyNumber="10">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="-[chambVetL]" y="[chambVetX]" z="-[chambVetZ]"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="11">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="-[chambVetX]" y="-[chambVetL]" z="-[chambVetZ]"/>
+  </PosPart>
+  <PosPart copyNumber="12">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="[chambVetL]" y="-[chambVetX]" z="-[chambVetZ]"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamWChamb"/>
+    <Translation x="0*fm" y="0*fm" z="([chamb1Z]-[upstreamZ]-[chambDzby2])"/>
+  </PosPart>
+  <PosPart copyNumber="2">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamWChamb"/>
+    <Translation x="0*fm" y="0*fm" z="([chamb2Z]-[upstreamZ]-[chambDzby2])"/>
+  </PosPart>
+  <PosPart copyNumber="3">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamWChamb"/>
+    <Translation x="0*fm" y="0*fm" z="([chamb3Z]-[upstreamZ]-[chambDzby2])"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamS1"/>
+    <Translation x="0*fm" y="0*fm" z="([s1Z]-[upstreamZ]-[s1Dzby2])"/>
+  </PosPart>
+  <PosPart copyNumber="2">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamS2"/>
+    <Translation x="0*fm" y="0*fm" z="([s2Z]-[upstreamZ]-[s2Dzby2])"/>
+  </PosPart>
+  <PosPart copyNumber="3">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamS3"/>
+    <Translation x="0*fm" y="0*fm" z="([s3Z]-[upstreamZ]-[s3Dzby2])"/>
+  </PosPart>
+  <PosPart copyNumber="4">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamS4"/>
+    <Translation x="0*fm" y="0*fm" z="([s4Z]-[upstreamZ]-[s1Dzby2])"/>
+  </PosPart>
+
+  <PosPart copyNumber="11">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamHaloCounter"/>
+    <Translation x="0*fm" y="[bhY]" z="([bhZ2]+[bhDzby2]-[upstreamZ])"/>
+  </PosPart>
+  <PosPart copyNumber="12">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamHaloCounter"/>
+    <Translation x="0*fm" y="-[bhY]" z="([bhZ2]+[bhDzby2]-[upstreamZ])"/>
+  </PosPart>
+  <PosPart copyNumber="13">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamHaloCounter"/>
+    <Translation x="-[bhY]" y="0*fm" z="([bhZ1]+[bhDzby2]-[upstreamZ])"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="14">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamHaloCounter"/>
+    <Translation x="[bhY]" y="0*fm" z="([bhZ1]+[bhDzby2]-[upstreamZ])"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="0">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamCK3"/>
+    <Translation x="0*fm" y="0*fm" z="([ck3Z]-[upstreamZ]-0.5*[ck3L])"/>
+  </PosPart>
+  <PosPart copyNumber="4">
+    <rParent name="hgcalBeam:HGCalBeamDown"/>
+    <rChild name="hgcalBeam:HGCalBeamWChamb"/>
+    <Translation x="0*fm" y="0*fm" z="([chamb4Z]-[downstreamZ]-[chambDzby2])"/>
+  </PosPart>
+  <PosPart copyNumber="5">
+    <rParent name="hgcalBeam:HGCalBeamDown"/>
+    <rChild name="hgcalBeam:HGCalBeamWChamb"/>
+    <Translation x="0*fm" y="0*fm" z="([chamb5Z]-[downstreamZ]-[chambDzby2])"/>
+  </PosPart>
+  <PosPart copyNumber="7">
+    <rParent name="hgcalBeam:HGCalBeamDown"/>
+    <rChild name="hgcalBeam:HGCalBeamMuonCounter"/>
+    <Translation x="0*fm" y="0*fm" z="([mc1Z]-[downstreamZ]-[mcDzby2])"/>
+  </PosPart>
+  <PosPart copyNumber="8">
+    <rParent name="hgcalBeam:HGCalBeamDown"/>
+    <rChild name="hgcalBeam:HGCalBeamMuonCounter"/>
+    <Translation x="0*fm" y="0*fm" z="([mc2Z]-[downstreamZ]-[mcDzby2])"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="cms:CMSE"/>
+    <rChild name="hgcalBeam:HGCalBeam"/>
+    <Translation x="0*fm" y="0*fm" z="[upstreamZ]"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="cms:CMSE"/>
+    <rChild name="hgcalBeam:HGCalBeamDown"/>
+    <Translation x="0*fm" y="0*fm" z="[downstreamZ]"/>
+  </PosPart>
+  <PosPart copyNumber="5">
+    <rParent name="cms:CMSE"/>
+    <rChild name="hgcalBeam:HGCalBeamMCPS4"/>
+    <Translation x="0*fm" y="0*fm" z="[mcps4Z]"/>
+  </PosPart>
+</PosPartSection>
+
+<SpecParSection label="hgcalBeam.xml" eval="true">
+  <SpecPar name="hgcalbeam">
+    <PartSelector path="//HGCalBeamS.*"/>
+    <PartSelector path="//HGCalBeamHaloCounter"/>
+    <PartSelector path="//HGCalBeamMuonCounter"/>
+    <PartSelector path="//HGCalBeamCK3"/>
+    <PartSelector path="//HGCalBeamMCPS4"/>
+    <PartSelector path="//HGCalBeamWChambGas"/>
+    <Parameter name="SensitiveDetector" value="HcalTB06BeamDetector" eval="false"/>
+    <Parameter name="ReadOutName" value="HcalTB06BeamHits" eval="false"/>
+  </SpecPar>
+  <SpecPar name="hgcalbeamWC">
+    <PartSelector path="//HGCalBeamWChambGas"/>
+    <Parameter name="Volume" value="WireChamber" eval="false"/>
+  </SpecPar>
+  <SpecPar name="hgcProdCutsBeam">
+    <PartSelector path="//HGCalBeam"/>
+    <PartSelector path="//HGCalBeamDown"/>
+    <Parameter name="CMSCutsRegion" value="HGCalBeamRegion" eval="false"/>
+    <Parameter name="ProdCutsForElectrons" value="1.0*mm"/>
+<Parameter name="ProdCutsForProtons" value="1.0*mm"/>
+    <Parameter name="ProdCutsForPositrons" value="1.0*mm"/>
+    <Parameter name="ProdCutsForGamma"     value="1.0*mm"/>
+  </SpecPar>
+ 
+</SpecParSection>
+
+</DDDefinition>
diff --git a/Geometry/HGCalTBCommonData/data/TB161/TimingLayer/hgcalCons.xml b/Geometry/HGCalTBCommonData/data/TB161/TimingLayer/hgcalCons.xml
new file mode 100644
index 0000000000000..5c06aeecfb084
--- /dev/null
+++ b/Geometry/HGCalTBCommonData/data/TB161/TimingLayer/hgcalCons.xml
@@ -0,0 +1,33 @@
+<?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">
+
+<SpecParSection label="hgcalReco.xml" eval="true">
+  <SpecPar name="HGCalEEWafer">
+    <PartSelector path="//HGCalEEWafer.*"/>
+    <Parameter name="Volume" value="HGCalEEWafer" eval="false"/>
+    <Parameter name="WaferSize"      value="[hgcal:WaferW]"/>
+  </SpecPar>
+  <SpecPar name="HGCalEECell">
+    <PartSelector path="//HGCalEECell.*"/>
+    <Parameter name="Volume" value="HGCalEECell" eval="false"/>
+    <Parameter name="CellSize"      value="[hgcalwafer:CellWF]"/>
+    <Parameter name="CellSize"      value="[hgcalwafer:CellWC]"/>
+  </SpecPar>
+  <SpecPar name="HGCalEESensitive">
+    <PartSelector path="//HGCalEESensitive.*"/>
+    <Parameter name="Volume" value="HGCalEESensitive" eval="false"/>
+    <Parameter name="Slope"          value="0.0"/>
+    <Parameter name="GroupingZFine"  value="1"/>
+    <Parameter name="GroupingZFine"  value="1"/>
+    <Parameter name="GroupingZFine"  value="1"/>
+    <Parameter name="GroupingZMid"   value="1"/>
+    <Parameter name="GroupingZMid"   value="1"/>
+    <Parameter name="GroupingZMid"   value="1"/>
+    <Parameter name="GroupingZOut"   value="1"/>
+    <Parameter name="GroupingZOut"   value="1"/>
+    <Parameter name="GroupingZOut"   value="1"/>
+    <Parameter name="LayerOffset"    value="0"/>
+  </SpecPar>
+</SpecParSection>
+
+</DDDefinition>
diff --git a/Geometry/HGCalTBCommonData/data/TB161/TimingLayer/hgcalEE.xml b/Geometry/HGCalTBCommonData/data/TB161/TimingLayer/hgcalEE.xml
new file mode 100644
index 0000000000000..e2642eaf63a52
--- /dev/null
+++ b/Geometry/HGCalTBCommonData/data/TB161/TimingLayer/hgcalEE.xml
@@ -0,0 +1,80 @@
+<?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="hgcalEE.xml" eval="true">
+  <Constant name="rMinFine"   value="0.0*fm"/>
+  <Constant name="rMaxFine"   value="0.0*cm"/>
+  <Constant name="rMaxMiddle" value="120.0*cm"/>
+  <Constant name="rMaxCoarse" value="2000.0*cm"/>
+  <Constant name="rMin"       value="0.0*fm"/>
+  <Constant name="rMax"       value="10.0*cm"/>
+</ConstantsSection>
+
+<PosPartSection label="hgcalEE.xml">
+  <Algorithm name="hgcal:DDHGCalModuleAlgo">
+    <rParent name="hgcal:HGCalEE"/>
+    <Vector name="WaferName" type="string" nEntries="2">
+      hgcalwafer:HGCalEEWaferFine, hgcalwafer:HGCalEEWaferCoarse</Vector>
+    <Vector name="MaterialNames" type="string" nEntries="31">
+      materials:Lead, materials:Tungsten, materials:Tungsten, 
+      materials:Tungsten, materials:Tungsten, hgcal:WCu, hgcal:WCu, 
+      hgcal:WCu, materials:Copper, materials:G10, materials:Air, 
+      materials:Air, materials:Air, materials:Air, materials:Air, 
+      materials:Air, materials:Air, materials:Air, materials:Air, 
+      materials:Air, materials:Air, materials:Air, materials:Air, 
+      materials:Air, materials:Air, materials:Copper, materials:Kapton, materials:M_NEMA FR4 plate,  materials:G10, materials:M_NEMA FR4 plate, materials:Air</Vector>
+    <Vector name="VolumeNames" type="string" nEntries="31">
+      EEAbsorber1, EEAbsorber2, EEAbsorber3, EEAbsorber4, EEAbsorber5, 
+      EEAbsorber6, EEAbsorber7, EEAbsorber8, EEHeatShield, EEPCB,
+      EESensitive, EEAirGap1, EEAirGap2, EEAirGap3, EEAirGap4, EEAirGap5, 
+      EEAirGap6, EEAirGap7, EEAirGap8, EEAirGap9, EEAirGap10, EEAirGap11, 
+      EEAirGap12, EEAirGap13, EEAirGap14, EEHeatShield2, EEKapton, EECoverPlate, EEPCB2, EECoverPlate2, EEAirGap15</Vector>
+    <Vector name="Thickness" type="numeric" nEntries="31">
+      44.9*mm, 8.0*mm, 4.0*mm, 2.0*mm, 0.0*mm, 2.2*mm, 1.2*mm, 0.6*mm, 6.0*mm,
+      0.5*mm,  0.10*mm, 1.0*mm, 7.0*mm, 4.5*mm, 7.6*mm, 4.8*mm, 13.5*mm, 
+      9.69*mm, 8.09*mm, 10.69*mm, 19.4*mm, 10.59*mm, 22.1*mm, 15.39*mm, 16.29*mm,
+      12.0*mm, 0.01*mm, 0.5*mm, 1.0*mm, 1.0*mm, 4.8*mm </Vector>
+    <Vector name="Layers" type="numeric" nEntries="1"> 
+       16</Vector>
+    <Vector name="LayerThick" type="numeric" nEntries="1"> 
+      60.31*mm
+    </Vector>
+    <Vector name="LayerType" type="numeric" nEntries="16"> 
+      2,12,2,12,2,12,2,12,2,12,2,26,10,10,10,29
+    </Vector>
+    <Vector name="LayerSense" type="numeric" nEntries="16">
+      0, 0, 0, 0, 0, 0, 0,0, 0, 0, 0, 0, 1, 1, 1, 0
+    </Vector>
+    <Numeric name="zMinBlock"   value="[hgcal:zminEE]"/>
+    <Numeric name="rMaxFine"    value="[rMaxFine]"/>
+    <Numeric name="waferW"      value="[hgcal:WaferW]"/>
+    <Numeric name="waferGap"    value="0.0*fm"/>
+    <Numeric name="Sectors"     value="12"/>
+    <Vector name="SlopeBottom" type="numeric" nEntries="2">
+      0.0, 0.0</Vector>
+    <Vector name="SlopeTop" type="numeric" nEntries="2">
+      0, 0</Vector>
+    <Vector name="ZFront" type="numeric" nEntries="2">
+      [hgcal:zminEE], [hgcal:zmaxEE]</Vector>
+    <Vector name="RMaxFront" type="numeric" nEntries="2">
+      [hgcal:rmaxEE], [hgcal:rmaxEE]</Vector>
+    <String name="RotNameSpace" value="hgcalmodule"/>
+  </Algorithm>
+</PosPartSection> 
+
+<SpecParSection label="hgcalEE.xml" eval="true">
+  <SpecPar name="HGCalEE">
+    <PartSelector path="//HGCalEESensitive.*"/>    
+    <Parameter name="Volume" value="HGCalEESensitive" eval="false"/>
+    <Parameter name="GeometryMode" value="HGCalGeometryMode::Hexagon" eval="false"/>
+    <Parameter name="RadiusBound"  value="[rMinFine]"/>
+    <Parameter name="RadiusBound"  value="[rMaxFine]"/>
+    <Parameter name="RadiusBound"  value="[rMaxMiddle]"/>
+    <Parameter name="RadiusBound"  value="[rMaxCoarse]"/>
+    <Parameter name="RadiusLimits" value="[rMin]"/>
+    <Parameter name="RadiusLimits" value="[rMax]"/>
+    <Parameter name="LevelTop"     value="99"/>
+  </SpecPar>
+</SpecParSection>
+
+</DDDefinition>
diff --git a/Geometry/HGCalTBCommonData/data/TB161/cms.xml b/Geometry/HGCalTBCommonData/data/TB161/cms.xml
new file mode 100644
index 0000000000000..94fcd36e4cd71
--- /dev/null
+++ b/Geometry/HGCalTBCommonData/data/TB161/cms.xml
@@ -0,0 +1,35 @@
+<?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">
+
+<SolidSection label="hgcalwafer.xml">
+  <Tubs name="OCMS" rMin="0.0*fm" rMax="2.0*m" dz="15.0*m" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="CMSE" rMin="0.0*fm" rMax="2.0*m" dz="15.0*m" startPhi="0*deg" deltaPhi="360*deg"/>
+</SolidSection>
+
+<LogicalPartSection label="cms.xml">
+  <LogicalPart name="World" category="unspecified">
+    <rSolid name="OCMS"/>
+    <rMaterial name="materials:Air"/>
+  </LogicalPart>
+  <LogicalPart name="OCMS" category="unspecified">
+    <rSolid name="OCMS"/>
+    <rMaterial name="materials:Air"/>
+  </LogicalPart>
+  <LogicalPart name="CMSE" category="unspecified">
+    <rSolid name="CMSE"/>
+    <rMaterial name="materials:Air"/>
+  </LogicalPart>
+</LogicalPartSection>
+
+<PosPartSection label="cmsMother.xml">
+  <PosPart copyNumber="1">
+    <rParent name="cms:World"/>
+    <rChild name="cms:OCMS"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="cms:OCMS"/>
+    <rChild name="cms:CMSE"/>
+  </PosPart>
+</PosPartSection>
+
+</DDDefinition>
diff --git a/Geometry/HGCalTBCommonData/data/TB161/hgcProdCuts.xml b/Geometry/HGCalTBCommonData/data/TB161/hgcProdCuts.xml
new file mode 100644
index 0000000000000..3e605131eeb7c
--- /dev/null
+++ b/Geometry/HGCalTBCommonData/data/TB161/hgcProdCuts.xml
@@ -0,0 +1,15 @@
+<?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">
+
+<SpecParSection label="hgcProdCuts.xml" eval="true">
+  <SpecPar name="hgcProdCutsEE">
+    <PartSelector path="//HGCalEE"/>
+    <Parameter name="CMSCutsRegion" value="HGCalRegion" eval="false"/>
+    <Parameter name="ProdCutsForElectrons" value="0.03*mm"/>
+<Parameter name="ProdCutsForProtons" value="0.03*mm"/>
+    <Parameter name="ProdCutsForPositrons" value="0.03*mm"/>
+    <Parameter name="ProdCutsForGamma" value="0.03*mm"/>
+  </SpecPar>
+</SpecParSection>
+
+</DDDefinition>
diff --git a/Geometry/HGCalTBCommonData/data/TB161/hgcal.xml b/Geometry/HGCalTBCommonData/data/TB161/hgcal.xml
new file mode 100644
index 0000000000000..0741a3c890471
--- /dev/null
+++ b/Geometry/HGCalTBCommonData/data/TB161/hgcal.xml
@@ -0,0 +1,58 @@
+<?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="rmax"        value="50.*cm"/>
+  <Constant name="rmaxEE"      value="10.0*cm"/>
+  <Constant name="zCalor"      value="100.0*cm"/>
+  <Constant name="zminEE"      value="0.0*fm"/>
+  <Constant name="zmaxEE"      value="45.0*cm"/>
+  <Constant name="zposCalo"    value="1210.0*cm"/>
+  <Constant name="zposEE"      value="-[zCalor]"/>
+  <Constant name="WaferW"      value="123.7*mm"/>
+</ConstantsSection>
+
+<MaterialSection label="hgcal.xml">
+  <CompositeMaterial name="WCu" density="14.979*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.75">
+      <rMaterial name="materials:Tungsten"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.25">
+      <rMaterial name="materials:Copper"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+</MaterialSection>
+
+<SolidSection label="hgcal.xml">
+  <Tubs name="HGCal" rMin="0.0*fm" rMax="[rmax]" dz="[zCalor]" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Polycone name="HGCalEE" startPhi="0*deg" deltaPhi="360*deg">
+    <ZSection z="[zminEE]" rMin="0.0*fm" rMax="[rmaxEE]"/>
+    <ZSection z="[zmaxEE]" rMin="0.0*fm" rMax="[rmaxEE]"/>
+  </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>
+</LogicalPartSection>
+
+<PosPartSection label="hgcal.xml">
+  <PosPart copyNumber="1">
+    <rParent name="cms:CMSE"/>
+    <rChild name="hgcal:HGCal"/>
+    <Translation x="0*fm" y="0*fm" z="[zposCalo]"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcal:HGCal"/>
+    <rChild name="hgcal:HGCalEE"/>
+    <Translation x="0*fm" y="0*fm" z="[zposEE]"/>
+    <rRotation name="rotations:000D"/>
+  </PosPart>
+</PosPartSection>
+</DDDefinition>
diff --git a/Geometry/HGCalTBCommonData/data/TB161/hgcalBeam.xml b/Geometry/HGCalTBCommonData/data/TB161/hgcalBeam.xml
new file mode 100644
index 0000000000000..4cbc991baeca2
--- /dev/null
+++ b/Geometry/HGCalTBCommonData/data/TB161/hgcalBeam.xml
@@ -0,0 +1,418 @@
+<?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="hgcalBeam.xml" eval="true">
+  <Constant name="upstreamDxby2" value="100.0*cm"/>
+  <Constant name="upstreamDyby2" value="100.0*cm"/>
+  <Constant name="upstreamDzby2" value="400.0*cm"/>
+  <Constant name="upstreamZ" value="-400.0*cm"/>
+  <Constant name="tol" value="0.0*mm"/>
+  <Constant name="chambDxby2" value="11.0*cm"/>
+  <Constant name="chambAlT" value="5.0*mm"/>
+  <Constant name="chambKapW" value="11.0*cm"/>
+  <Constant name="chambKapT" value="0.025*mm"/>
+  <Constant name="chambVetW" value="25.0*mm"/>
+  <Constant name="chambVetT" value="5.0*mm"/>
+  <Constant name="chambVetGap" value="12.0*cm"/>
+  <Constant name="chambVetL" value="0.5*([chambVetGap]+[chambVetW])"/>
+  <Constant name="chambVetX" value="0.5*[chambVetW]"/>
+  <Constant name="chambVetZ" value="20.0*mm"/>
+  <Constant name="chambGasGap" value="([chambVetZ]+0.5*[chambVetT]+[tol])"/>
+  <Constant name="chambGasW" value="([chambVetW]+0.5*[chambVetGap]+[tol])"/>
+  <Constant name="chambDzby2" value="([chambGasGap]+[chambAlT]+2*[tol])"/>
+  <Constant name="chambAl1L" value="0.5*([chambDxby2]+0.5*[chambKapW])"/>
+  <Constant name="chambAl1W" value="0.5*([chambDxby2]-0.5*[chambKapW])"/>
+  <Constant name="chambAl1X" value="([chambDxby2]-[chambAl1L])"/>
+  <Constant name="chambAl1Y" value="([chambDxby2]-[chambAl1W])"/>
+  <Constant name="chambAl1Z" value="([chambGasGap]+0.5*[chambAlT]+[tol])"/>
+  <Constant name="chambAl2L" value="([chambDxby2]-0.5*[chambAlT])"/>
+  <Constant name="chambAl2X" value="([chambDxby2]-[chambAl2L])"/>
+  <Constant name="chambAl2Y" value="([chambDxby2]-0.5*[chambAlT])"/>
+  <Constant name="chamb1Z" value="-507.6*cm"/>
+  <Constant name="chamb2Z" value="-400.3*cm"/>
+  <Constant name="chamb3Z" value="-200.5*cm"/>
+  <Constant name="s1Dxby2" value="7.0*cm"/>
+  <Constant name="s1Dzby2" value="5.0*mm"/>
+  <Constant name="s1Z" value="-375.4*cm"/>
+  <Constant name="s2Dxby2" value="2.0*cm"/>
+  <Constant name="s2Dzby2" value="5.0*mm"/>
+  <Constant name="s2Z" value="-360.5*cm"/>
+  <Constant name="s3Dxby2" value="1.0*cm"/>
+  <Constant name="s3Dzby2" value="5.0*mm"/>
+  <Constant name="s3Z" value="-345.6*cm"/>
+  <Constant name="s4Z" value="-240.8*cm"/>
+  <Constant name="bhDxby2" value="50.0*cm"/>
+  <Constant name="bhDyby2" value="15.0*cm"/>
+  <Constant name="bhDzby2" value="0.5*cm"/>
+  <Constant name="bhGap" value="7.5*cm"/>
+  <Constant name="bhX" value="([bhDxby2]-0.5*[bhGap])"/>
+  <Constant name="bhY" value="([bhDyby2]+0.5*[bhGap])"/>
+  <Constant name="bhZ1" value="-229.3*cm"/>
+  <Constant name="bhZ2" value="-221.3*cm"/>
+  <Constant name="ck3Rad" value="8.35*cm"/>
+  <Constant name="ck3L" value="200.0*cm"/>
+  <Constant name="ck3Z" value="-569.0*cm"/>
+  <Constant name="downstreamDxby2" value="50.0*cm"/>
+  <Constant name="downstreamDyby2" value="50.0*cm"/>
+  <Constant name="downstreamDzby2" value="100.0*cm"/>
+  <Constant name="downstreamZ" value="900.0*cm"/>
+  <Constant name="chamb4Z" value="840.8*cm"/>
+  <Constant name="chamb5Z" value="965.5*cm"/>
+  <Constant name="mcDxby2" value="40.0*cm"/>
+  <Constant name="mcDzby2" value="20.0*mm"/>
+  <Constant name="mc1Z" value="873.5*cm"/>
+  <Constant name="mc2Z" value="985.5*cm"/>
+</ConstantsSection>
+
+<SolidSection label="hgcalBeam.xml">
+  <Box name="HGCalBeam" dx="[upstreamDxby2]" dy="[upstreamDyby2]" dz="[upstreamDzby2]"/>
+  <Box name="HGCalBeamWChamb" dx="[chambDxby2]" dy="[chambDxby2]" dz="[chambDzby2]"/>
+  <Box name="HGCalBeamWChambGas" dx="[chambGasW]" dy="[chambGasW]" dz="[chambGasGap]"/>
+  <Box name="HGCalBeamWChambVet" dx="[chambVetL]" dy="[chambVetW]/2" dz="[chambVetT]/2"/>
+  <Box name="HGCalBeamWChambWindow" dx="[chambKapW]/2" dy="[chambKapW]/2" dz="[chambKapT]/2"/>
+  <Box name="HGCalBeamWChambAl1" dx="[chambAl1L]" dy="[chambAl1W]" dz="[chambAlT]/2"/>
+  <Box name="HGCalBeamWChambAl2" dx="[chambAl2L]" dy="[chambAlT]/2" dz="[chambGasGap]"/>
+  <Box name="HGCalBeamS1" dx="[s1Dxby2]" dy="[s1Dxby2]" dz="[s1Dzby2]"/>
+  <Box name="HGCalBeamS2" dx="[s2Dxby2]" dy="[s2Dxby2]" dz="[s2Dzby2]"/>
+  <Box name="HGCalBeamS3" dx="[s3Dxby2]" dy="[s3Dxby2]" dz="[s3Dzby2]"/>
+  <Box name="HGCalBeamS4" dx="[s1Dxby2]" dy="[s1Dxby2]" dz="[s1Dzby2]"/>
+  <Box name="HGCalBeamHaloCounter" dx="[bhDxby2]" dy="[bhDyby2]" dz="[bhDzby2]"/>
+  <Tubs name="HGCalBeamCK3" rMin="0*fm" rMax="[ck3Rad]" dz="[ck3L]/2" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Box name="HGCalBeamDown" dx="[downstreamDxby2]" dy="[downstreamDyby2]" dz="[downstreamDzby2]"/>
+  <Box name="HGCalBeamMuonCounter" dx="[mcDxby2]" dy="[mcDxby2]" dz="[mcDzby2]"/>
+</SolidSection>
+
+<LogicalPartSection label="hgcalBeam.xml">
+  <LogicalPart name="HGCalBeam" category="unspecified">
+    <rSolid name="HGCalBeam"/>
+    <rMaterial name="materials:Air"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamWChamb" category="unspecified">
+    <rSolid name="HGCalBeamWChamb"/>
+    <rMaterial name="materials:Air"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamWChambGas" category="unspecified">
+    <rSolid name="HGCalBeamWChambGas"/>
+    <rMaterial name="materials:Ar 50pct plus CO_2 50pct"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamWChambVet" category="unspecified">
+    <rSolid name="HGCalBeamWChambVet"/>
+    <rMaterial name="materials:Polyethylene"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamWChambWindow" category="unspecified">
+    <rSolid name="HGCalBeamWChambWindow"/>
+    <rMaterial name="materials:Kapton"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamWChambAl1" category="unspecified">
+    <rSolid name="HGCalBeamWChambAl1"/>
+    <rMaterial name="materials:Aluminium"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamWChambAl2" category="unspecified">
+    <rSolid name="HGCalBeamWChambAl2"/>
+    <rMaterial name="materials:Aluminium"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamS1" category="unspecified">
+    <rSolid name="HGCalBeamS1"/>
+    <rMaterial name="materials:Scintillator"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamS2" category="unspecified">
+    <rSolid name="HGCalBeamS2"/>
+    <rMaterial name="materials:Scintillator"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamS3" category="unspecified">
+    <rSolid name="HGCalBeamS3"/>
+    <rMaterial name="materials:Scintillator"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamS4" category="unspecified">
+    <rSolid name="HGCalBeamS4"/>
+    <rMaterial name="materials:Scintillator"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamHaloCounter" category="unspecified">
+    <rSolid name="HGCalBeamHaloCounter"/>
+    <rMaterial name="materials:Scintillator"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamCK3" category="unspecified">
+    <rSolid name="HGCalBeamCK3"/>
+    <rMaterial name="materials:Freon-12"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamDown" category="unspecified">
+    <rSolid name="HGCalBeamDown"/>
+    <rMaterial name="materials:Air"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamMuonCounter" category="unspecified">
+    <rSolid name="HGCalBeamMuonCounter"/>
+    <rMaterial name="materials:Scintillator"/>
+  </LogicalPart>
+</LogicalPartSection>
+
+<RotationSection label="hgcalBeam.xml">
+  <Rotation name="R1" phiX="90*deg" thetaX="90*deg" phiY="180*deg" thetaY="90*deg" phiZ="0*deg" thetaZ="0*deg"/>
+</RotationSection>
+
+<PosPartSection label="hgcalBeam.xml">
+  <PosPart copyNumber="1">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambGas"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl1"/>
+    <Translation x="[chambAl1X]" y="[chambAl1Y]" z="[chambAl1Z]"/>
+  </PosPart>
+  <PosPart copyNumber="2">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl1"/>
+    <Translation x="-[chambAl1Y]" y="[chambAl1X]" z="[chambAl1Z]"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="3">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl1"/>
+    <Translation x="-[chambAl1X]" y="-[chambAl1Y]" z="[chambAl1Z]"/>
+  </PosPart>
+  <PosPart copyNumber="4">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl1"/>
+    <Translation x="[chambAl1Y]" y="-[chambAl1X]" z="[chambAl1Z]"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="5">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl1"/>
+    <Translation x="[chambAl1X]" y="[chambAl1Y]" z="-[chambAl1Z]"/>
+  </PosPart>
+  <PosPart copyNumber="6">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl1"/>
+    <Translation x="-[chambAl1Y]" y="[chambAl1X]" z="-[chambAl1Z]"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="7">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl1"/>
+    <Translation x="-[chambAl1X]" y="-[chambAl1Y]" z="-[chambAl1Z]"/>
+  </PosPart>
+  <PosPart copyNumber="8">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl1"/>
+    <Translation x="[chambAl1Y]" y="-[chambAl1X]" z="-[chambAl1Z]"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl2"/>
+    <Translation x="[chambAl2X]" y="[chambAl2Y]" z="0*fm"/>
+  </PosPart>
+  <PosPart copyNumber="2">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl2"/>
+    <Translation x="-[chambAl2Y]" y="[chambAl2X]" z="0*fm"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="3">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl2"/>
+    <Translation x="-[chambAl2X]" y="-[chambAl2Y]" z="0*fm"/>
+  </PosPart>
+  <PosPart copyNumber="4">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl2"/>
+    <Translation x="[chambAl2Y]" y="-[chambAl2X]" z="0*fm"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambWindow"/>
+    <Translation x="0*fm" y="0*fm" z="([chambDzby2]-0.5*[chambKapT])"/>
+  </PosPart>
+  <PosPart copyNumber="2">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambWindow"/>
+    <Translation x="0*fm" y="0*fm" z="-([chambDzby2]-0.5*[chambKapT])"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="[chambVetX]" y="[chambVetL]" z="[chambVetZ]"/>
+  </PosPart>
+  <PosPart copyNumber="2">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="-[chambVetL]" y="[chambVetX]" z="[chambVetZ]"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="3">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="-[chambVetX]" y="-[chambVetL]" z="[chambVetZ]"/>
+  </PosPart>
+  <PosPart copyNumber="4">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="[chambVetL]" y="-[chambVetX]" z="[chambVetZ]"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="5">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="[chambVetX]" y="[chambVetL]" z="0*fm"/>
+  </PosPart>
+  <PosPart copyNumber="6">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="-[chambVetL]" y="[chambVetX]" z="0*fm"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="7">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="-[chambVetX]" y="-[chambVetL]" z="0*fm"/>
+  </PosPart>
+  <PosPart copyNumber="8">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="[chambVetL]" y="-[chambVetX]" z="0*fm"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="9">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="[chambVetX]" y="[chambVetL]" z="-[chambVetZ]"/>
+  </PosPart>
+  <PosPart copyNumber="10">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="-[chambVetL]" y="[chambVetX]" z="-[chambVetZ]"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="11">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="-[chambVetX]" y="-[chambVetL]" z="-[chambVetZ]"/>
+  </PosPart>
+  <PosPart copyNumber="12">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="[chambVetL]" y="-[chambVetX]" z="-[chambVetZ]"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamWChamb"/>
+    <Translation x="0*fm" y="0*fm" z="([chamb1Z]-[upstreamZ]-[chambDzby2])"/>
+  </PosPart>
+  <PosPart copyNumber="2">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamWChamb"/>
+    <Translation x="0*fm" y="0*fm" z="([chamb2Z]-[upstreamZ]-[chambDzby2])"/>
+  </PosPart>
+  <PosPart copyNumber="3">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamWChamb"/>
+    <Translation x="0*fm" y="0*fm" z="([chamb3Z]-[upstreamZ]-[chambDzby2])"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamS1"/>
+    <Translation x="0*fm" y="0*fm" z="([s1Z]-[upstreamZ]-[s1Dzby2])"/>
+  </PosPart>
+  <PosPart copyNumber="2">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamS2"/>
+    <Translation x="0*fm" y="0*fm" z="([s2Z]-[upstreamZ]-[s2Dzby2])"/>
+  </PosPart>
+  <PosPart copyNumber="3">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamS3"/>
+    <Translation x="0*fm" y="0*fm" z="([s3Z]-[upstreamZ]-[s3Dzby2])"/>
+  </PosPart>
+  <PosPart copyNumber="4">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamS4"/>
+    <Translation x="0*fm" y="0*fm" z="([s4Z]-[upstreamZ]-[s1Dzby2])"/>
+  </PosPart>
+  <PosPart copyNumber="11">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamHaloCounter"/>
+    <Translation x="0*fm" y="[bhY]" z="([bhZ2]+[bhDzby2]-[upstreamZ])"/>
+  </PosPart>
+  <PosPart copyNumber="12">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamHaloCounter"/>
+    <Translation x="0*fm" y="-[bhY]" z="([bhZ2]+[bhDzby2]-[upstreamZ])"/>
+  </PosPart>
+  <PosPart copyNumber="13">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamHaloCounter"/>
+    <Translation x="-[bhY]" y="0*fm" z="([bhZ1]+[bhDzby2]-[upstreamZ])"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="14">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamHaloCounter"/>
+    <Translation x="[bhY]" y="0*fm" z="([bhZ1]+[bhDzby2]-[upstreamZ])"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="0">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamCK3"/>
+    <Translation x="0*fm" y="0*fm" z="([ck3Z]-[upstreamZ]-0.5*[ck3L])"/>
+  </PosPart>
+  <PosPart copyNumber="4">
+    <rParent name="hgcalBeam:HGCalBeamDown"/>
+    <rChild name="hgcalBeam:HGCalBeamWChamb"/>
+    <Translation x="0*fm" y="0*fm" z="([chamb4Z]-[downstreamZ]-[chambDzby2])"/>
+  </PosPart>
+  <PosPart copyNumber="5">
+    <rParent name="hgcalBeam:HGCalBeamDown"/>
+    <rChild name="hgcalBeam:HGCalBeamWChamb"/>
+    <Translation x="0*fm" y="0*fm" z="([chamb5Z]-[downstreamZ]-[chambDzby2])"/>
+  </PosPart>
+  <PosPart copyNumber="7">
+    <rParent name="hgcalBeam:HGCalBeamDown"/>
+    <rChild name="hgcalBeam:HGCalBeamMuonCounter"/>
+    <Translation x="0*fm" y="0*fm" z="([mc1Z]-[downstreamZ]-[mcDzby2])"/>
+  </PosPart>
+  <PosPart copyNumber="8">
+    <rParent name="hgcalBeam:HGCalBeamDown"/>
+    <rChild name="hgcalBeam:HGCalBeamMuonCounter"/>
+    <Translation x="0*fm" y="0*fm" z="([mc2Z]-[downstreamZ]-[mcDzby2])"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="cms:CMSE"/>
+    <rChild name="hgcalBeam:HGCalBeam"/>
+    <Translation x="0*fm" y="0*fm" z="[upstreamZ]"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="cms:CMSE"/>
+    <rChild name="hgcalBeam:HGCalBeamDown"/>
+    <Translation x="0*fm" y="0*fm" z="[downstreamZ]"/>
+  </PosPart>
+</PosPartSection>
+
+<SpecParSection label="hgcalBeam.xml" eval="true">
+  <SpecPar name="hgcalbeam">
+    <PartSelector path="//HGCalBeamS.*"/>
+    <PartSelector path="//HGCalBeamHaloCounter"/>
+    <PartSelector path="//HGCalBeamMuonCounter"/>
+    <PartSelector path="//HGCalBeamCK3"/>
+    <PartSelector path="//HGCalBeamWChambGas"/>
+    <Parameter name="SensitiveDetector" value="HcalTB06BeamDetector" eval="false"/>
+    <Parameter name="ReadOutName" value="HcalTB06BeamHits" eval="false"/>
+  </SpecPar>
+  <SpecPar name="hgcalbeamWC">
+    <PartSelector path="//HGCalBeamWChambGas"/>
+    <Parameter name="Volume" value="WireChamber" eval="false"/>
+  </SpecPar>
+  <SpecPar name="hgcProdCutsBeam">
+    <PartSelector path="//HGCalBeam"/>
+    <PartSelector path="//HGCalBeamDown"/>
+    <Parameter name="CMSCutsRegion" value="HGCalBeamRegion" eval="false"/>
+    <Parameter name="ProdCutsForElectrons" value="1.0*mm"/>
+<Parameter name="ProdCutsForProtons" value="1.0*mm"/>
+    <Parameter name="ProdCutsForPositrons" value="1.0*mm"/>
+    <Parameter name="ProdCutsForGamma"     value="1.0*mm"/>
+  </SpecPar>
+</SpecParSection>
+
+</DDDefinition>
diff --git a/Geometry/HGCalTBCommonData/data/TB161/hgcalsense.xml b/Geometry/HGCalTBCommonData/data/TB161/hgcalsense.xml
new file mode 100644
index 0000000000000..2f2587f5dbfaa
--- /dev/null
+++ b/Geometry/HGCalTBCommonData/data/TB161/hgcalsense.xml
@@ -0,0 +1,11 @@
+<?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">
+
+<SpecParSection label="hgcalsense.xml" eval="true">
+  <SpecPar name="hgcee">
+    <PartSelector path="//HGCalEECell.*"/>
+    <Parameter name="SensitiveDetector" value="HGCSensitiveDetector" eval="false"/>
+    <Parameter name="ReadOutName" value="HGCHitsEE" eval="false"/>
+  </SpecPar>
+</SpecParSection>
+</DDDefinition>
diff --git a/Geometry/HGCalTBCommonData/data/TB170/6Module/hgcal.xml b/Geometry/HGCalTBCommonData/data/TB170/6Module/hgcal.xml
new file mode 100644
index 0000000000000..81ed474fec50f
--- /dev/null
+++ b/Geometry/HGCalTBCommonData/data/TB170/6Module/hgcal.xml
@@ -0,0 +1,161 @@
+<?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="rmin"       value="0.0*fm"/>
+  <Constant name="rmax"       value="50.0*cm"/>
+  <Constant name="zCalor"     value="100.0*cm"/>
+  <Constant name="rminEE"     value="0.0*fm"/>
+  <Constant name="rmaxEE"     value="8.0*cm"/>
+  <Constant name="rmaxEEF"    value="9.5*cm"/>
+  <Constant name="zminEE"     value="0.0*fm"/>
+  <Constant name="zmaxEE"     value="33.3*cm"/>
+  <Constant name="rminHE"     value="0.0*fm"/>
+  <Constant name="rmaxHE"     value="19.5*cm"/>
+  <Constant name="rmaxHEF"    value="26.5*cm"/>
+  <Constant name="zminHE"     value="0.0*fm"/>
+  <Constant name="zmaxHE"     value="30.0*cm"/>
+  <Constant name="rminAH"     value="0.0*fm"/>
+  <Constant name="rmaxAH"     value="30.0*cm"/>
+  <Constant name="zminAH"     value="0.0*fm"/>
+  <Constant name="zmaxAH"     value="95.0*cm"/>
+  <Constant name="zgapEEFH"   value="5.0*cm"/>
+  <Constant name="zgapEEBL"   value="2.0*mm"/>
+  <Constant name="zgapFHBH"   value="1.0*cm"/>
+  <Constant name="dzBlock"    value="40.0*mm"/>
+  <Constant name="zposCalo"   value="1210.0*cm"/>
+  <Constant name="zposEE"     value="-[zCalor]"/>
+  <Constant name="zposHE"     value="[zposEE]+[zmaxEE]+[zgapEEFH]"/>
+  <Constant name="zposAH"     value="[zposHE]+[zmaxHE]+[zgapFHBH]"/>
+  <Constant name="zposBlock"  value="[zposEE]+[zmaxEE]+[zgapEEBL]+[dzBlock]/2"/>
+  <Constant name="thPCB"      value="1.6*mm"/>
+  <Constant name="thKapton"   value="0.01*mm"/>
+  <Constant name="thAbsEE"    value="1.2*mm"/>
+  <Constant name="thAbsHE"    value="1.2*mm"/>
+  <Constant name="WaferW"     value="123.7*mm"/>
+  <Constant name="tan30deg"   value="tan(30.0*deg)"/>
+</ConstantsSection>
+
+<MaterialSection label="hgcal.xml">
+  <CompositeMaterial name="WCu" density="14.979*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.75">
+      <rMaterial name="materials:Tungsten"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.25">
+      <rMaterial name="materials:Copper"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+</MaterialSection>
+
+<SolidSection label="hgcal.xml">
+  <Tubs name="HGCal" rMin="[rmin]" rMax="[rmax]" dz="[zCalor]" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Polycone name="HGCalEE" startPhi="0*deg" deltaPhi="360*deg">
+    <ZSection z="[zminEE]" rMin="[rminEE]" rMax="[rmaxEEF]"/>
+    <ZSection z="[zmaxEE]" rMin="[rminEE]" rMax="[rmaxEEF]"/>
+  </Polycone>
+  <Polycone name="HGCalHE" startPhi="0*deg" deltaPhi="360*deg">
+    <ZSection z="[zminHE]" rMin="[rminHE]" rMax="[rmaxHEF]"/>
+    <ZSection z="[zmaxHE]" rMin="[rminHE]" rMax="[rmaxHEF]"/>
+  </Polycone>
+  <Polycone name="HGCalAH" startPhi="0*deg" deltaPhi="360*deg">
+    <ZSection z="[zminAH]" rMin="[rminAH]" rMax="[rmaxAH]"/>
+    <ZSection z="[zmaxAH]" rMin="[rminAH]" rMax="[rmaxAH]"/>
+  </Polycone>
+  <Tubs name="HGCalBlock" rMin="[rminEE]" rMax="[rmaxEE]" dz="[dzBlock]/2" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Polyhedra name="HGCalPCB" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thPCB]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thPCB]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+  <Polyhedra name="HGCalKapton" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thKapton]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thKapton]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+  <Polyhedra name="HGCalEEAbs" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thAbsEE]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thAbsEE]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+  <Polyhedra name="HGCalHEAbs" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thAbsHE]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thAbsHE]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+</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>
+  <LogicalPart name="HGCalAH" category="unspecified">
+    <rSolid name="HGCalAH"/>
+    <rMaterial name="materials:Air"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBlock" category="unspecified">
+    <rSolid name="HGCalBlock"/>
+    <rMaterial name="materials:StainlessSteel"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalEEPCB" category="unspecified">
+    <rSolid name="HGCalPCB"/>
+    <rMaterial name="materials:G10"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalHEPCB" category="unspecified">
+    <rSolid name="HGCalPCB"/>
+    <rMaterial name="materials:G10"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalEEKapton" category="unspecified">
+    <rSolid name="HGCalKapton"/>
+    <rMaterial name="materials:Kapton"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalHEKapton" category="unspecified">
+    <rSolid name="HGCalKapton"/>
+    <rMaterial name="materials:Kapton"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalEEAbsorber" category="unspecified">
+    <rSolid name="HGCalEEAbs"/>
+    <rMaterial name="hgcal:WCu"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalHEAbsorber" category="unspecified">
+    <rSolid name="HGCalHEAbs"/>
+    <rMaterial name="materials:Copper"/>
+  </LogicalPart>
+</LogicalPartSection>
+
+<PosPartSection label="hgcal.xml">
+  <PosPart copyNumber="1">
+    <rParent name="cms:CMSE"/>
+    <rChild name="hgcal:HGCal"/>
+    <Translation x="0*fm" y="0*fm" z="[zposCalo]"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcal:HGCal"/>
+    <rChild name="hgcal:HGCalEE"/>
+    <Translation x="0*fm" y="0*fm" z="[zposEE]"/>
+    <rRotation name="rotations:R090"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcal:HGCal"/>
+    <rChild name="hgcal:HGCalBlock"/>
+    <Translation x="0*fm" y="0*fm" z="[zposBlock]"/>
+    <rRotation name="rotations:000D"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcal:HGCal"/>
+    <rChild name="hgcal:HGCalHE"/>
+    <Translation x="0*fm" y="0*fm" z="[zposHE]"/>
+    <rRotation name="rotations:R090"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcal:HGCal"/>
+    <rChild name="hgcal:HGCalAH"/>
+    <Translation x="0*fm" y="0*fm" z="[zposAH]"/>
+    <rRotation name="rotations:000D"/>
+  </PosPart>
+</PosPartSection>
+</DDDefinition>
diff --git a/Geometry/HGCalTBCommonData/data/TB170/6Module/hgcalHE.xml b/Geometry/HGCalTBCommonData/data/TB170/6Module/hgcalHE.xml
new file mode 100644
index 0000000000000..8e6b04ef7a7e2
--- /dev/null
+++ b/Geometry/HGCalTBCommonData/data/TB170/6Module/hgcalHE.xml
@@ -0,0 +1,83 @@
+<?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="hgcalHE.xml" eval="true">
+  <Constant name="rMinFine"   value="0.0*fm"/>
+  <Constant name="rMaxFine"   value="0.0*fm"/>
+  <Constant name="rMaxMiddle" value="0.0*fm"/>
+  <Constant name="rMaxCoarse" value="2000.0*cm"/>
+  <Constant name="rMin"       value="[hgcal:rminHE]"/>
+  <Constant name="rMax"       value="[hgcal:rmaxHE]"/>
+  <Constant name="absorbW"    value="1.5*[hgcal:WaferW]"/>
+  <Constant name="absorbH"    value="1.5*[hgcal:WaferW]"/>
+</ConstantsSection>
+
+<PosPartSection label="hgcalHE.xml">
+  <Algorithm name="hgcal:DDHGCalTBModule">
+    <rParent name="hgcal:HGCalHE"/>
+    <Vector name="WaferName" type="string" nEntries="2">
+      hgcalwafer:HGCalHEWaferFine, hgcalwafer:HGCalHEWaferCoarse</Vector>
+    <Vector name="CoverName" type="string" nEntries="3">
+      hgcal:HGCalHEPCB, hgcal:HGCalHEKapton, hgcal:HGCalHEAbsorber</Vector>
+    <Vector name="MaterialNames" type="string" nEntries="8">
+      materials:StainlessSteel, materials:Air, materials:Air, 
+      materials:Copper, materials:Air, materials:Air, materials:Air,
+      materials:StainlessSteel</Vector>
+    <Vector name="VolumeNames" type="string" nEntries="8">
+      HESiliconAbsorber1, HESiliconPCB1, HESiliconShield1, HESiliconHeatShield, 
+      HESiliconSensitive, HESiliconKapton1, HESiliconAirGap, 
+      HESiliconSupport</Vector>
+    <Vector name="Thickness" type="numeric" nEntries="8">
+      40.0*mm, [hgcal:thPCB], [hgcal:thAbsHE], 6.0*mm, 0.1*mm, [hgcal:thKapton],
+      6.89*mm, 10.0*mm</Vector>
+    <Vector name="Layers" type="numeric" nEntries="7"> 
+      1, 9, 9, 9, 9, 9, 7</Vector>
+    <Vector name="LayerThick" type="numeric" nEntries="7"> 
+      10.0*mm, 56.0*mm, 56.0*mm, 56.0*mm, 56.0*mm, 56.0*mm, 9.11*mm</Vector>
+    <Vector name="LayerType" type="numeric" nEntries="53"> 
+      7, 
+      3, 2, 5, 4, 4, 4, 1, 6, 0,  3, 2, 5, 4, 4, 4, 1, 6, 0,  
+      3, 2, 5, 4, 4, 4, 1, 6, 0,  3, 2, 5, 4, 4, 4, 1, 6, 0,  
+      3, 2, 5, 4, 4, 4, 1, 6, 0,  3, 2, 5, 4, 4, 4, 1  
+    </Vector>
+    <Vector name="LayerSense" type="numeric" nEntries="53">
+      0,
+      0, 4, 3, 1, 1, 1, 2, 0, 0,  0, 4, 3, 1, 1, 1, 2, 0, 0,
+      0, 4, 3, 1, 1, 1, 2, 0, 0,  0, 4, 3, 1, 1, 1, 2, 0, 0,
+      0, 4, 3, 1, 1, 1, 2, 0, 0,  0, 4, 3, 1, 1, 1, 2
+    </Vector>
+    <Numeric name="zMinBlock"   value="[hgcal:zminHE]"/>
+    <Numeric name="rMaxFine"    value="[rMaxFine]"/>
+    <Numeric name="waferW"      value="[hgcal:WaferW]"/>
+    <Numeric name="waferGap"    value="1.0*mm"/>
+    <Numeric name="absorberW"   value="[hgcalHE:absorbW]"/>
+    <Numeric name="absorberH"   value="[hgcalHE:absorbH]"/>
+    <Numeric name="Sectors"     value="12"/>
+    <Vector name="SlopeBottom" type="numeric" nEntries="2">
+      0.0, 0.0</Vector>
+    <Vector name="SlopeTop" type="numeric" nEntries="2">
+      0, 0</Vector>
+    <Vector name="ZFront" type="numeric" nEntries="2">
+      [hgcal:zminHE], [hgcal:zmaxHE]</Vector>
+    <Vector name="RMaxFront" type="numeric" nEntries="2">
+      [hgcal:rmaxHE], [hgcal:rmaxHE]</Vector>
+    <String name="RotNameSpace" value="hgcalmodule"/>
+  </Algorithm>
+</PosPartSection> 
+
+<SpecParSection label="hgcalHE.xml" eval="true">
+  <SpecPar name="HGCalHE">
+    <PartSelector path="//HGCalHESiliconSensitive.*"/>
+    <Parameter name="Volume" value="HGCalHESiliconSensitive" eval="false"/>
+    <Parameter name="GeometryMode" value="HGCalGeometryMode::Hexagon" eval="false"/>
+    <Parameter name="RadiusBound"  value="[rMinFine]"/>
+    <Parameter name="RadiusBound"  value="[rMaxFine]"/>
+    <Parameter name="RadiusBound"  value="[rMaxMiddle]"/>
+    <Parameter name="RadiusBound"  value="[rMaxCoarse]"/>
+    <Parameter name="RadiusLimits" value="[rMin]"/>
+    <Parameter name="RadiusLimits" value="[rMax]"/>
+    <Parameter name="LevelTop"     value="99"/>
+  </SpecPar>
+</SpecParSection>
+
+</DDDefinition>
diff --git a/Geometry/HGCalTBCommonData/data/TB170/July17/ahcal.xml b/Geometry/HGCalTBCommonData/data/TB170/July17/ahcal.xml
new file mode 100644
index 0000000000000..18bbde0900b30
--- /dev/null
+++ b/Geometry/HGCalTBCommonData/data/TB170/July17/ahcal.xml
@@ -0,0 +1,170 @@
+<?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="ahcal.xml" eval="true">
+  <Constant name="absorberThick" value="12.1*mm"/>
+  <Constant name="radiatorThick" value="74.0*mm"/>
+  <Constant name="airgapThick"   value="0.535*mm"/>
+  <Constant name="cassetteThick" value="0.5*mm"/>
+  <Constant name="cableThick"    value="1.5*mm"/>
+  <Constant name="pcbThick"      value="0.7*mm"/>
+  <Constant name="foilThick"     value="0.115*mm"/>
+  <Constant name="scintThick"    value="3.0*mm"/>
+  <Constant name="passiveHeight" value="39.0*cm"/>
+  <Constant name="passiveWidth"  value="42.0*cm"/>
+  <Constant name="activeHeight"  value="36.0*cm"/>
+  <Constant name="activeWidth"   value="36.0*cm"/>
+  <Constant name="tileGap"       value="30.0*mm"/>
+  <Constant name="tileHeight"    value="29.8*mm"/>
+  <Constant name="tileWidth"     value="29.8*mm"/>
+  <Constant name="tileEdge"      value="0.1*mm"/>
+</ConstantsSection>
+
+<MaterialSection label="ahcal.xml">
+  <CompositeMaterial name="Steel235" density="7.87*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.9843">
+      <rMaterial name="materials:Iron"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.0017">
+      <rMaterial name="materials:Carbon"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.0140">
+      <rMaterial name="materials:Manganese"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+  <CompositeMaterial name="PCB" density="1.70*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.180774">
+      <rMaterial name="materials:Silicon"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.405633">
+      <rMaterial name="materials:Oxygen"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.278042">
+      <rMaterial name="materials:Carbon"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.0684428">
+      <rMaterial name="materials:Hydrogen"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.0671091">
+      <rMaterial name="materials:Bromine"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+  <CompositeMaterial name="Polystyrene" density="1.060*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.077418">
+      <rMaterial name="materials:Hydrogen"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.922582">
+      <rMaterial name="materials:Carbon"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+  <CompositeMaterial name="PVC" density="1.35*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.048384">
+      <rMaterial name="materials:Hydrogen"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.384378">
+      <rMaterial name="materials:Carbon"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.567238">
+      <rMaterial name="materials:Chlorine"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+  <CompositeMaterial name="Polystyrole" density="1.065*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.077421">
+      <rMaterial name="materials:Hydrogen"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.922579">
+      <rMaterial name="materials:Carbon"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+  <CompositeMaterial name="CFM" density="0.120*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.009">
+      <rMaterial name="materials:Air"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.872">
+      <rMaterial name="ahcal:PVC"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.119">
+      <rMaterial name="ahcal:Polystyrole"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+</MaterialSection>
+
+
+<SolidSection label="ahcal.xml">
+  <Box name="AHcalTileSensitive" dx="[tileWidth]/2" dy="[tileHeight]/2"
+       dz="[scintThick]/2"/>
+</SolidSection>
+
+<LogicalPartSection label="ahcal.xml">
+  <LogicalPart name="AHcalTileSensitive" category="unspecified">
+    <rSolid name="AHcalTileSensitive"/>
+    <rMaterial name="ahcal:Polystyrene"/>
+  </LogicalPart>
+</LogicalPartSection>
+
+<PosPartSection label="ahcal.xml">
+  <Algorithm name="hgcal:DDAHcalModuleAlgo">
+    <rParent name="hgcal:HGCalAH"/>
+    <String name="TileName" value="ahcal:AHcalTileSensitive"/>
+    <Vector name="MaterialNames" type="string" nEntries="9">
+      ahcal:Steel235, materials:Air, ahcal:Steel235, ahcal:CFM, ahcal:PCB, 
+      ahcal:Polystyrole, ahcal:Polystyrene, ahcal:Steel235, ahcal:Steel235</Vector>
+    <Vector name="VolumeNames" type="string" nEntries="9">
+      AHcalRadiator, AHcalAirGap, AHcalCassette, AHcalCable, AHcalPCB,
+      AHcalFoil, AHcalActive, AHcalAbsorber, AHcalAbsorberLastCover</Vector>
+    <Vector name="Thickness" type="numeric" nEntries="9">
+      [ahcal:radiatorThick], [ahcal:airgapThick], [ahcal:cassetteThick], 
+      [ahcal:cableThick], [ahcal:pcbThick], [ahcal:foilThick], 
+      [ahcal:scintThick], [ahcal:absorberThick], 5.0*mm</Vector>
+    <Vector name="Layers" type="numeric" nEntries="12"> 
+      10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 11</Vector>
+    <Vector name="LayerThick" type="numeric" nEntries="12"> 
+      19.6*mm, 81.5*mm, 81.5*mm, 81.5*mm, 81.5*mm, 81.5*mm, 81.5*mm, 81.5*mm,
+      81.5*mm, 81.5*mm, 81.5*mm, 86.5*mm</Vector>
+    <Vector name="LayerType" type="numeric" nEntries="121"> 
+      7, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1,
+      0, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1,
+      0, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1,
+      0, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1,
+      0, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1,
+      0, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1, 8
+    </Vector>
+    <Vector name="LayerSense" type="numeric" nEntries="121">
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0
+    </Vector>
+    <Vector name="Widths" type="numeric" nEntries="2">
+      [ahcal:passiveWidth], [ahcal:activeWidth] </Vector>
+    <Vector name="Heights" type="numeric" nEntries="2">
+      [ahcal:passiveHeight], [ahcal:activeHeight] </Vector>
+    <Vector name="TileN" type="numeric" nEntries="2">
+      12, 12 </Vector>
+    <Vector name="TileStep" type="numeric" nEntries="2">
+      [ahcal:tileGap], [ahcal:tileGap] </Vector>
+    <Numeric name="zMinBlock"   value="[hgcal:zminAH]"/>
+    <String name="RotNameSpace" value="hgcalmodule"/>
+  </Algorithm>
+</PosPartSection> 
+
+<SpecParSection label="ahcal.xml" eval="true">
+  <SpecPar name="AHcal">
+    <PartSelector path="//AHcalTileSensitive.*"/>
+    <Parameter name="Volume" value="AHcalTileSensitive" eval="false"/>
+    <Parameter name="SensitiveDetector" value="AHcalSensitiveDetector" eval="false"/>
+    <Parameter name="ReadOutName" value="HcalHits" eval="false"/>
+  </SpecPar>
+  <SpecPar name="hgcProdCutsAHcal">
+    <PartSelector path="//HGCalAH"/>
+    <Parameter name="CMSCutsRegion" value="HGCalAHcalRegion" eval="false"/>
+    <Parameter name="ProdCutsForElectrons" value="1.0*mm"/>
+<Parameter name="ProdCutsForProtons" value="1.0*mm"/>
+    <Parameter name="ProdCutsForPositrons" value="1.0*mm"/>
+    <Parameter name="ProdCutsForGamma"     value="1.0*mm"/>
+  </SpecPar>
+</SpecParSection>
+
+</DDDefinition>
diff --git a/Geometry/HGCalTBCommonData/data/TB170/July17/hgcal.xml b/Geometry/HGCalTBCommonData/data/TB170/July17/hgcal.xml
new file mode 100644
index 0000000000000..b71280d05058a
--- /dev/null
+++ b/Geometry/HGCalTBCommonData/data/TB170/July17/hgcal.xml
@@ -0,0 +1,149 @@
+<?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="rmin"       value="0.0*fm"/>
+  <Constant name="rmax"       value="50.0*cm"/>
+  <Constant name="zCaloFront" value="1069.8*cm"/>
+  <Constant name="rminEE"     value="0.0*fm"/>
+  <Constant name="rmaxEE"     value="8.0*cm"/>
+  <Constant name="rmaxEEF"    value="9.5*cm"/>
+  <Constant name="zminEE"     value="0.0*fm"/>
+  <Constant name="zmaxEE"     value="58.5*cm"/>
+  <Constant name="rminHE"     value="0.0*fm"/>
+  <Constant name="rmaxHE"     value="19.5*cm"/>
+  <Constant name="rmaxHEF"    value="26.5*cm"/>
+  <Constant name="zminHE"     value="0.0*fm"/>
+  <Constant name="zmaxHE"     value="88.2*cm"/>
+  <Constant name="rminAH"     value="0.0*fm"/>
+  <Constant name="rmaxAH"     value="30.0*cm"/>
+  <Constant name="zminAH"     value="0.0*fm"/>
+  <Constant name="zmaxAH"     value="92.2*cm"/>
+  <Constant name="zgapEEFH"   value="3.8*cm"/>
+  <Constant name="zgapFHBH"   value="3.0*cm"/>
+  <Constant name="zCalor"     value="([zmaxEE]+[zgapEEFH]+[zmaxHE]+[zgapFHBH]+
+				     [zmaxAH])/2.0"/>
+  <Constant name="zposCalo"   value="([zCaloFront]+[zCalor])"/>
+  <Constant name="zposEE"     value="-[zCalor]"/>
+  <Constant name="zposHE"     value="[zposEE]+[zmaxEE]+[zgapEEFH]"/>
+  <Constant name="zposAH"     value="[zposHE]+[zmaxHE]+[zgapFHBH]"/>
+  <Constant name="thPCB"      value="1.6*mm"/>
+  <Constant name="thKapton"   value="0.01*mm"/>
+  <Constant name="thAbsEE"    value="1.2*mm"/>
+  <Constant name="thAbsHE"    value="1.2*mm"/>
+  <Constant name="WaferW"     value="123.7*mm"/>
+  <Constant name="tan30deg"   value="tan(30.0*deg)"/>
+</ConstantsSection>
+
+<MaterialSection label="hgcal.xml">
+  <CompositeMaterial name="WCu" density="14.979*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.75">
+      <rMaterial name="materials:Tungsten"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.25">
+      <rMaterial name="materials:Copper"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+</MaterialSection>
+
+<SolidSection label="hgcal.xml">
+  <Tubs name="HGCal" rMin="[rmin]" rMax="[rmax]" dz="[zCalor]" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Polycone name="HGCalEE" startPhi="0*deg" deltaPhi="360*deg">
+    <ZSection z="[zminEE]" rMin="[rminEE]" rMax="[rmaxEEF]"/>
+    <ZSection z="[zmaxEE]" rMin="[rminEE]" rMax="[rmaxEEF]"/>
+  </Polycone>
+  <Polycone name="HGCalHE" startPhi="0*deg" deltaPhi="360*deg">
+    <ZSection z="[zminHE]" rMin="[rminHE]" rMax="[rmaxHEF]"/>
+    <ZSection z="[zmaxHE]" rMin="[rminHE]" rMax="[rmaxHEF]"/>
+  </Polycone>
+  <Polycone name="HGCalAH" startPhi="0*deg" deltaPhi="360*deg">
+    <ZSection z="[zminAH]" rMin="[rminAH]" rMax="[rmaxAH]"/>
+    <ZSection z="[zmaxAH]" rMin="[rminAH]" rMax="[rmaxAH]"/>
+  </Polycone>
+  <Polyhedra name="HGCalPCB" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thPCB]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thPCB]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+  <Polyhedra name="HGCalKapton" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thKapton]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thKapton]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+  <Polyhedra name="HGCalEEAbs" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thAbsEE]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thAbsEE]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+  <Polyhedra name="HGCalHEAbs" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thAbsHE]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thAbsHE]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+</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>
+  <LogicalPart name="HGCalAH" category="unspecified">
+    <rSolid name="HGCalAH"/>
+    <rMaterial name="materials:Air"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalEEPCB" category="unspecified">
+    <rSolid name="HGCalPCB"/>
+    <rMaterial name="materials:G10"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalHEPCB" category="unspecified">
+    <rSolid name="HGCalPCB"/>
+    <rMaterial name="materials:G10"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalEEKapton" category="unspecified">
+    <rSolid name="HGCalKapton"/>
+    <rMaterial name="materials:Kapton"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalHEKapton" category="unspecified">
+    <rSolid name="HGCalKapton"/>
+    <rMaterial name="materials:Kapton"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalEEAbsorber" category="unspecified">
+    <rSolid name="HGCalEEAbs"/>
+    <rMaterial name="hgcal:WCu"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalHEAbsorber" category="unspecified">
+    <rSolid name="HGCalHEAbs"/>
+    <rMaterial name="materials:Copper"/>
+  </LogicalPart>
+</LogicalPartSection>
+
+<PosPartSection label="hgcal.xml">
+  <PosPart copyNumber="1">
+    <rParent name="cms:CMSE"/>
+    <rChild name="hgcal:HGCal"/>
+    <Translation x="0*fm" y="0*fm" z="[zposCalo]"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcal:HGCal"/>
+    <rChild name="hgcal:HGCalEE"/>
+    <Translation x="0*fm" y="0*fm" z="[zposEE]"/>
+    <rRotation name="rotations:R090"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcal:HGCal"/>
+    <rChild name="hgcal:HGCalHE"/>
+    <Translation x="0*fm" y="0*fm" z="[zposHE]"/>
+    <rRotation name="rotations:R090"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcal:HGCal"/>
+    <rChild name="hgcal:HGCalAH"/>
+    <Translation x="0*fm" y="0*fm" z="[zposAH]"/>
+    <rRotation name="rotations:000D"/>
+  </PosPart>
+</PosPartSection>
+</DDDefinition>
diff --git a/Geometry/HGCalTBCommonData/data/TB170/July17/hgcalBeam.xml b/Geometry/HGCalTBCommonData/data/TB170/July17/hgcalBeam.xml
new file mode 100644
index 0000000000000..d371bab400bfe
--- /dev/null
+++ b/Geometry/HGCalTBCommonData/data/TB170/July17/hgcalBeam.xml
@@ -0,0 +1,431 @@
+<?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="hgcalBeam.xml" eval="true">
+  <Constant name="upstreamDxby2" value="100.0*cm"/>
+  <Constant name="upstreamDyby2" value="100.0*cm"/>
+  <Constant name="upstreamDzby2" value="400.0*cm"/>
+  <Constant name="upstreamZ" value="-400.0*cm"/>
+  <Constant name="tol" value="0.0*mm"/>
+  <Constant name="chambDxby2" value="11.0*cm"/>
+  <Constant name="chambAlT" value="5.0*mm"/>
+  <Constant name="chambKapW" value="11.0*cm"/>
+  <Constant name="chambKapT" value="0.025*mm"/>
+  <Constant name="chambVetW" value="25.0*mm"/>
+  <Constant name="chambVetT" value="5.0*mm"/>
+  <Constant name="chambVetGap" value="12.0*cm"/>
+  <Constant name="chambVetL" value="0.5*([chambVetGap]+[chambVetW])"/>
+  <Constant name="chambVetX" value="0.5*[chambVetW]"/>
+  <Constant name="chambVetZ" value="20.0*mm"/>
+  <Constant name="chambGasGap" value="([chambVetZ]+0.5*[chambVetT]+[tol])"/>
+  <Constant name="chambGasW" value="([chambVetW]+0.5*[chambVetGap]+[tol])"/>
+  <Constant name="chambDzby2" value="([chambGasGap]+[chambAlT]+2*[tol])"/>
+  <Constant name="chambAl1L" value="0.5*([chambDxby2]+0.5*[chambKapW])"/>
+  <Constant name="chambAl1W" value="0.5*([chambDxby2]-0.5*[chambKapW])"/>
+  <Constant name="chambAl1X" value="([chambDxby2]-[chambAl1L])"/>
+  <Constant name="chambAl1Y" value="([chambDxby2]-[chambAl1W])"/>
+  <Constant name="chambAl1Z" value="([chambGasGap]+0.5*[chambAlT]+[tol])"/>
+  <Constant name="chambAl2L" value="([chambDxby2]-0.5*[chambAlT])"/>
+  <Constant name="chambAl2X" value="([chambDxby2]-[chambAl2L])"/>
+  <Constant name="chambAl2Y" value="([chambDxby2]-0.5*[chambAlT])"/>
+  <Constant name="chamb1Z" value="-507.6*cm"/>
+  <Constant name="chamb2Z" value="-400.3*cm"/>
+  <Constant name="chamb3Z" value="-200.5*cm"/>
+  <Constant name="s1Dxby2" value="7.0*cm"/>
+  <Constant name="s1Dzby2" value="5.0*mm"/>
+  <Constant name="s1Z" value="-375.4*cm"/>
+  <Constant name="s2Dxby2" value="2.0*cm"/>
+  <Constant name="s2Dzby2" value="5.0*mm"/>
+  <Constant name="s2Z" value="-360.5*cm"/>
+  <Constant name="s3Dxby2" value="1.0*cm"/>
+  <Constant name="s3Dzby2" value="5.0*mm"/>
+  <Constant name="s3Z" value="-345.6*cm"/>
+  <Constant name="s4Z" value="-240.8*cm"/>
+  <Constant name="bhDxby2" value="50.0*cm"/>
+  <Constant name="bhDyby2" value="15.0*cm"/>
+  <Constant name="bhDzby2" value="0.5*cm"/>
+  <Constant name="bhGap" value="7.5*cm"/>
+  <Constant name="bhX" value="([bhDxby2]-0.5*[bhGap])"/>
+  <Constant name="bhY" value="([bhDyby2]+0.5*[bhGap])"/>
+  <Constant name="bhZ1" value="-229.3*cm"/>
+  <Constant name="bhZ2" value="-221.3*cm"/>
+  <Constant name="ck3Rad" value="8.35*cm"/>
+  <Constant name="ck3L" value="200.0*cm"/>
+  <Constant name="ck3Z" value="-569.0*cm"/>
+  <Constant name="downstreamDxby2" value="50.0*cm"/>
+  <Constant name="downstreamDyby2" value="50.0*cm"/>
+  <Constant name="downstreamDzby2" value="100.0*cm"/>
+  <Constant name="downstreamZ" value="900.0*cm"/>
+  <Constant name="chamb4Z" value="840.8*cm"/>
+  <Constant name="chamb5Z" value="966.8*cm"/>
+  <Constant name="mcDxby2" value="40.0*cm"/>
+  <Constant name="mcDzby2" value="20.0*mm"/>
+  <Constant name="mc1Z" value="892.8*cm"/>
+  <Constant name="mc2Z" value="984.8*cm"/>
+  <Constant name="s5Dxby2" value="9.5*cm"/>
+  <Constant name="s5Dzby2" value="2.0*cm"/>
+  <Constant name="s5Z"     value="([hgcal:zCaloFront]-[s5Dzby2])"/>
+</ConstantsSection>
+
+<SolidSection label="hgcalBeam.xml">
+  <Box name="HGCalBeam" dx="[upstreamDxby2]" dy="[upstreamDyby2]" dz="[upstreamDzby2]"/>
+  <Box name="HGCalBeamWChamb" dx="[chambDxby2]" dy="[chambDxby2]" dz="[chambDzby2]"/>
+  <Box name="HGCalBeamWChambGas" dx="[chambGasW]" dy="[chambGasW]" dz="[chambGasGap]"/>
+  <Box name="HGCalBeamWChambVet" dx="[chambVetL]" dy="[chambVetW]/2" dz="[chambVetT]/2"/>
+  <Box name="HGCalBeamWChambWindow" dx="[chambKapW]/2" dy="[chambKapW]/2" dz="[chambKapT]/2"/>
+  <Box name="HGCalBeamWChambAl1" dx="[chambAl1L]" dy="[chambAl1W]" dz="[chambAlT]/2"/>
+  <Box name="HGCalBeamWChambAl2" dx="[chambAl2L]" dy="[chambAlT]/2" dz="[chambGasGap]"/>
+  <Box name="HGCalBeamS1" dx="[s1Dxby2]" dy="[s1Dxby2]" dz="[s1Dzby2]"/>
+  <Box name="HGCalBeamS2" dx="[s2Dxby2]" dy="[s2Dxby2]" dz="[s2Dzby2]"/>
+  <Box name="HGCalBeamS3" dx="[s3Dxby2]" dy="[s3Dxby2]" dz="[s3Dzby2]"/>
+  <Box name="HGCalBeamS4" dx="[s1Dxby2]" dy="[s1Dxby2]" dz="[s1Dzby2]"/>
+  <Box name="HGCalBeamS5" dx="[s5Dxby2]" dy="[s5Dxby2]" dz="[s5Dzby2]"/>
+  <Box name="HGCalBeamHaloCounter" dx="[bhDxby2]" dy="[bhDyby2]" dz="[bhDzby2]"/>
+  <Tubs name="HGCalBeamCK3" rMin="0*fm" rMax="[ck3Rad]" dz="[ck3L]/2" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Box name="HGCalBeamDown" dx="[downstreamDxby2]" dy="[downstreamDyby2]" dz="[downstreamDzby2]"/>
+  <Box name="HGCalBeamMuonCounter" dx="[mcDxby2]" dy="[mcDxby2]" dz="[mcDzby2]"/>
+</SolidSection>
+
+<LogicalPartSection label="hgcalBeam.xml">
+  <LogicalPart name="HGCalBeam" category="unspecified">
+    <rSolid name="HGCalBeam"/>
+    <rMaterial name="materials:Air"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamWChamb" category="unspecified">
+    <rSolid name="HGCalBeamWChamb"/>
+    <rMaterial name="materials:Air"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamWChambGas" category="unspecified">
+    <rSolid name="HGCalBeamWChambGas"/>
+    <rMaterial name="materials:Ar 50pct plus CO_2 50pct"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamWChambVet" category="unspecified">
+    <rSolid name="HGCalBeamWChambVet"/>
+    <rMaterial name="materials:Polyethylene"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamWChambWindow" category="unspecified">
+    <rSolid name="HGCalBeamWChambWindow"/>
+    <rMaterial name="materials:Kapton"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamWChambAl1" category="unspecified">
+    <rSolid name="HGCalBeamWChambAl1"/>
+    <rMaterial name="materials:Aluminium"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamWChambAl2" category="unspecified">
+    <rSolid name="HGCalBeamWChambAl2"/>
+    <rMaterial name="materials:Aluminium"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamS1" category="unspecified">
+    <rSolid name="HGCalBeamS1"/>
+    <rMaterial name="materials:Scintillator"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamS2" category="unspecified">
+    <rSolid name="HGCalBeamS2"/>
+    <rMaterial name="materials:Scintillator"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamS3" category="unspecified">
+    <rSolid name="HGCalBeamS3"/>
+    <rMaterial name="materials:Scintillator"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamS4" category="unspecified">
+    <rSolid name="HGCalBeamS4"/>
+    <rMaterial name="materials:Scintillator"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamS5" category="unspecified">
+    <rSolid name="HGCalBeamS5"/>
+    <rMaterial name="materials:Scintillator"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamHaloCounter" category="unspecified">
+    <rSolid name="HGCalBeamHaloCounter"/>
+    <rMaterial name="materials:Scintillator"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamCK3" category="unspecified">
+    <rSolid name="HGCalBeamCK3"/>
+    <rMaterial name="materials:Freon-12"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamDown" category="unspecified">
+    <rSolid name="HGCalBeamDown"/>
+    <rMaterial name="materials:Air"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamMuonCounter" category="unspecified">
+    <rSolid name="HGCalBeamMuonCounter"/>
+    <rMaterial name="materials:Scintillator"/>
+  </LogicalPart>
+</LogicalPartSection>
+
+<RotationSection label="hgcalBeam.xml">
+  <Rotation name="R1" phiX="90*deg" thetaX="90*deg" phiY="180*deg" thetaY="90*deg" phiZ="0*deg" thetaZ="0*deg"/>
+</RotationSection>
+
+<PosPartSection label="hgcalBeam.xml">
+  <PosPart copyNumber="1">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambGas"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl1"/>
+    <Translation x="[chambAl1X]" y="[chambAl1Y]" z="[chambAl1Z]"/>
+  </PosPart>
+  <PosPart copyNumber="2">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl1"/>
+    <Translation x="-[chambAl1Y]" y="[chambAl1X]" z="[chambAl1Z]"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="3">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl1"/>
+    <Translation x="-[chambAl1X]" y="-[chambAl1Y]" z="[chambAl1Z]"/>
+  </PosPart>
+  <PosPart copyNumber="4">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl1"/>
+    <Translation x="[chambAl1Y]" y="-[chambAl1X]" z="[chambAl1Z]"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="5">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl1"/>
+    <Translation x="[chambAl1X]" y="[chambAl1Y]" z="-[chambAl1Z]"/>
+  </PosPart>
+  <PosPart copyNumber="6">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl1"/>
+    <Translation x="-[chambAl1Y]" y="[chambAl1X]" z="-[chambAl1Z]"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="7">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl1"/>
+    <Translation x="-[chambAl1X]" y="-[chambAl1Y]" z="-[chambAl1Z]"/>
+  </PosPart>
+  <PosPart copyNumber="8">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl1"/>
+    <Translation x="[chambAl1Y]" y="-[chambAl1X]" z="-[chambAl1Z]"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl2"/>
+    <Translation x="[chambAl2X]" y="[chambAl2Y]" z="0*fm"/>
+  </PosPart>
+  <PosPart copyNumber="2">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl2"/>
+    <Translation x="-[chambAl2Y]" y="[chambAl2X]" z="0*fm"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="3">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl2"/>
+    <Translation x="-[chambAl2X]" y="-[chambAl2Y]" z="0*fm"/>
+  </PosPart>
+  <PosPart copyNumber="4">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl2"/>
+    <Translation x="[chambAl2Y]" y="-[chambAl2X]" z="0*fm"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambWindow"/>
+    <Translation x="0*fm" y="0*fm" z="([chambDzby2]-0.5*[chambKapT])"/>
+  </PosPart>
+  <PosPart copyNumber="2">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambWindow"/>
+    <Translation x="0*fm" y="0*fm" z="-([chambDzby2]-0.5*[chambKapT])"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="[chambVetX]" y="[chambVetL]" z="[chambVetZ]"/>
+  </PosPart>
+  <PosPart copyNumber="2">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="-[chambVetL]" y="[chambVetX]" z="[chambVetZ]"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="3">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="-[chambVetX]" y="-[chambVetL]" z="[chambVetZ]"/>
+  </PosPart>
+  <PosPart copyNumber="4">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="[chambVetL]" y="-[chambVetX]" z="[chambVetZ]"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="5">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="[chambVetX]" y="[chambVetL]" z="0*fm"/>
+  </PosPart>
+  <PosPart copyNumber="6">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="-[chambVetL]" y="[chambVetX]" z="0*fm"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="7">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="-[chambVetX]" y="-[chambVetL]" z="0*fm"/>
+  </PosPart>
+  <PosPart copyNumber="8">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="[chambVetL]" y="-[chambVetX]" z="0*fm"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="9">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="[chambVetX]" y="[chambVetL]" z="-[chambVetZ]"/>
+  </PosPart>
+  <PosPart copyNumber="10">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="-[chambVetL]" y="[chambVetX]" z="-[chambVetZ]"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="11">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="-[chambVetX]" y="-[chambVetL]" z="-[chambVetZ]"/>
+  </PosPart>
+  <PosPart copyNumber="12">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="[chambVetL]" y="-[chambVetX]" z="-[chambVetZ]"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamWChamb"/>
+    <Translation x="0*fm" y="0*fm" z="([chamb1Z]-[upstreamZ]-[chambDzby2])"/>
+  </PosPart>
+  <PosPart copyNumber="2">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamWChamb"/>
+    <Translation x="0*fm" y="0*fm" z="([chamb2Z]-[upstreamZ]-[chambDzby2])"/>
+  </PosPart>
+  <PosPart copyNumber="3">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamWChamb"/>
+    <Translation x="0*fm" y="0*fm" z="([chamb3Z]-[upstreamZ]-[chambDzby2])"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamS1"/>
+    <Translation x="0*fm" y="0*fm" z="([s1Z]-[upstreamZ]-[s1Dzby2])"/>
+  </PosPart>
+  <PosPart copyNumber="2">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamS2"/>
+    <Translation x="0*fm" y="0*fm" z="([s2Z]-[upstreamZ]-[s2Dzby2])"/>
+  </PosPart>
+  <PosPart copyNumber="3">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamS3"/>
+    <Translation x="0*fm" y="0*fm" z="([s3Z]-[upstreamZ]-[s3Dzby2])"/>
+  </PosPart>
+  <PosPart copyNumber="4">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamS4"/>
+    <Translation x="0*fm" y="0*fm" z="([s4Z]-[upstreamZ]-[s1Dzby2])"/>
+  </PosPart>
+  <PosPart copyNumber="11">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamHaloCounter"/>
+    <Translation x="0*fm" y="[bhY]" z="([bhZ2]+[bhDzby2]-[upstreamZ])"/>
+  </PosPart>
+  <PosPart copyNumber="12">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamHaloCounter"/>
+    <Translation x="0*fm" y="-[bhY]" z="([bhZ2]+[bhDzby2]-[upstreamZ])"/>
+  </PosPart>
+  <PosPart copyNumber="13">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamHaloCounter"/>
+    <Translation x="-[bhY]" y="0*fm" z="([bhZ1]+[bhDzby2]-[upstreamZ])"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="14">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamHaloCounter"/>
+    <Translation x="[bhY]" y="0*fm" z="([bhZ1]+[bhDzby2]-[upstreamZ])"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="0">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamCK3"/>
+    <Translation x="0*fm" y="0*fm" z="([ck3Z]-[upstreamZ]-0.5*[ck3L])"/>
+  </PosPart>
+  <PosPart copyNumber="4">
+    <rParent name="hgcalBeam:HGCalBeamDown"/>
+    <rChild name="hgcalBeam:HGCalBeamWChamb"/>
+    <Translation x="0*fm" y="0*fm" z="([chamb4Z]-[downstreamZ]-[chambDzby2])"/>
+  </PosPart>
+  <PosPart copyNumber="5">
+    <rParent name="hgcalBeam:HGCalBeamDown"/>
+    <rChild name="hgcalBeam:HGCalBeamWChamb"/>
+    <Translation x="0*fm" y="0*fm" z="([chamb5Z]-[downstreamZ]-[chambDzby2])"/>
+  </PosPart>
+  <PosPart copyNumber="7">
+    <rParent name="hgcalBeam:HGCalBeamDown"/>
+    <rChild name="hgcalBeam:HGCalBeamMuonCounter"/>
+    <Translation x="0*fm" y="0*fm" z="([mc1Z]-[downstreamZ]-[mcDzby2])"/>
+  </PosPart>
+  <PosPart copyNumber="8">
+    <rParent name="hgcalBeam:HGCalBeamDown"/>
+    <rChild name="hgcalBeam:HGCalBeamMuonCounter"/>
+    <Translation x="0*fm" y="0*fm" z="([mc2Z]-[downstreamZ]-[mcDzby2])"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="cms:CMSE"/>
+    <rChild name="hgcalBeam:HGCalBeam"/>
+    <Translation x="0*fm" y="0*fm" z="[upstreamZ]"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="cms:CMSE"/>
+    <rChild name="hgcalBeam:HGCalBeamDown"/>
+    <Translation x="0*fm" y="0*fm" z="[downstreamZ]"/>
+  </PosPart>
+  <PosPart copyNumber="5">
+    <rParent name="cms:CMSE"/>
+    <rChild name="hgcalBeam:HGCalBeamS5"/>
+    <Translation x="0*fm" y="0*fm" z="[s5Z]"/>
+  </PosPart>
+</PosPartSection>
+
+<SpecParSection label="hgcalBeam.xml" eval="true">
+  <SpecPar name="hgcalbeam">
+    <PartSelector path="//HGCalBeamS.*"/>
+    <PartSelector path="//HGCalBeamHaloCounter"/>
+    <PartSelector path="//HGCalBeamMuonCounter"/>
+    <PartSelector path="//HGCalBeamCK3"/>
+    <PartSelector path="//HGCalBeamWChambGas"/>
+    <Parameter name="SensitiveDetector" value="HcalTB06BeamDetector" eval="false"/>
+    <Parameter name="ReadOutName" value="HcalTB06BeamHits" eval="false"/>
+  </SpecPar>
+  <SpecPar name="hgcalbeamWC">
+    <PartSelector path="//HGCalBeamWChambGas"/>
+    <Parameter name="Volume" value="WireChamber" eval="false"/>
+  </SpecPar>
+  <SpecPar name="hgcProdCutsBeam">
+    <PartSelector path="//HGCalBeam"/>
+    <PartSelector path="//HGCalBeamDown"/>
+    <Parameter name="CMSCutsRegion" value="HGCalBeamRegion" eval="false"/>
+    <Parameter name="ProdCutsForElectrons" value="1.0*mm"/>
+<Parameter name="ProdCutsForProtons" value="1.0*mm"/>
+    <Parameter name="ProdCutsForPositrons" value="1.0*mm"/>
+    <Parameter name="ProdCutsForGamma"     value="1.0*mm"/>
+  </SpecPar>
+</SpecParSection>
+
+</DDDefinition>
diff --git a/Geometry/HGCalTBCommonData/data/TB170/July17/hgcalCons.xml b/Geometry/HGCalTBCommonData/data/TB170/July17/hgcalCons.xml
new file mode 100644
index 0000000000000..ab8f59ed24632
--- /dev/null
+++ b/Geometry/HGCalTBCommonData/data/TB170/July17/hgcalCons.xml
@@ -0,0 +1,104 @@
+<?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">
+
+<SpecParSection label="hgcalReco.xml" eval="true">
+  <SpecPar name="HGCalEEWafer">
+    <PartSelector path="//HGCalEEWafer.*"/>
+    <Parameter name="Volume" value="HGCalEEWafer" eval="false"/>
+    <Parameter name="WaferSize"      value="[hgcal:WaferW]"/>
+  </SpecPar>
+  <SpecPar name="HGCalHEWafer">
+    <PartSelector path="//HGCalHEWafer.*"/>
+    <Parameter name="Volume" value="HGCalHEWafer" eval="false"/>
+    <Parameter name="WaferSize"      value="[hgcal:WaferW]"/>
+  </SpecPar>
+  <SpecPar name="HGCalEECell">
+    <PartSelector path="//HGCalEECell.*"/>
+    <Parameter name="Volume" value="HGCalEECell" eval="false"/>
+    <Parameter name="CellSize"      value="[hgcalwafer:CellWF]"/>
+    <Parameter name="CellSize"      value="[hgcalwafer:CellWC]"/>
+  </SpecPar>
+  <SpecPar name="HGCalHECell">
+    <PartSelector path="//HGCalHECell.*"/>
+    <Parameter name="Volume" value="HGCalHECell" eval="false"/>
+    <Parameter name="CellSize"      value="[hgcalwafer:CellWF]"/>
+    <Parameter name="CellSize"      value="[hgcalwafer:CellWC]"/>
+  </SpecPar>
+  <SpecPar name="HGCalEESensitive">
+    <PartSelector path="//HGCalEESensitive.*"/>
+    <Parameter name="Volume" value="HGCalEESensitive" eval="false"/>
+    <Parameter name="Slope"  value="0.0"/>
+    <Parameter name="GroupingZFine"  value="1"/>
+    <Parameter name="GroupingZFine"  value="1"/>
+    <Parameter name="GroupingZFine"  value="1"/>
+    <Parameter name="GroupingZFine"  value="2"/>
+    <Parameter name="GroupingZFine"  value="2"/>
+    <Parameter name="GroupingZFine"  value="2"/>
+    <Parameter name="GroupingZFine"  value="3"/>
+    <Parameter name="GroupingZFine"  value="3"/>
+    <Parameter name="GroupingZFine"  value="3"/>
+    <Parameter name="GroupingZMid"  value="1"/>
+    <Parameter name="GroupingZMid"  value="1"/>
+    <Parameter name="GroupingZMid"  value="1"/>
+    <Parameter name="GroupingZMid"  value="2"/>
+    <Parameter name="GroupingZMid"  value="2"/>
+    <Parameter name="GroupingZMid"  value="2"/>
+    <Parameter name="GroupingZMid"  value="3"/>
+    <Parameter name="GroupingZMid"  value="3"/>
+    <Parameter name="GroupingZMid"  value="3"/>
+    <Parameter name="GroupingZOut"  value="1"/>
+    <Parameter name="GroupingZOut"  value="1"/>
+    <Parameter name="GroupingZOut"  value="1"/>
+    <Parameter name="GroupingZOut"  value="2"/>
+    <Parameter name="GroupingZOut"  value="2"/>
+    <Parameter name="GroupingZOut"  value="2"/>
+    <Parameter name="GroupingZOut"  value="3"/>
+    <Parameter name="GroupingZOut"  value="3"/>
+    <Parameter name="GroupingZOut"  value="3"/>
+    <Parameter name="LayerOffset"   value="0"/>
+  </SpecPar>
+  <SpecPar name="HGCalHESiliconSensitive">
+    <PartSelector path="//HGCalHESiliconSensitive.*"/>
+    <Parameter name="Volume" value="HGCalHESiliconSensitive" eval="false"/>
+    <Parameter name="Slope"  value="0.0"/>
+    <Parameter name="GroupingZFine"  value="1"/>
+    <Parameter name="GroupingZFine"  value="1"/>
+    <Parameter name="GroupingZFine"  value="1"/>
+    <Parameter name="GroupingZFine"  value="2"/>
+    <Parameter name="GroupingZFine"  value="2"/>
+    <Parameter name="GroupingZFine"  value="2"/>
+    <Parameter name="GroupingZFine"  value="3"/>
+    <Parameter name="GroupingZFine"  value="3"/>
+    <Parameter name="GroupingZFine"  value="3"/>
+    <Parameter name="GroupingZFine"  value="4"/>
+    <Parameter name="GroupingZFine"  value="4"/>
+    <Parameter name="GroupingZFine"  value="4"/>
+    <Parameter name="GroupingZMid"   value="1"/>
+    <Parameter name="GroupingZMid"   value="1"/>
+    <Parameter name="GroupingZMid"   value="1"/>
+    <Parameter name="GroupingZMid"   value="2"/>
+    <Parameter name="GroupingZMid"   value="2"/>
+    <Parameter name="GroupingZMid"   value="2"/>
+    <Parameter name="GroupingZMid"   value="3"/>
+    <Parameter name="GroupingZMid"   value="3"/>
+    <Parameter name="GroupingZMid"   value="3"/>
+    <Parameter name="GroupingZMid"   value="4"/>
+    <Parameter name="GroupingZMid"   value="4"/>
+    <Parameter name="GroupingZMid"   value="4"/>
+    <Parameter name="GroupingZOut"   value="1"/>
+    <Parameter name="GroupingZOut"   value="1"/>
+    <Parameter name="GroupingZOut"   value="1"/>
+    <Parameter name="GroupingZOut"   value="2"/>
+    <Parameter name="GroupingZOut"   value="2"/>
+    <Parameter name="GroupingZOut"   value="2"/>
+    <Parameter name="GroupingZOut"   value="3"/>
+    <Parameter name="GroupingZOut"   value="3"/>
+    <Parameter name="GroupingZOut"   value="3"/>
+    <Parameter name="GroupingZOut"   value="4"/>
+    <Parameter name="GroupingZOut"   value="4"/>
+    <Parameter name="GroupingZOut"   value="4"/>
+    <Parameter name="LayerOffset"    value="3"/>
+  </SpecPar>
+</SpecParSection>
+
+</DDDefinition>
diff --git a/Geometry/HGCalTBCommonData/data/TB170/July17/hgcalEE.xml b/Geometry/HGCalTBCommonData/data/TB170/July17/hgcalEE.xml
new file mode 100644
index 0000000000000..73d936444dba6
--- /dev/null
+++ b/Geometry/HGCalTBCommonData/data/TB170/July17/hgcalEE.xml
@@ -0,0 +1,113 @@
+<?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="hgcalEE.xml" eval="true">
+  <Constant name="rMinFine"   value="0.0*fm"/>
+  <Constant name="rMaxFine"   value="0.0*cm"/>
+  <Constant name="rMaxMiddle" value="120.0*cm"/>
+  <Constant name="rMaxCoarse" value="2000.0*cm"/>
+  <Constant name="rMin"       value="0.0*fm"/>
+  <Constant name="rMax"       value="10.0*cm"/>
+  <Constant name="absorbW"    value="0.5*[hgcal:WaferW]"/>
+  <Constant name="absorbH"    value="[hgcal:WaferW]*[hgcal:tan30deg]"/>
+</ConstantsSection>
+
+<PosPartSection label="hgcalEE.xml">
+  <Algorithm name="hgcal:DDHGCalTBModule">
+    <rParent name="hgcal:HGCalEE"/>
+    <Vector name="WaferName" type="string" nEntries="2">
+      hgcalwafer:HGCalEEWaferFine, hgcalwafer:HGCalEEWaferCoarse</Vector>
+    <Vector name="CoverName" type="string" nEntries="3">
+      hgcal:HGCalEEPCB, hgcal:HGCalEEKapton, hgcal:HGCalEEAbsorber</Vector>
+    <Vector name="MaterialNames" type="string" nEntries="15">
+      materials:Air, materials:Air, materials:Air, materials:Air, 
+      materials:StainlessSteel, materials:Lead, materials:Copper,
+      materials:Air, materials:Aluminium, materials:Air, materials:Air, 
+      materials:Air, materials:Air, materials:Air, 
+      materials:StainlessSteel</Vector>
+    <Vector name="VolumeNames" type="string" nEntries="15">
+      EEPCB1,      EEKapton1,   EEAirGap,     EEShield1, 
+      EEAbsorber1, EEAbsorber2, EEHeatShield, EESensitive, EEAlcase, 
+      EEgap1,      EEgap2,      EEgap3,       EEgap4,      EEgap5, EEFe</Vector>
+    <Vector name="Thickness" type="numeric" nEntries="15">
+      [hgcal:thPCB], [hgcal:thKapton], 3.0*mm, [hgcal:thAbsEE], 0.3*mm,
+      4.9*mm, 6.0*mm, 0.10*mm, 2.6*mm, 11.0*mm, 13.2*mm, 11.4*mm, 150.3*mm, 
+      176.7*mm, 40*mm</Vector>
+    <Vector name="Layers" type="numeric" nEntries="16"> 
+      10, 4, 4, 4, 11, 4, 4, 4, 4, 4, 4, 4, 10, 4, 4, 4</Vector>
+    <Vector name="LayerThick" type="numeric" nEntries="16"> 
+      338.71*mm, 11.50*mm, 11.50*mm, 11.50*mm, 25.61*mm, 
+      11.50*mm,  11.50*mm, 11.50*mm, 11.50*mm, 11.50*mm, 11.50*mm, 11.50*mm, 
+      21.81*mm,  11.50*mm, 11.50*mm, 60.00*mm
+    </Vector>
+    <Vector name="LayerType" type="numeric" nEntries="83"> 
+      8,12, 0, 7, 7, 7, 1, 3, 6,13,
+      4, 5, 4, 6,
+      4, 5, 4, 6,
+      4, 5, 4, 6,
+      4, 5, 4, 6, 3, 1, 7, 7, 7, 0, 9,
+      4, 5, 4, 6,
+      4, 5, 4, 6,
+      4, 5, 4, 6,
+      4, 5, 4, 6,
+      4, 5, 4, 6,
+      4, 5, 4, 6,
+      4, 5, 4, 6,
+      4, 5, 4,10, 0, 7, 7, 7, 1, 3, 
+      6, 4, 5, 4,
+      6, 4, 5, 4,
+      6,11,14, 8
+    </Vector>
+    <Vector name="LayerSense" type="numeric" nEntries="83">
+      0, 0, 2, 1, 1, 1, 3, 4, 0, 0,
+      0, 0, 0, 0,
+      0, 0, 0, 0,
+      0, 0, 0, 0,
+      0, 0, 0, 0, 4, 3, 1, 1, 1, 2,0,
+      0, 0, 0, 0,
+      0, 0, 0, 0,
+      0, 0, 0, 0,
+      0, 0, 0, 0,
+      0, 0, 0, 0,
+      0, 0, 0, 0,
+      0, 0, 0, 0,
+      0, 0, 0, 0, 2, 1, 1, 1, 3, 4,
+      0, 0, 0, 0, 
+      0, 0, 0, 0,
+      0, 0, 0, 0
+    </Vector>
+    <Numeric name="zMinBlock"   value="[hgcal:zminEE]"/>
+    <Numeric name="rMaxFine"    value="[rMaxFine]"/>
+    <Numeric name="waferW"      value="[hgcal:WaferW]"/>
+    <Numeric name="waferGap"    value="0.0*fm"/>
+    <Numeric name="absorberW"   value="[hgcalEE:absorbW]"/>
+    <Numeric name="absorberH"   value="[hgcalEE:absorbH]"/>
+    <Numeric name="Sectors"     value="12"/>
+    <Vector name="SlopeBottom" type="numeric" nEntries="2">
+      0.0, 0.0</Vector>
+    <Vector name="SlopeTop" type="numeric" nEntries="2">
+      0, 0</Vector>
+    <Vector name="ZFront" type="numeric" nEntries="2">
+      [hgcal:zminEE], [hgcal:zmaxEE]</Vector>
+    <Vector name="RMaxFront" type="numeric" nEntries="2">
+      [hgcal:rmaxEE], [hgcal:rmaxEE]</Vector>
+    <String name="RotNameSpace" value="hgcalmodule"/>
+  </Algorithm>
+</PosPartSection> 
+
+<SpecParSection label="hgcalEE.xml" eval="true">
+  <SpecPar name="HGCalEE">
+    <PartSelector path="//HGCalEESensitive.*"/>    
+    <Parameter name="Volume" value="HGCalEESensitive" eval="false"/>
+    <Parameter name="GeometryMode" value="HGCalGeometryMode::Hexagon" eval="false"/>
+    <Parameter name="RadiusBound"  value="[rMinFine]"/>
+    <Parameter name="RadiusBound"  value="[rMaxFine]"/>
+    <Parameter name="RadiusBound"  value="[rMaxMiddle]"/>
+    <Parameter name="RadiusBound"  value="[rMaxCoarse]"/>
+    <Parameter name="RadiusLimits" value="[rMin]"/>
+    <Parameter name="RadiusLimits" value="[rMax]"/>
+    <Parameter name="LevelTop"     value="99"/>
+  </SpecPar>
+</SpecParSection>
+
+</DDDefinition>
diff --git a/Geometry/HGCalTBCommonData/data/TB170/July17/hgcalHE.xml b/Geometry/HGCalTBCommonData/data/TB170/July17/hgcalHE.xml
new file mode 100644
index 0000000000000..28caf63425934
--- /dev/null
+++ b/Geometry/HGCalTBCommonData/data/TB170/July17/hgcalHE.xml
@@ -0,0 +1,89 @@
+<?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="hgcalHE.xml" eval="true">
+  <Constant name="rMinFine"   value="0.0*fm"/>
+  <Constant name="rMaxFine"   value="0.0*fm"/>
+  <Constant name="rMaxMiddle" value="0.0*fm"/>
+  <Constant name="rMaxCoarse" value="2000.0*cm"/>
+  <Constant name="rMin"       value="[hgcal:rminHE]"/>
+  <Constant name="rMax"       value="[hgcal:rmaxHE]"/>
+  <Constant name="absorbW"    value="1.5*[hgcal:WaferW]"/>
+  <Constant name="absorbH"    value="1.5*[hgcal:WaferW]"/>
+</ConstantsSection>
+
+<PosPartSection label="hgcalHE.xml">
+  <Algorithm name="hgcal:DDHGCalTBModule">
+    <rParent name="hgcal:HGCalHE"/>
+    <Vector name="WaferName" type="string" nEntries="2">
+      hgcalwafer:HGCalHEWaferFine, hgcalwafer:HGCalHEWaferCoarse</Vector>
+    <Vector name="CoverName" type="string" nEntries="3">
+      hgcal:HGCalHEPCB, hgcal:HGCalHEKapton, hgcal:HGCalHEAbsorber</Vector>
+    <Vector name="MaterialNames" type="string" nEntries="16">
+      materials:StainlessSteel, materials:Air, materials:Air, 
+      materials:Copper, materials:Air, materials:Air, materials:Air,
+      materials:StainlessSteel, materials:Air, materials:Air, materials:Air,
+      materials:Air, materials:Air, materials:Air, materials:Air, 
+      materials:Air</Vector>
+    <Vector name="VolumeNames" type="string" nEntries="16">
+      HESiliconAbsorber1, HESiliconPCB1, HESiliconShield1, HESiliconHeatShield, 
+      HESiliconSensitive, HESiliconKapton1, HESiliconAirGap, 
+      HESiliconSupport, HEAirGap1, HEAirGap2, HEAirGap3, HEAirGap4, HEAirGap5, 
+      HEAirGap6, HEAirGap7, HEAirGap8</Vector>
+    <Vector name="Thickness" type="numeric" nEntries="16">
+      40.0*mm, [hgcal:thPCB], [hgcal:thAbsHE], 6.0*mm, 0.1*mm, [hgcal:thKapton],
+      26.9*mm, 10.0*mm, 30.0*mm, 38.0*mm, 42.0*mm, 46.9*mm, 48.9*mm, 58.9*mm, 
+      78.0*mm, 63.0*mm</Vector>
+    <Vector name="Layers" type="numeric" nEntries="5"> 
+      10, 11, 14, 11, 4 </Vector>
+    <Vector name="LayerThick" type="numeric" nEntries="5"> 
+      137.11*mm, 176.01*mm, 239.01*mm, 188.01*mm, 140.90*mm</Vector>
+    <Vector name="LayerType" type="numeric" nEntries="50"> 
+      7, 14, 0,  3, 2, 5, 4, 4, 4, 1,
+      11, 0, 0,  0, 3, 2, 5, 4, 4, 4, 1,
+      6,  0, 7, 15, 7, 0, 0, 3, 2, 5, 4, 4, 4, 1,
+      13, 0, 0,  0, 3, 2, 5, 4, 4, 4, 1, 
+      12, 0, 10, 7
+    </Vector>
+    <Vector name="LayerSense" type="numeric" nEntries="50">
+      0, 0, 0, 0, 4, 3, 1, 1, 1, 2,
+      0, 0, 0, 0, 0, 4, 3, 1, 1, 1, 2, 
+      0, 0, 0, 0, 0, 0, 0, 0, 4, 3, 1, 1, 1, 2, 
+      0, 0, 0, 0, 0, 4, 3, 1, 1, 1, 2,
+      0, 0, 0, 0
+    </Vector>
+    <Numeric name="zMinBlock"   value="[hgcal:zminHE]"/>
+    <Numeric name="rMaxFine"    value="[rMaxFine]"/>
+    <Numeric name="waferW"      value="[hgcal:WaferW]"/>
+    <Numeric name="waferGap"    value="1.0*mm"/>
+    <Numeric name="absorberW"   value="[hgcalHE:absorbW]"/>
+    <Numeric name="absorberH"   value="[hgcalHE:absorbH]"/>
+    <Numeric name="Sectors"     value="12"/>
+    <Vector name="SlopeBottom" type="numeric" nEntries="2">
+      0.0, 0.0</Vector>
+    <Vector name="SlopeTop" type="numeric" nEntries="2">
+      0, 0</Vector>
+    <Vector name="ZFront" type="numeric" nEntries="2">
+      [hgcal:zminHE], [hgcal:zmaxHE]</Vector>
+    <Vector name="RMaxFront" type="numeric" nEntries="2">
+      [hgcal:rmaxHE], [hgcal:rmaxHE]</Vector>
+    <String name="RotNameSpace" value="hgcalmodule"/>
+  </Algorithm>
+</PosPartSection> 
+
+<SpecParSection label="hgcalHE.xml" eval="true">
+  <SpecPar name="HGCalHE">
+    <PartSelector path="//HGCalHESiliconSensitive.*"/>
+    <Parameter name="Volume" value="HGCalHESiliconSensitive" eval="false"/>
+    <Parameter name="GeometryMode" value="HGCalGeometryMode::Hexagon" eval="false"/>
+    <Parameter name="RadiusBound"  value="[rMinFine]"/>
+    <Parameter name="RadiusBound"  value="[rMaxFine]"/>
+    <Parameter name="RadiusBound"  value="[rMaxMiddle]"/>
+    <Parameter name="RadiusBound"  value="[rMaxCoarse]"/>
+    <Parameter name="RadiusLimits" value="[rMin]"/>
+    <Parameter name="RadiusLimits" value="[rMax]"/>
+    <Parameter name="LevelTop"     value="99"/>
+  </SpecPar>
+</SpecParSection>
+
+</DDDefinition>
diff --git a/Geometry/HGCalTBCommonData/data/TB170/Sep17/hgcal.xml b/Geometry/HGCalTBCommonData/data/TB170/Sep17/hgcal.xml
new file mode 100644
index 0000000000000..23fc456e534d8
--- /dev/null
+++ b/Geometry/HGCalTBCommonData/data/TB170/Sep17/hgcal.xml
@@ -0,0 +1,149 @@
+<?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="rmin"       value="0.0*fm"/>
+  <Constant name="rmax"       value="50.0*cm"/>
+  <Constant name="zCaloFront" value="1069.8*cm"/>
+  <Constant name="rminEE"     value="0.0*fm"/>
+  <Constant name="rmaxEE"     value="8.0*cm"/>
+  <Constant name="rmaxEEF"    value="9.5*cm"/>
+  <Constant name="zminEE"     value="0.0*fm"/>
+  <Constant name="zmaxEE"     value="73.6*cm"/>
+  <Constant name="rminHE"     value="0.0*fm"/>
+  <Constant name="rmaxHE"     value="19.0*cm"/>
+  <Constant name="rmaxHEF"    value="26.5*cm"/>
+  <Constant name="zminHE"     value="0.0*fm"/>
+  <Constant name="zmaxHE"     value="85.5*cm"/>
+  <Constant name="rminAH"     value="0.0*fm"/>
+  <Constant name="rmaxAH"     value="30.0*cm"/>
+  <Constant name="zminAH"     value="0.0*fm"/>
+  <Constant name="zmaxAH"     value="92.2*cm"/>
+  <Constant name="zgapEEFH"   value="3.8*cm"/>
+  <Constant name="zgapFHBH"   value="3.0*cm"/>
+  <Constant name="zCalor"     value="([zmaxEE]+[zgapEEFH]+[zmaxHE]+[zgapFHBH]+
+				     [zmaxAH])/2.0"/>
+  <Constant name="zposCalo"   value="([zCaloFront]+[zCalor])"/>
+  <Constant name="zposEE"     value="-[zCalor]"/>
+  <Constant name="zposHE"     value="[zposEE]+[zmaxEE]+[zgapEEFH]"/>
+  <Constant name="zposAH"     value="[zposHE]+[zmaxHE]+[zgapFHBH]"/>
+  <Constant name="thPCB"      value="1.6*mm"/>
+  <Constant name="thKapton"   value="0.01*mm"/>
+  <Constant name="thAbsEE"    value="1.2*mm"/>
+  <Constant name="thAbsHE"    value="1.2*mm"/>
+  <Constant name="WaferW"     value="123.7*mm"/>
+  <Constant name="tan30deg"   value="tan(30.0*deg)"/>
+</ConstantsSection>
+
+<MaterialSection label="hgcal.xml">
+  <CompositeMaterial name="WCu" density="14.979*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.75">
+      <rMaterial name="materials:Tungsten"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.25">
+      <rMaterial name="materials:Copper"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+</MaterialSection>
+
+<SolidSection label="hgcal.xml">
+  <Tubs name="HGCal" rMin="[rmin]" rMax="[rmax]" dz="[zCalor]" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Polycone name="HGCalEE" startPhi="0*deg" deltaPhi="360*deg">
+    <ZSection z="[zminEE]" rMin="[rminEE]" rMax="[rmaxEEF]"/>
+    <ZSection z="[zmaxEE]" rMin="[rminEE]" rMax="[rmaxEEF]"/>
+  </Polycone>
+  <Polycone name="HGCalHE" startPhi="0*deg" deltaPhi="360*deg">
+    <ZSection z="[zminHE]" rMin="[rminHE]" rMax="[rmaxHEF]"/>
+    <ZSection z="[zmaxHE]" rMin="[rminHE]" rMax="[rmaxHEF]"/>
+  </Polycone>
+  <Polycone name="HGCalAH" startPhi="0*deg" deltaPhi="360*deg">
+    <ZSection z="[zminAH]" rMin="[rminAH]" rMax="[rmaxAH]"/>
+    <ZSection z="[zmaxAH]" rMin="[rminAH]" rMax="[rmaxAH]"/>
+  </Polycone>
+  <Polyhedra name="HGCalPCB" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thPCB]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thPCB]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+  <Polyhedra name="HGCalKapton" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thKapton]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thKapton]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+  <Polyhedra name="HGCalEEAbs" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thAbsEE]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thAbsEE]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+  <Polyhedra name="HGCalHEAbs" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thAbsHE]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thAbsHE]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+</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>
+  <LogicalPart name="HGCalAH" category="unspecified">
+    <rSolid name="HGCalAH"/>
+    <rMaterial name="materials:Air"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalEEPCB" category="unspecified">
+    <rSolid name="HGCalPCB"/>
+    <rMaterial name="materials:G10"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalHEPCB" category="unspecified">
+    <rSolid name="HGCalPCB"/>
+    <rMaterial name="materials:G10"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalEEKapton" category="unspecified">
+    <rSolid name="HGCalKapton"/>
+    <rMaterial name="materials:Kapton"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalHEKapton" category="unspecified">
+    <rSolid name="HGCalKapton"/>
+    <rMaterial name="materials:Kapton"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalEEAbsorber" category="unspecified">
+    <rSolid name="HGCalEEAbs"/>
+    <rMaterial name="hgcal:WCu"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalHEAbsorber" category="unspecified">
+    <rSolid name="HGCalHEAbs"/>
+    <rMaterial name="materials:Copper"/>
+  </LogicalPart>
+</LogicalPartSection>
+
+<PosPartSection label="hgcal.xml">
+  <PosPart copyNumber="1">
+    <rParent name="cms:CMSE"/>
+    <rChild name="hgcal:HGCal"/>
+    <Translation x="0*fm" y="0*fm" z="[zposCalo]"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcal:HGCal"/>
+    <rChild name="hgcal:HGCalEE"/>
+    <Translation x="0*fm" y="0*fm" z="[zposEE]"/>
+    <rRotation name="rotations:R090"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcal:HGCal"/>
+    <rChild name="hgcal:HGCalHE"/>
+    <Translation x="0*fm" y="0*fm" z="[zposHE]"/>
+    <rRotation name="rotations:R090"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcal:HGCal"/>
+    <rChild name="hgcal:HGCalAH"/>
+    <Translation x="0*fm" y="0*fm" z="[zposAH]"/>
+    <rRotation name="rotations:000D"/>
+  </PosPart>
+</PosPartSection>
+</DDDefinition>
diff --git a/Geometry/HGCalTBCommonData/data/TB170/Sep17/hgcalCons.xml b/Geometry/HGCalTBCommonData/data/TB170/Sep17/hgcalCons.xml
new file mode 100644
index 0000000000000..f95d4a1bce871
--- /dev/null
+++ b/Geometry/HGCalTBCommonData/data/TB170/Sep17/hgcalCons.xml
@@ -0,0 +1,193 @@
+<?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">
+
+<SpecParSection label="hgcalReco.xml" eval="true">
+  <SpecPar name="HGCalEEWafer">
+    <PartSelector path="//HGCalEEWafer.*"/>
+    <Parameter name="Volume" value="HGCalEEWafer" eval="false"/>
+    <Parameter name="WaferSize"      value="[hgcal:WaferW]"/>
+  </SpecPar>
+  <SpecPar name="HGCalHEWafer">
+    <PartSelector path="//HGCalHEWafer.*"/>
+    <Parameter name="Volume" value="HGCalHEWafer" eval="false"/>
+    <Parameter name="WaferSize"      value="[hgcal:WaferW]"/>
+  </SpecPar>
+  <SpecPar name="HGCalEECell">
+    <PartSelector path="//HGCalEECell.*"/>
+    <Parameter name="Volume" value="HGCalEECell" eval="false"/>
+    <Parameter name="CellSize"      value="[hgcalwafer:CellWF]"/>
+    <Parameter name="CellSize"      value="[hgcalwafer:CellWC]"/>
+  </SpecPar>
+  <SpecPar name="HGCalHECell">
+    <PartSelector path="//HGCalHECell.*"/>
+    <Parameter name="Volume" value="HGCalHECell" eval="false"/>
+    <Parameter name="CellSize"      value="[hgcalwafer:CellWF]"/>
+    <Parameter name="CellSize"      value="[hgcalwafer:CellWC]"/>
+  </SpecPar>
+  <SpecPar name="HGCalEESensitive">
+    <PartSelector path="//HGCalEESensitive.*"/>
+    <Parameter name="Volume" value="HGCalEESensitive" eval="false"/>
+    <Parameter name="Slope"  value="0.0"/>
+    <Parameter name="GroupingZFine"  value="1"/>
+    <Parameter name="GroupingZFine"  value="1"/>
+    <Parameter name="GroupingZFine"  value="1"/>
+    <Parameter name="GroupingZFine"  value="2"/>
+    <Parameter name="GroupingZFine"  value="2"/>
+    <Parameter name="GroupingZFine"  value="2"/>
+    <Parameter name="GroupingZFine"  value="3"/>
+    <Parameter name="GroupingZFine"  value="3"/>
+    <Parameter name="GroupingZFine"  value="3"/>
+    <Parameter name="GroupingZFine"  value="4"/>
+    <Parameter name="GroupingZFine"  value="4"/>
+    <Parameter name="GroupingZFine"  value="4"/>
+    <Parameter name="GroupingZFine"  value="5"/>
+    <Parameter name="GroupingZFine"  value="5"/>
+    <Parameter name="GroupingZFine"  value="5"/>
+    <Parameter name="GroupingZFine"  value="6"/>
+    <Parameter name="GroupingZFine"  value="6"/>
+    <Parameter name="GroupingZFine"  value="6"/>
+    <Parameter name="GroupingZFine"  value="7"/>
+    <Parameter name="GroupingZFine"  value="7"/>
+    <Parameter name="GroupingZFine"  value="7"/>
+    <Parameter name="GroupingZMid"  value="1"/>
+    <Parameter name="GroupingZMid"  value="1"/>
+    <Parameter name="GroupingZMid"  value="1"/>
+    <Parameter name="GroupingZMid"  value="2"/>
+    <Parameter name="GroupingZMid"  value="2"/>
+    <Parameter name="GroupingZMid"  value="2"/>
+    <Parameter name="GroupingZMid"  value="3"/>
+    <Parameter name="GroupingZMid"  value="3"/>
+    <Parameter name="GroupingZMid"  value="3"/>
+    <Parameter name="GroupingZMid"  value="4"/>
+    <Parameter name="GroupingZMid"  value="4"/>
+    <Parameter name="GroupingZMid"  value="4"/>
+    <Parameter name="GroupingZMid"  value="5"/>
+    <Parameter name="GroupingZMid"  value="5"/>
+    <Parameter name="GroupingZMid"  value="5"/>
+    <Parameter name="GroupingZMid"  value="6"/>
+    <Parameter name="GroupingZMid"  value="6"/>
+    <Parameter name="GroupingZMid"  value="6"/>
+    <Parameter name="GroupingZMid"  value="7"/>
+    <Parameter name="GroupingZMid"  value="7"/>
+    <Parameter name="GroupingZMid"  value="7"/>
+    <Parameter name="GroupingZOut"  value="1"/>
+    <Parameter name="GroupingZOut"  value="1"/>
+    <Parameter name="GroupingZOut"  value="1"/>
+    <Parameter name="GroupingZOut"  value="2"/>
+    <Parameter name="GroupingZOut"  value="2"/>
+    <Parameter name="GroupingZOut"  value="2"/>
+    <Parameter name="GroupingZOut"  value="3"/>
+    <Parameter name="GroupingZOut"  value="3"/>
+    <Parameter name="GroupingZOut"  value="3"/>
+    <Parameter name="GroupingZOut"  value="4"/>
+    <Parameter name="GroupingZOut"  value="4"/>
+    <Parameter name="GroupingZOut"  value="4"/>
+    <Parameter name="GroupingZOut"  value="5"/>
+    <Parameter name="GroupingZOut"  value="5"/>
+    <Parameter name="GroupingZOut"  value="5"/>
+    <Parameter name="GroupingZOut"  value="6"/>
+    <Parameter name="GroupingZOut"  value="6"/>
+    <Parameter name="GroupingZOut"  value="6"/>
+    <Parameter name="GroupingZOut"  value="7"/>
+    <Parameter name="GroupingZOut"  value="7"/>
+    <Parameter name="GroupingZOut"  value="7"/>
+  </SpecPar>
+  <SpecPar name="HGCalHESiliconSensitive">
+    <PartSelector path="//HGCalHESiliconSensitive.*"/>
+    <Parameter name="Volume" value="HGCalHESiliconSensitive" eval="false"/>
+    <Parameter name="Slope"  value="0.0"/>
+    <Parameter name="GroupingZFine"  value="1"/>
+    <Parameter name="GroupingZFine"  value="1"/>
+    <Parameter name="GroupingZFine"  value="1"/>
+    <Parameter name="GroupingZFine"  value="2"/>
+    <Parameter name="GroupingZFine"  value="2"/>
+    <Parameter name="GroupingZFine"  value="2"/>
+    <Parameter name="GroupingZFine"  value="3"/>
+    <Parameter name="GroupingZFine"  value="3"/>
+    <Parameter name="GroupingZFine"  value="3"/>
+    <Parameter name="GroupingZFine"  value="4"/>
+    <Parameter name="GroupingZFine"  value="4"/>
+    <Parameter name="GroupingZFine"  value="4"/>
+    <Parameter name="GroupingZFine"  value="5"/>
+    <Parameter name="GroupingZFine"  value="5"/>
+    <Parameter name="GroupingZFine"  value="5"/>
+    <Parameter name="GroupingZFine"  value="6"/>
+    <Parameter name="GroupingZFine"  value="6"/>
+    <Parameter name="GroupingZFine"  value="6"/>
+    <Parameter name="GroupingZFine"  value="7"/>
+    <Parameter name="GroupingZFine"  value="7"/>
+    <Parameter name="GroupingZFine"  value="7"/>
+    <Parameter name="GroupingZFine"  value="8"/>
+    <Parameter name="GroupingZFine"  value="8"/>
+    <Parameter name="GroupingZFine"  value="8"/>
+    <Parameter name="GroupingZFine"  value="9"/>
+    <Parameter name="GroupingZFine"  value="9"/>
+    <Parameter name="GroupingZFine"  value="9"/>
+    <Parameter name="GroupingZFine"  value="10"/>
+    <Parameter name="GroupingZFine"  value="10"/>
+    <Parameter name="GroupingZFine"  value="10"/>
+    <Parameter name="GroupingZMid"   value="1"/>
+    <Parameter name="GroupingZMid"   value="1"/>
+    <Parameter name="GroupingZMid"   value="1"/>
+    <Parameter name="GroupingZMid"   value="2"/>
+    <Parameter name="GroupingZMid"   value="2"/>
+    <Parameter name="GroupingZMid"   value="2"/>
+    <Parameter name="GroupingZMid"   value="3"/>
+    <Parameter name="GroupingZMid"   value="3"/>
+    <Parameter name="GroupingZMid"   value="3"/>
+    <Parameter name="GroupingZMid"   value="4"/>
+    <Parameter name="GroupingZMid"   value="4"/>
+    <Parameter name="GroupingZMid"   value="4"/>
+    <Parameter name="GroupingZMid"   value="5"/>
+    <Parameter name="GroupingZMid"   value="5"/>
+    <Parameter name="GroupingZMid"   value="5"/>
+    <Parameter name="GroupingZMid"   value="6"/>
+    <Parameter name="GroupingZMid"   value="6"/>
+    <Parameter name="GroupingZMid"   value="6"/>
+    <Parameter name="GroupingZMid"   value="7"/>
+    <Parameter name="GroupingZMid"   value="7"/>
+    <Parameter name="GroupingZMid"   value="7"/>
+    <Parameter name="GroupingZMid"   value="8"/>
+    <Parameter name="GroupingZMid"   value="8"/>
+    <Parameter name="GroupingZMid"   value="8"/>
+    <Parameter name="GroupingZMid"   value="9"/>
+    <Parameter name="GroupingZMid"   value="9"/>
+    <Parameter name="GroupingZMid"   value="9"/>
+    <Parameter name="GroupingZMid"   value="10"/>
+    <Parameter name="GroupingZMid"   value="10"/>
+    <Parameter name="GroupingZMid"   value="10"/>
+    <Parameter name="GroupingZOut"   value="1"/>
+    <Parameter name="GroupingZOut"   value="1"/>
+    <Parameter name="GroupingZOut"   value="1"/>
+    <Parameter name="GroupingZOut"   value="2"/>
+    <Parameter name="GroupingZOut"   value="2"/>
+    <Parameter name="GroupingZOut"   value="2"/>
+    <Parameter name="GroupingZOut"   value="3"/>
+    <Parameter name="GroupingZOut"   value="3"/>
+    <Parameter name="GroupingZOut"   value="3"/>
+    <Parameter name="GroupingZOut"   value="4"/>
+    <Parameter name="GroupingZOut"   value="4"/>
+    <Parameter name="GroupingZOut"   value="4"/>
+    <Parameter name="GroupingZOut"   value="5"/>
+    <Parameter name="GroupingZOut"   value="5"/>
+    <Parameter name="GroupingZOut"   value="5"/>
+    <Parameter name="GroupingZOut"   value="6"/>
+    <Parameter name="GroupingZOut"   value="6"/>
+    <Parameter name="GroupingZOut"   value="6"/>
+    <Parameter name="GroupingZOut"   value="7"/>
+    <Parameter name="GroupingZOut"   value="7"/>
+    <Parameter name="GroupingZOut"   value="7"/>
+    <Parameter name="GroupingZOut"   value="8"/>
+    <Parameter name="GroupingZOut"   value="8"/>
+    <Parameter name="GroupingZOut"   value="8"/>
+    <Parameter name="GroupingZOut"   value="9"/>
+    <Parameter name="GroupingZOut"   value="9"/>
+    <Parameter name="GroupingZOut"   value="9"/>
+    <Parameter name="GroupingZOut"   value="10"/>
+    <Parameter name="GroupingZOut"   value="10"/>
+    <Parameter name="GroupingZOut"   value="10"/>
+    <Parameter name="LayerOffset"    value="0"/>
+  </SpecPar>
+</SpecParSection>
+
+</DDDefinition>
diff --git a/Geometry/HGCalTBCommonData/data/TB170/Sep17/hgcalEE.xml b/Geometry/HGCalTBCommonData/data/TB170/Sep17/hgcalEE.xml
new file mode 100644
index 0000000000000..a2a3d5ac0914d
--- /dev/null
+++ b/Geometry/HGCalTBCommonData/data/TB170/Sep17/hgcalEE.xml
@@ -0,0 +1,102 @@
+<?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="hgcalEE.xml" eval="true">
+  <Constant name="rMinFine"   value="0.0*fm"/>
+  <Constant name="rMaxFine"   value="0.0*cm"/>
+  <Constant name="rMaxMiddle" value="120.0*cm"/>
+  <Constant name="rMaxCoarse" value="2000.0*cm"/>
+  <Constant name="rMin"       value="0.0*fm"/>
+  <Constant name="rMax"       value="10.0*cm"/>
+  <Constant name="absorbW"    value="0.5*[hgcal:WaferW]"/>
+  <Constant name="absorbH"    value="[hgcal:WaferW]*[hgcal:tan30deg]"/>
+</ConstantsSection>
+
+<PosPartSection label="hgcalEE.xml">
+  <Algorithm name="hgcal:DDHGCalTBModule">
+    <rParent name="hgcal:HGCalEE"/>
+    <Vector name="WaferName" type="string" nEntries="2">
+      hgcalwafer:HGCalEEWaferFine, hgcalwafer:HGCalEEWaferCoarse</Vector>
+    <Vector name="CoverName" type="string" nEntries="4">
+      hgcal:HGCalEEPCB, hgcal:HGCalEEKapton, hgcal:HGCalEEAbsorber, 
+      hgcal:HGCalHEAbsorber</Vector>
+    <Vector name="MaterialNames" type="string" nEntries="20">
+      materials:Air, materials:Air, materials:Air, materials:Air, 
+      materials:StainlessSteel, materials:Lead, materials:Copper, 
+      materials:Air, materials:Aluminium, materials:Air, materials:Air, 
+      materials:Air, materials:Air, materials:Air, materials:Air, 
+      materials:Air, materials:Air, materials:Air, materials:StainlessSteel, 
+      materials:Air</Vector>
+    <Vector name="VolumeNames" type="string" nEntries="20">
+      EEPCB1,      EEKapton1,    EEAirGap,    EEShield1,   EEAbsorber1, 
+      EEAbsorber2, EEHeatShield, EESensitive, EEAlcase, EEgap1,   
+      EEgap2,      EEgap3,       EEgap4,      EEgap5,   EEgap6, 
+      EEgap7,      EEgap8,       EEgap9,      EEFe,   EEBaseCu</Vector>
+    <Vector name="Thickness" type="numeric" nEntries="20">
+      [hgcal:thPCB], [hgcal:thKapton], 0.7*mm, [hgcal:thAbsEE], 0.3*mm,
+      4.9*mm, 6.0*mm, 0.10*mm, 2.6*mm, 2.6*mm, 
+      3.0*mm, 9.6*mm, 10.6*mm, 11.6*mm, 16.6*mm, 
+      16.72,  166.6*mm, 269.7*mm, 40*mm,  [hgcal:thAbsHE]</Vector>
+    <Vector name="Layers" type="numeric" nEntries="9"> 
+      16, 11, 11, 11, 12, 19, 15, 13, 3</Vector>
+    <Vector name="LayerThick" type="numeric" nEntries="9"> 
+      298.41*mm, 181.21*mm, 26.21*mm, 25.21*mm, 32.03*mm, 43.81*mm, 
+      32.11*mm, 51.1*mm, 45.6*mm
+    </Vector>
+    <Vector name="LayerType" type="numeric" nEntries="111"> 
+      8,17, 4,5,4,6, 4,5,4,6,19,1,7,7,7,0,
+      16, 4, 5, 4, 6, 3, 1, 7, 7, 7, 0,
+      13, 4, 5, 4, 6, 3, 1, 7, 7, 7, 0,
+      12, 4, 5, 4, 6, 3, 1, 7, 7, 7, 0,
+      15, 4, 5, 4, 2, 6, 3, 1, 7, 7, 7, 0,
+      9, 4, 5, 4, 6, 4, 5, 4, 6, 4, 5, 4, 11, 0, 7, 7, 7, 1, 3, 
+      6, 4, 5, 4, 6, 4,5,4,6,19, 1, 7, 7, 7, 0,
+      14, 4, 5, 4, 6, 4, 5, 4, 6, 4, 5, 4, 6, 
+      10, 18, 8
+    </Vector>
+    <Vector name="LayerSense" type="numeric" nEntries="111">
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 3, 1, 1, 1, 2,
+      0, 0, 0, 0, 0, 4, 3, 1, 1, 1, 2,
+      0, 0, 0, 0, 0, 4, 3, 1, 1, 1, 2,
+      0, 0, 0, 0, 0, 4, 3, 1, 1, 1, 2,
+      0, 0, 0, 0, 0, 0, 4, 3, 1, 1, 1, 2,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 1, 1, 3, 4, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 3, 1, 1, 1, 2,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0
+    </Vector>
+    <Numeric name="zMinBlock"   value="[hgcal:zminEE]"/>
+    <Numeric name="rMaxFine"    value="[rMaxFine]"/>
+    <Numeric name="waferW"      value="[hgcal:WaferW]"/>
+    <Numeric name="waferGap"    value="0.0*fm"/>
+    <Numeric name="absorberW"   value="[hgcalEE:absorbW]"/>
+    <Numeric name="absorberH"   value="[hgcalEE:absorbH]"/>
+    <Numeric name="Sectors"     value="12"/>
+    <Vector name="SlopeBottom" type="numeric" nEntries="2">
+      0.0, 0.0</Vector>
+    <Vector name="SlopeTop" type="numeric" nEntries="2">
+      0, 0</Vector>
+    <Vector name="ZFront" type="numeric" nEntries="2">
+      [hgcal:zminEE], [hgcal:zmaxEE]</Vector>
+    <Vector name="RMaxFront" type="numeric" nEntries="2">
+      [hgcal:rmaxEE], [hgcal:rmaxEE]</Vector>
+    <String name="RotNameSpace" value="hgcalmodule"/>
+  </Algorithm>
+</PosPartSection> 
+
+<SpecParSection label="hgcalEE.xml" eval="true">
+  <SpecPar name="HGCalEE">
+    <PartSelector path="//HGCalEESensitive.*"/>    
+    <Parameter name="Volume" value="HGCalEESensitive" eval="false"/>
+    <Parameter name="GeometryMode" value="HGCalGeometryMode::Hexagon" eval="false"/>
+    <Parameter name="RadiusBound"  value="[rMinFine]"/>
+    <Parameter name="RadiusBound"  value="[rMaxFine]"/>
+    <Parameter name="RadiusBound"  value="[rMaxMiddle]"/>
+    <Parameter name="RadiusBound"  value="[rMaxCoarse]"/>
+    <Parameter name="RadiusLimits" value="[rMin]"/>
+    <Parameter name="RadiusLimits" value="[rMax]"/>
+    <Parameter name="LevelTop"     value="99"/>
+  </SpecPar>
+</SpecParSection>
+
+</DDDefinition>
diff --git a/Geometry/HGCalTBCommonData/data/TB170/Sep17/hgcalHE.xml b/Geometry/HGCalTBCommonData/data/TB170/Sep17/hgcalHE.xml
new file mode 100644
index 0000000000000..e018184d33124
--- /dev/null
+++ b/Geometry/HGCalTBCommonData/data/TB170/Sep17/hgcalHE.xml
@@ -0,0 +1,114 @@
+<?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="hgcalHE.xml" eval="true">
+  <Constant name="rMinFine"   value="0.0*fm"/>
+  <Constant name="rMaxFine"   value="0.0*fm"/>
+  <Constant name="rMaxMiddle" value="0.0*fm"/>
+  <Constant name="rMaxCoarse" value="2000.0*cm"/>
+  <Constant name="rMin"       value="[hgcal:rminHE]"/>
+  <Constant name="rMax"       value="[hgcal:rmaxHE]"/>
+  <Constant name="absorbW"    value="1.5*[hgcal:WaferW]"/>
+  <Constant name="absorbH"    value="1.5*[hgcal:WaferW]"/>
+</ConstantsSection>
+
+<PosPartSection label="hgcalHE.xml">
+  <Algorithm name="hgcal:DDHGCalTBModule">
+    <rParent name="hgcal:HGCalHE"/>
+    <Vector name="WaferName" type="string" nEntries="2">
+      hgcalwafer:HGCalHEWaferFine, hgcalwafer:HGCalHEWaferCoarse</Vector>
+    <Vector name="CoverName" type="string" nEntries="4">
+      hgcal:HGCalHEPCB, hgcal:HGCalHEKapton, hgcal:HGCalHEAbsorber, 
+      hgcal:HGCalEEAbsorber</Vector>
+    <Vector name="MaterialNames" type="string" nEntries="21">
+      materials:StainlessSteel, materials:Air, materials:Air, 
+      materials:Copper, materials:Air, materials:Air,
+      materials:Air, materials:StainlessSteel, materials:Air,
+      materials:Air, materials:Air, materials:Air, 
+      materials:Air, materials:Air, materials:Air, 
+      materials:Air, materials:Air, materials:Air,
+      materials:Air, materials:Air, materials:Air
+      </Vector>
+    <Vector name="VolumeNames" type="string" nEntries="21">
+      HESiliconAbsorber1, HESiliconPCB1, HESiliconShield1, 
+      HESiliconHeatShield, HESiliconSensitive, HESiliconKapton1,
+      HESiliconAirGap, HESiliconSupport, HEAirGap1, 
+      HEAirGap2, HEAirGap3, HEAirGap4, 
+      HEAirGap5, HEAirGap6, HEAirGap7, 
+      HEAirGap8, HEAirGap9, HEAirGap10,
+      HEAirGap11, HEAirGap12, HEBaseCuW</Vector>
+    <Vector name="Thickness" type="numeric" nEntries="21">
+      40.0*mm, [hgcal:thPCB], [hgcal:thAbsHE], 6.0*mm, 0.1*mm, 
+      [hgcal:thKapton], 6*mm, 10*mm, 7.0*mm, 7*mm, 8*mm, 8.9*mm,
+      9*mm, 9.62*mm, 10.54*mm, 10.9*mm,
+      13.9*mm, 18*mm, 22.9*mm, 63*mm, [hgcal:thAbsEE]
+      </Vector>
+    <Vector name="Layers" type="numeric" nEntries="12"> 
+      9, 10, 10, 10, 10, 10, 5, 8, 10, 10, 10, 6</Vector>
+    <Vector name="LayerThick" type="numeric" nEntries="12"> 
+      26.11*mm, 64.73*mm, 68.01*mm, 62.11*mm, 68.65*mm, 66.01*mm, 131.9*mm, 
+      16.11*mm, 69.01*mm, 66.01*mm, 67.01*mm, 148.9*mm </Vector>
+    <Vector name="LayerType" type="numeric" nEntries="108"> 
+      7, 9, 3, 2, 5, 4, 4, 4, 1,
+      13, 0, 6, 3, 2, 5, 4, 4, 4, 1,
+      15, 0, 10, 3, 2, 5, 4, 4, 4, 1,
+      8, 0, 6, 3, 20, 5, 4, 4, 4, 1,
+      14, 0, 12, 3, 2, 5, 4, 4, 4, 1,
+      15, 0, 6, 3, 2, 5, 4, 4, 4, 1,
+      11, 7, 19, 7, 0,
+      9, 3, 2, 5, 4, 4, 4, 1,
+      16, 0, 6, 3, 20, 5, 4, 4, 4, 1,
+      15, 0, 6, 3, 20, 5, 4, 4, 4, 1,
+      15, 0, 9, 3, 20, 5, 4, 4, 4, 1,
+      18, 0, 17, 0, 17, 7
+      
+    </Vector>
+    <Vector name="LayerSense" type="numeric" nEntries="108">
+      0, 0, 0, 4, 3, 1, 1, 1, 2,
+      0, 0, 0, 0, 4, 3, 1, 1, 1, 2,
+      0, 0, 0, 0, 4, 3, 1, 1, 1, 2,
+      0, 0, 0, 0, 5, 3, 1, 1, 1, 2,
+      0, 0, 0, 0, 4, 3, 1, 1, 1, 2,
+      0, 0, 0, 0, 4, 3, 1, 1, 1, 2,
+      0, 0, 0, 0, 0,
+      0, 0, 4, 3, 1, 1, 1, 2,
+      0, 0, 0, 0, 5, 3, 1, 1, 1, 2,
+      0, 0, 0, 0, 5, 3, 1, 1, 1, 2,
+      0, 0, 0, 0, 5, 3, 1, 1, 1, 2,
+      0, 0, 0, 0, 0, 0
+    </Vector>
+    <Numeric name="zMinBlock"   value="[hgcal:zminHE]"/>
+    <Numeric name="rMaxFine"    value="[rMaxFine]"/>
+    <Numeric name="waferW"      value="[hgcal:WaferW]"/>
+    <Numeric name="waferGap"    value="1.0*mm"/>
+    <Numeric name="absorberW"   value="[hgcalHE:absorbW]"/>
+    <Numeric name="absorberH"   value="[hgcalHE:absorbH]"/>
+    <Numeric name="Sectors"     value="12"/>
+    <Vector name="SlopeBottom" type="numeric" nEntries="2">
+      0.0, 0.0</Vector>
+    <Vector name="SlopeTop" type="numeric" nEntries="2">
+      0, 0</Vector>
+    <Vector name="ZFront" type="numeric" nEntries="2">
+      [hgcal:zminHE], [hgcal:zmaxHE]</Vector>
+    <Vector name="RMaxFront" type="numeric" nEntries="2">
+      [hgcal:rmaxHE], [hgcal:rmaxHE]</Vector>
+    <String name="RotNameSpace" value="hgcalmodule"/>
+  </Algorithm>
+</PosPartSection> 
+
+<SpecParSection label="hgcalHE.xml" eval="true">
+  <SpecPar name="HGCalHE">
+    <PartSelector path="//HGCalHESiliconSensitive.*"/>
+    <Parameter name="Volume" value="HGCalHESiliconSensitive" eval="false"/>
+    <Parameter name="GeometryMode" value="HGCalGeometryMode::Hexagon" eval="false"/>
+    <Parameter name="RadiusBound"  value="[rMinFine]"/>
+    <Parameter name="RadiusBound"  value="[rMaxFine]"/>
+    <Parameter name="RadiusBound"  value="[rMaxMiddle]"/>
+    <Parameter name="RadiusBound"  value="[rMaxCoarse]"/>
+    <Parameter name="RadiusLimits" value="[rMin]"/>
+    <Parameter name="RadiusLimits" value="[rMax]"/>
+    <Parameter name="LevelTop"     value="99"/>
+  </SpecPar>
+</SpecParSection>
+
+</DDDefinition>
diff --git a/Geometry/HGCalTBCommonData/data/TB170/Shifted/hgcal.xml b/Geometry/HGCalTBCommonData/data/TB170/Shifted/hgcal.xml
new file mode 100644
index 0000000000000..d794aa8edbd26
--- /dev/null
+++ b/Geometry/HGCalTBCommonData/data/TB170/Shifted/hgcal.xml
@@ -0,0 +1,161 @@
+<?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="rmin"       value="0.0*fm"/>
+  <Constant name="rmax"       value="50.0*cm"/>
+  <Constant name="zCalor"     value="100.0*cm"/>
+  <Constant name="rminEE"     value="0.0*fm"/>
+  <Constant name="rmaxEE"     value="8.0*cm"/>
+  <Constant name="rmaxEEF"    value="9.5*cm"/>
+  <Constant name="zminEE"     value="0.0*fm"/>
+  <Constant name="zmaxEE"     value="33.3*cm"/>
+  <Constant name="rminHE"     value="0.0*fm"/>
+  <Constant name="rmaxHE"     value="19.5*cm"/>
+  <Constant name="rmaxHEF"    value="26.5*cm"/>
+  <Constant name="zminHE"     value="0.0*fm"/>
+  <Constant name="zmaxHE"     value="63.6*cm"/>
+  <Constant name="rminAH"     value="0.0*fm"/>
+  <Constant name="rmaxAH"     value="30.0*cm"/>
+  <Constant name="zminAH"     value="0.0*fm"/>
+  <Constant name="zmaxAH"     value="95.0*cm"/>
+  <Constant name="zgapEEFH"   value="5.0*cm"/>
+  <Constant name="zgapEEBL"   value="2.0*mm"/>
+  <Constant name="zgapFHBH"   value="1.0*cm"/>
+  <Constant name="dzBlock"    value="40.0*mm"/>
+  <Constant name="zposCalo"   value="1210.0*cm"/>
+  <Constant name="zposEE"     value="-[zCalor]"/>
+  <Constant name="zposHE"     value="[zposEE]+[zmaxEE]+[zgapEEFH]"/>
+  <Constant name="zposAH"     value="[zposHE]+[zmaxHE]+[zgapFHBH]"/>
+  <Constant name="zposBlock"  value="[zposEE]+[zmaxEE]+[zgapEEBL]+[dzBlock]/2"/>
+  <Constant name="thPCB"      value="1.6*mm"/>
+  <Constant name="thKapton"   value="0.01*mm"/>
+  <Constant name="thAbsEE"    value="1.2*mm"/>
+  <Constant name="thAbsHE"    value="1.2*mm"/>
+  <Constant name="WaferW"     value="123.7*mm"/>
+  <Constant name="tan30deg"   value="tan(30.0*deg)"/>
+</ConstantsSection>
+
+<MaterialSection label="hgcal.xml">
+  <CompositeMaterial name="WCu" density="14.979*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.75">
+      <rMaterial name="materials:Tungsten"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.25">
+      <rMaterial name="materials:Copper"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+</MaterialSection>
+
+<SolidSection label="hgcal.xml">
+  <Tubs name="HGCal" rMin="[rmin]" rMax="[rmax]" dz="[zCalor]" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Polycone name="HGCalEE" startPhi="0*deg" deltaPhi="360*deg">
+    <ZSection z="[zminEE]" rMin="[rminEE]" rMax="[rmaxEEF]"/>
+    <ZSection z="[zmaxEE]" rMin="[rminEE]" rMax="[rmaxEEF]"/>
+  </Polycone>
+  <Polycone name="HGCalHE" startPhi="0*deg" deltaPhi="360*deg">
+    <ZSection z="[zminHE]" rMin="[rminHE]" rMax="[rmaxHEF]"/>
+    <ZSection z="[zmaxHE]" rMin="[rminHE]" rMax="[rmaxHEF]"/>
+  </Polycone>
+  <Polycone name="HGCalAH" startPhi="0*deg" deltaPhi="360*deg">
+    <ZSection z="[zminAH]" rMin="[rminAH]" rMax="[rmaxAH]"/>
+    <ZSection z="[zmaxAH]" rMin="[rminAH]" rMax="[rmaxAH]"/>
+  </Polycone>
+  <Tubs name="HGCalBlock" rMin="[rminEE]" rMax="[rmaxEE]" dz="[dzBlock]/2" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Polyhedra name="HGCalPCB" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thPCB]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thPCB]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+  <Polyhedra name="HGCalKapton" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thKapton]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thKapton]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+  <Polyhedra name="HGCalEEAbs" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thAbsEE]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thAbsEE]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+  <Polyhedra name="HGCalHEAbs" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thAbsHE]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thAbsHE]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+</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>
+  <LogicalPart name="HGCalAH" category="unspecified">
+    <rSolid name="HGCalAH"/>
+    <rMaterial name="materials:Air"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBlock" category="unspecified">
+    <rSolid name="HGCalBlock"/>
+    <rMaterial name="materials:StainlessSteel"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalEEPCB" category="unspecified">
+    <rSolid name="HGCalPCB"/>
+    <rMaterial name="materials:G10"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalHEPCB" category="unspecified">
+    <rSolid name="HGCalPCB"/>
+    <rMaterial name="materials:G10"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalEEKapton" category="unspecified">
+    <rSolid name="HGCalKapton"/>
+    <rMaterial name="materials:Kapton"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalHEKapton" category="unspecified">
+    <rSolid name="HGCalKapton"/>
+    <rMaterial name="materials:Kapton"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalEEAbsorber" category="unspecified">
+    <rSolid name="HGCalEEAbs"/>
+    <rMaterial name="hgcal:WCu"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalHEAbsorber" category="unspecified">
+    <rSolid name="HGCalHEAbs"/>
+    <rMaterial name="materials:Copper"/>
+  </LogicalPart>
+</LogicalPartSection>
+
+<PosPartSection label="hgcal.xml">
+  <PosPart copyNumber="1">
+    <rParent name="cms:CMSE"/>
+    <rChild name="hgcal:HGCal"/>
+    <Translation x="0*fm" y="0*fm" z="[zposCalo]"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcal:HGCal"/>
+    <rChild name="hgcal:HGCalEE"/>
+    <Translation x="0*fm" y="0*fm" z="[zposEE]"/>
+    <rRotation name="rotations:R090"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcal:HGCal"/>
+    <rChild name="hgcal:HGCalBlock"/>
+    <Translation x="0*fm" y="0*fm" z="[zposBlock]"/>
+    <rRotation name="rotations:000D"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcal:HGCal"/>
+    <rChild name="hgcal:HGCalHE"/>
+    <Translation x="72.27*mm" y="0*fm" z="[zposHE]"/>
+    <rRotation name="rotations:R090"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcal:HGCal"/>
+    <rChild name="hgcal:HGCalAH"/>
+    <Translation x="0*fm" y="0*fm" z="[zposAH]"/>
+    <rRotation name="rotations:000D"/>
+  </PosPart>
+</PosPartSection>
+</DDDefinition>
diff --git a/Geometry/HGCalTBCommonData/data/TB170/ahcal.xml b/Geometry/HGCalTBCommonData/data/TB170/ahcal.xml
new file mode 100644
index 0000000000000..6d192acd6f1f8
--- /dev/null
+++ b/Geometry/HGCalTBCommonData/data/TB170/ahcal.xml
@@ -0,0 +1,170 @@
+<?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="ahcal.xml" eval="true">
+  <Constant name="absorberThick" value="12.0*mm"/>
+  <Constant name="radiatorThick" value="72.0*mm"/>
+  <Constant name="airgapThick"   value="1.285*mm"/>
+  <Constant name="cassetteThick" value="0.5*mm"/>
+  <Constant name="cableThick"    value="1.5*mm"/>
+  <Constant name="pcbThick"      value="0.7*mm"/>
+  <Constant name="foilThick"     value="0.115*mm"/>
+  <Constant name="scintThick"    value="3.0*mm"/>
+  <Constant name="passiveHeight" value="39.0*cm"/>
+  <Constant name="passiveWidth"  value="42.0*cm"/>
+  <Constant name="activeHeight"  value="36.0*cm"/>
+  <Constant name="activeWidth"   value="36.0*cm"/>
+  <Constant name="tileGap"       value="30.0*mm"/>
+  <Constant name="tileHeight"    value="29.8*mm"/>
+  <Constant name="tileWidth"     value="29.8*mm"/>
+  <Constant name="tileEdge"      value="0.1*mm"/>
+</ConstantsSection>
+
+<MaterialSection label="ahcal.xml">
+  <CompositeMaterial name="Steel235" density="7.87*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.9843">
+      <rMaterial name="materials:Iron"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.0017">
+      <rMaterial name="materials:Carbon"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.0140">
+      <rMaterial name="materials:Manganese"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+  <CompositeMaterial name="PCB" density="1.70*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.180774">
+      <rMaterial name="materials:Silicon"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.405633">
+      <rMaterial name="materials:Oxygen"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.278042">
+      <rMaterial name="materials:Carbon"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.0684428">
+      <rMaterial name="materials:Hydrogen"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.0671091">
+      <rMaterial name="materials:Bromine"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+  <CompositeMaterial name="Polystyrene" density="1.060*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.077418">
+      <rMaterial name="materials:Hydrogen"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.922582">
+      <rMaterial name="materials:Carbon"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+  <CompositeMaterial name="PVC" density="1.35*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.048384">
+      <rMaterial name="materials:Hydrogen"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.384378">
+      <rMaterial name="materials:Carbon"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.567238">
+      <rMaterial name="materials:Chlorine"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+  <CompositeMaterial name="Polystyrole" density="1.065*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.077421">
+      <rMaterial name="materials:Hydrogen"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.922579">
+      <rMaterial name="materials:Carbon"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+  <CompositeMaterial name="CFM" density="0.120*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.009">
+      <rMaterial name="materials:Air"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.872">
+      <rMaterial name="ahcal:PVC"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.119">
+      <rMaterial name="ahcal:Polystyrole"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+</MaterialSection>
+
+
+<SolidSection label="ahcal.xml">
+  <Box name="AHcalTileSensitive" dx="[tileWidth]/2" dy="[tileHeight]/2"
+       dz="[scintThick]/2"/>
+</SolidSection>
+
+<LogicalPartSection label="ahcal.xml">
+  <LogicalPart name="AHcalTileSensitive" category="unspecified">
+    <rSolid name="AHcalTileSensitive"/>
+    <rMaterial name="ahcal:Polystyrene"/>
+  </LogicalPart>
+</LogicalPartSection>
+
+<PosPartSection label="ahcal.xml">
+  <Algorithm name="hgcal:DDAHcalModuleAlgo">
+    <rParent name="hgcal:HGCalAH"/>
+    <String name="TileName" value="ahcal:AHcalTileSensitive"/>
+    <Vector name="MaterialNames" type="string" nEntries="8">
+      ahcal:Steel235, materials:Air, ahcal:Steel235, ahcal:CFM, ahcal:PCB, 
+      ahcal:Polystyrole, ahcal:Polystyrene, ahcal:Steel235</Vector>
+    <Vector name="VolumeNames" type="string" nEntries="8">
+      AHcalRadiator, AHcalAirGap, AHcalCassette, AHcalCable, AHcalPCB,
+      AHcalFoil, AHcalActive, AHcalAbsorber</Vector>
+    <Vector name="Thickness" type="numeric" nEntries="8">
+      [ahcal:radiatorThick], [ahcal:airgapThick], [ahcal:cassetteThick], 
+      [ahcal:cableThick], [ahcal:pcbThick], [ahcal:foilThick], 
+      [ahcal:scintThick], [ahcal:absorberThick]</Vector>
+    <Vector name="Layers" type="numeric" nEntries="12"> 
+      10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 11</Vector>
+    <Vector name="LayerThick" type="numeric" nEntries="12"> 
+      21.0*mm, 81.0*mm, 81.0*mm, 81.0*mm, 81.0*mm, 81.0*mm, 81.0*mm, 81.0*mm,
+      81.0*mm, 81.0*mm, 81.0*mm, 93.0*mm</Vector>
+    <Vector name="LayerType" type="numeric" nEntries="121"> 
+      7, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1,
+      0, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1,
+      0, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1,
+      0, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1,
+      0, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1,
+      0, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1, 7
+    </Vector>
+    <Vector name="LayerSense" type="numeric" nEntries="121">
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0
+    </Vector>
+    <Vector name="Widths" type="numeric" nEntries="2">
+      [ahcal:passiveWidth], [ahcal:activeWidth] </Vector>
+    <Vector name="Heights" type="numeric" nEntries="2">
+      [ahcal:passiveHeight], [ahcal:activeHeight] </Vector>
+    <Vector name="TileN" type="numeric" nEntries="2">
+      12, 12 </Vector>
+    <Vector name="TileStep" type="numeric" nEntries="2">
+      [ahcal:tileGap], [ahcal:tileGap] </Vector>
+    <Numeric name="zMinBlock"   value="[hgcal:zminAH]"/>
+    <String name="RotNameSpace" value="hgcalmodule"/>
+  </Algorithm>
+</PosPartSection> 
+
+<SpecParSection label="ahcal.xml" eval="true">
+  <SpecPar name="AHcal">
+    <PartSelector path="//AHcalTileSensitive.*"/>
+    <Parameter name="Volume" value="AHcalTileSensitive" eval="false"/>
+    <Parameter name="SensitiveDetector" value="AHcalSensitiveDetector" eval="false"/>
+    <Parameter name="ReadOutName" value="HcalHits" eval="false"/>
+  </SpecPar>
+  <SpecPar name="hgcProdCutsAHcal">
+    <PartSelector path="//HGCalAH"/>
+    <Parameter name="CMSCutsRegion" value="HGCalAHcalRegion" eval="false"/>
+    <Parameter name="ProdCutsForElectrons" value="1.0*mm"/>
+<Parameter name="ProdCutsForProtons" value="1.0*mm"/>
+    <Parameter name="ProdCutsForPositrons" value="1.0*mm"/>
+    <Parameter name="ProdCutsForGamma"     value="1.0*mm"/>
+  </SpecPar>
+</SpecParSection>
+
+</DDDefinition>
diff --git a/Geometry/HGCalTBCommonData/data/TB170/cms.xml b/Geometry/HGCalTBCommonData/data/TB170/cms.xml
new file mode 100644
index 0000000000000..6fa29ac43cfa8
--- /dev/null
+++ b/Geometry/HGCalTBCommonData/data/TB170/cms.xml
@@ -0,0 +1,39 @@
+<?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="cms.xml" eval="true">
+  <Constant name="zCaloFront" value="1110.0*cm"/>
+</ConstantsSection>
+
+<SolidSection label="cms.xml">
+  <Tubs name="OCMS" rMin="0.0*fm" rMax="2.0*m" dz="15.0*m" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="CMSE" rMin="0.0*fm" rMax="2.0*m" dz="15.0*m" startPhi="0*deg" deltaPhi="360*deg"/>
+</SolidSection>
+
+<LogicalPartSection label="cms.xml">
+  <LogicalPart name="World" category="unspecified">
+    <rSolid name="OCMS"/>
+    <rMaterial name="materials:Air"/>
+  </LogicalPart>
+  <LogicalPart name="OCMS" category="unspecified">
+    <rSolid name="OCMS"/>
+    <rMaterial name="materials:Air"/>
+  </LogicalPart>
+  <LogicalPart name="CMSE" category="unspecified">
+    <rSolid name="CMSE"/>
+    <rMaterial name="materials:Air"/>
+  </LogicalPart>
+</LogicalPartSection>
+
+<PosPartSection label="cms.xml">
+  <PosPart copyNumber="1">
+    <rParent name="cms:World"/>
+    <rChild name="cms:OCMS"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="cms:OCMS"/>
+    <rChild name="cms:CMSE"/>
+  </PosPart>
+</PosPartSection>
+
+</DDDefinition>
diff --git a/Geometry/HGCalTBCommonData/data/TB170/hgcProdCuts.xml b/Geometry/HGCalTBCommonData/data/TB170/hgcProdCuts.xml
new file mode 100644
index 0000000000000..2187231eaa45b
--- /dev/null
+++ b/Geometry/HGCalTBCommonData/data/TB170/hgcProdCuts.xml
@@ -0,0 +1,16 @@
+<?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">
+
+<SpecParSection label="hgcProdCuts.xml" eval="true">
+  <SpecPar name="hgcProdCuts">
+    <PartSelector path="//HGCalEE"/>
+    <PartSelector path="//HGCalHE"/>
+    <Parameter name="CMSCutsRegion" value="HGCalRegion" eval="false"/>
+    <Parameter name="ProdCutsForElectrons" value="0.03*mm"/>
+<Parameter name="ProdCutsForProtons" value="0.03*mm"/>
+    <Parameter name="ProdCutsForPositrons" value="0.03*mm"/>
+    <Parameter name="ProdCutsForGamma" value="0.03*mm"/>
+  </SpecPar>
+</SpecParSection>
+
+</DDDefinition>
diff --git a/Geometry/HGCalTBCommonData/data/TB170/hgcal.xml b/Geometry/HGCalTBCommonData/data/TB170/hgcal.xml
new file mode 100644
index 0000000000000..21852be175920
--- /dev/null
+++ b/Geometry/HGCalTBCommonData/data/TB170/hgcal.xml
@@ -0,0 +1,161 @@
+<?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="rmin"       value="0.0*fm"/>
+  <Constant name="rmax"       value="50.0*cm"/>
+  <Constant name="zCalor"     value="100.0*cm"/>
+  <Constant name="rminEE"     value="0.0*fm"/>
+  <Constant name="rmaxEE"     value="8.0*cm"/>
+  <Constant name="rmaxEEF"    value="9.5*cm"/>
+  <Constant name="zminEE"     value="0.0*fm"/>
+  <Constant name="zmaxEE"     value="33.3*cm"/>
+  <Constant name="rminHE"     value="0.0*fm"/>
+  <Constant name="rmaxHE"     value="19.5*cm"/>
+  <Constant name="rmaxHEF"    value="26.5*cm"/>
+  <Constant name="zminHE"     value="0.0*fm"/>
+  <Constant name="zmaxHE"     value="63.6*cm"/>
+  <Constant name="rminAH"     value="0.0*fm"/>
+  <Constant name="rmaxAH"     value="30.0*cm"/>
+  <Constant name="zminAH"     value="0.0*fm"/>
+  <Constant name="zmaxAH"     value="95.0*cm"/>
+  <Constant name="zgapEEFH"   value="5.0*cm"/>
+  <Constant name="zgapEEBL"   value="2.0*mm"/>
+  <Constant name="zgapFHBH"   value="1.0*cm"/>
+  <Constant name="dzBlock"    value="40.0*mm"/>
+  <Constant name="zposCalo"   value="1210.0*cm"/>
+  <Constant name="zposEE"     value="-[zCalor]"/>
+  <Constant name="zposHE"     value="[zposEE]+[zmaxEE]+[zgapEEFH]"/>
+  <Constant name="zposAH"     value="[zposHE]+[zmaxHE]+[zgapFHBH]"/>
+  <Constant name="zposBlock"  value="[zposEE]+[zmaxEE]+[zgapEEBL]+[dzBlock]/2"/>
+  <Constant name="thPCB"      value="1.6*mm"/>
+  <Constant name="thKapton"   value="0.01*mm"/>
+  <Constant name="thAbsEE"    value="1.2*mm"/>
+  <Constant name="thAbsHE"    value="1.2*mm"/>
+  <Constant name="WaferW"     value="123.7*mm"/>
+  <Constant name="tan30deg"   value="tan(30.0*deg)"/>
+</ConstantsSection>
+
+<MaterialSection label="hgcal.xml">
+  <CompositeMaterial name="WCu" density="14.979*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.75">
+      <rMaterial name="materials:Tungsten"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.25">
+      <rMaterial name="materials:Copper"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+</MaterialSection>
+
+<SolidSection label="hgcal.xml">
+  <Tubs name="HGCal" rMin="[rmin]" rMax="[rmax]" dz="[zCalor]" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Polycone name="HGCalEE" startPhi="0*deg" deltaPhi="360*deg">
+    <ZSection z="[zminEE]" rMin="[rminEE]" rMax="[rmaxEEF]"/>
+    <ZSection z="[zmaxEE]" rMin="[rminEE]" rMax="[rmaxEEF]"/>
+  </Polycone>
+  <Polycone name="HGCalHE" startPhi="0*deg" deltaPhi="360*deg">
+    <ZSection z="[zminHE]" rMin="[rminHE]" rMax="[rmaxHEF]"/>
+    <ZSection z="[zmaxHE]" rMin="[rminHE]" rMax="[rmaxHEF]"/>
+  </Polycone>
+  <Polycone name="HGCalAH" startPhi="0*deg" deltaPhi="360*deg">
+    <ZSection z="[zminAH]" rMin="[rminAH]" rMax="[rmaxAH]"/>
+    <ZSection z="[zmaxAH]" rMin="[rminAH]" rMax="[rmaxAH]"/>
+  </Polycone>
+  <Tubs name="HGCalBlock" rMin="[rminEE]" rMax="[rmaxEE]" dz="[dzBlock]/2" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Polyhedra name="HGCalPCB" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thPCB]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thPCB]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+  <Polyhedra name="HGCalKapton" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thKapton]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thKapton]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+  <Polyhedra name="HGCalEEAbs" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thAbsEE]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thAbsEE]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+  <Polyhedra name="HGCalHEAbs" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thAbsHE]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thAbsHE]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+</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>
+  <LogicalPart name="HGCalAH" category="unspecified">
+    <rSolid name="HGCalAH"/>
+    <rMaterial name="materials:Air"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBlock" category="unspecified">
+    <rSolid name="HGCalBlock"/>
+    <rMaterial name="materials:StainlessSteel"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalEESiliconPCB" category="unspecified">
+    <rSolid name="HGCalPCB"/>
+    <rMaterial name="materials:G10"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalHESiliconPCB" category="unspecified">
+    <rSolid name="HGCalPCB"/>
+    <rMaterial name="materials:G10"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalEESiliconKapton" category="unspecified">
+    <rSolid name="HGCalKapton"/>
+    <rMaterial name="materials:Kapton"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalHESiliconKapton" category="unspecified">
+    <rSolid name="HGCalKapton"/>
+    <rMaterial name="materials:Kapton"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalEESiliconCuW" category="unspecified">
+    <rSolid name="HGCalEEAbs"/>
+    <rMaterial name="hgcal:WCu"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalHESiliconCu" category="unspecified">
+    <rSolid name="HGCalHEAbs"/>
+    <rMaterial name="materials:Copper"/>
+  </LogicalPart>
+</LogicalPartSection>
+
+<PosPartSection label="hgcal.xml">
+  <PosPart copyNumber="1">
+    <rParent name="cms:CMSE"/>
+    <rChild name="hgcal:HGCal"/>
+    <Translation x="0*fm" y="0*fm" z="[zposCalo]"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcal:HGCal"/>
+    <rChild name="hgcal:HGCalEE"/>
+    <Translation x="0*fm" y="0*fm" z="[zposEE]"/>
+    <rRotation name="rotations:R090"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcal:HGCal"/>
+    <rChild name="hgcal:HGCalBlock"/>
+    <Translation x="0*fm" y="0*fm" z="[zposBlock]"/>
+    <rRotation name="rotations:000D"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcal:HGCal"/>
+    <rChild name="hgcal:HGCalHE"/>
+    <Translation x="0*fm" y="0*fm" z="[zposHE]"/>
+    <rRotation name="rotations:R090"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcal:HGCal"/>
+    <rChild name="hgcal:HGCalAH"/>
+    <Translation x="0*fm" y="0*fm" z="[zposAH]"/>
+    <rRotation name="rotations:000D"/>
+  </PosPart>
+</PosPartSection>
+</DDDefinition>
diff --git a/Geometry/HGCalTBCommonData/data/TB170/hgcalBeam.xml b/Geometry/HGCalTBCommonData/data/TB170/hgcalBeam.xml
new file mode 100644
index 0000000000000..4cbc991baeca2
--- /dev/null
+++ b/Geometry/HGCalTBCommonData/data/TB170/hgcalBeam.xml
@@ -0,0 +1,418 @@
+<?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="hgcalBeam.xml" eval="true">
+  <Constant name="upstreamDxby2" value="100.0*cm"/>
+  <Constant name="upstreamDyby2" value="100.0*cm"/>
+  <Constant name="upstreamDzby2" value="400.0*cm"/>
+  <Constant name="upstreamZ" value="-400.0*cm"/>
+  <Constant name="tol" value="0.0*mm"/>
+  <Constant name="chambDxby2" value="11.0*cm"/>
+  <Constant name="chambAlT" value="5.0*mm"/>
+  <Constant name="chambKapW" value="11.0*cm"/>
+  <Constant name="chambKapT" value="0.025*mm"/>
+  <Constant name="chambVetW" value="25.0*mm"/>
+  <Constant name="chambVetT" value="5.0*mm"/>
+  <Constant name="chambVetGap" value="12.0*cm"/>
+  <Constant name="chambVetL" value="0.5*([chambVetGap]+[chambVetW])"/>
+  <Constant name="chambVetX" value="0.5*[chambVetW]"/>
+  <Constant name="chambVetZ" value="20.0*mm"/>
+  <Constant name="chambGasGap" value="([chambVetZ]+0.5*[chambVetT]+[tol])"/>
+  <Constant name="chambGasW" value="([chambVetW]+0.5*[chambVetGap]+[tol])"/>
+  <Constant name="chambDzby2" value="([chambGasGap]+[chambAlT]+2*[tol])"/>
+  <Constant name="chambAl1L" value="0.5*([chambDxby2]+0.5*[chambKapW])"/>
+  <Constant name="chambAl1W" value="0.5*([chambDxby2]-0.5*[chambKapW])"/>
+  <Constant name="chambAl1X" value="([chambDxby2]-[chambAl1L])"/>
+  <Constant name="chambAl1Y" value="([chambDxby2]-[chambAl1W])"/>
+  <Constant name="chambAl1Z" value="([chambGasGap]+0.5*[chambAlT]+[tol])"/>
+  <Constant name="chambAl2L" value="([chambDxby2]-0.5*[chambAlT])"/>
+  <Constant name="chambAl2X" value="([chambDxby2]-[chambAl2L])"/>
+  <Constant name="chambAl2Y" value="([chambDxby2]-0.5*[chambAlT])"/>
+  <Constant name="chamb1Z" value="-507.6*cm"/>
+  <Constant name="chamb2Z" value="-400.3*cm"/>
+  <Constant name="chamb3Z" value="-200.5*cm"/>
+  <Constant name="s1Dxby2" value="7.0*cm"/>
+  <Constant name="s1Dzby2" value="5.0*mm"/>
+  <Constant name="s1Z" value="-375.4*cm"/>
+  <Constant name="s2Dxby2" value="2.0*cm"/>
+  <Constant name="s2Dzby2" value="5.0*mm"/>
+  <Constant name="s2Z" value="-360.5*cm"/>
+  <Constant name="s3Dxby2" value="1.0*cm"/>
+  <Constant name="s3Dzby2" value="5.0*mm"/>
+  <Constant name="s3Z" value="-345.6*cm"/>
+  <Constant name="s4Z" value="-240.8*cm"/>
+  <Constant name="bhDxby2" value="50.0*cm"/>
+  <Constant name="bhDyby2" value="15.0*cm"/>
+  <Constant name="bhDzby2" value="0.5*cm"/>
+  <Constant name="bhGap" value="7.5*cm"/>
+  <Constant name="bhX" value="([bhDxby2]-0.5*[bhGap])"/>
+  <Constant name="bhY" value="([bhDyby2]+0.5*[bhGap])"/>
+  <Constant name="bhZ1" value="-229.3*cm"/>
+  <Constant name="bhZ2" value="-221.3*cm"/>
+  <Constant name="ck3Rad" value="8.35*cm"/>
+  <Constant name="ck3L" value="200.0*cm"/>
+  <Constant name="ck3Z" value="-569.0*cm"/>
+  <Constant name="downstreamDxby2" value="50.0*cm"/>
+  <Constant name="downstreamDyby2" value="50.0*cm"/>
+  <Constant name="downstreamDzby2" value="100.0*cm"/>
+  <Constant name="downstreamZ" value="900.0*cm"/>
+  <Constant name="chamb4Z" value="840.8*cm"/>
+  <Constant name="chamb5Z" value="965.5*cm"/>
+  <Constant name="mcDxby2" value="40.0*cm"/>
+  <Constant name="mcDzby2" value="20.0*mm"/>
+  <Constant name="mc1Z" value="873.5*cm"/>
+  <Constant name="mc2Z" value="985.5*cm"/>
+</ConstantsSection>
+
+<SolidSection label="hgcalBeam.xml">
+  <Box name="HGCalBeam" dx="[upstreamDxby2]" dy="[upstreamDyby2]" dz="[upstreamDzby2]"/>
+  <Box name="HGCalBeamWChamb" dx="[chambDxby2]" dy="[chambDxby2]" dz="[chambDzby2]"/>
+  <Box name="HGCalBeamWChambGas" dx="[chambGasW]" dy="[chambGasW]" dz="[chambGasGap]"/>
+  <Box name="HGCalBeamWChambVet" dx="[chambVetL]" dy="[chambVetW]/2" dz="[chambVetT]/2"/>
+  <Box name="HGCalBeamWChambWindow" dx="[chambKapW]/2" dy="[chambKapW]/2" dz="[chambKapT]/2"/>
+  <Box name="HGCalBeamWChambAl1" dx="[chambAl1L]" dy="[chambAl1W]" dz="[chambAlT]/2"/>
+  <Box name="HGCalBeamWChambAl2" dx="[chambAl2L]" dy="[chambAlT]/2" dz="[chambGasGap]"/>
+  <Box name="HGCalBeamS1" dx="[s1Dxby2]" dy="[s1Dxby2]" dz="[s1Dzby2]"/>
+  <Box name="HGCalBeamS2" dx="[s2Dxby2]" dy="[s2Dxby2]" dz="[s2Dzby2]"/>
+  <Box name="HGCalBeamS3" dx="[s3Dxby2]" dy="[s3Dxby2]" dz="[s3Dzby2]"/>
+  <Box name="HGCalBeamS4" dx="[s1Dxby2]" dy="[s1Dxby2]" dz="[s1Dzby2]"/>
+  <Box name="HGCalBeamHaloCounter" dx="[bhDxby2]" dy="[bhDyby2]" dz="[bhDzby2]"/>
+  <Tubs name="HGCalBeamCK3" rMin="0*fm" rMax="[ck3Rad]" dz="[ck3L]/2" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Box name="HGCalBeamDown" dx="[downstreamDxby2]" dy="[downstreamDyby2]" dz="[downstreamDzby2]"/>
+  <Box name="HGCalBeamMuonCounter" dx="[mcDxby2]" dy="[mcDxby2]" dz="[mcDzby2]"/>
+</SolidSection>
+
+<LogicalPartSection label="hgcalBeam.xml">
+  <LogicalPart name="HGCalBeam" category="unspecified">
+    <rSolid name="HGCalBeam"/>
+    <rMaterial name="materials:Air"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamWChamb" category="unspecified">
+    <rSolid name="HGCalBeamWChamb"/>
+    <rMaterial name="materials:Air"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamWChambGas" category="unspecified">
+    <rSolid name="HGCalBeamWChambGas"/>
+    <rMaterial name="materials:Ar 50pct plus CO_2 50pct"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamWChambVet" category="unspecified">
+    <rSolid name="HGCalBeamWChambVet"/>
+    <rMaterial name="materials:Polyethylene"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamWChambWindow" category="unspecified">
+    <rSolid name="HGCalBeamWChambWindow"/>
+    <rMaterial name="materials:Kapton"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamWChambAl1" category="unspecified">
+    <rSolid name="HGCalBeamWChambAl1"/>
+    <rMaterial name="materials:Aluminium"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamWChambAl2" category="unspecified">
+    <rSolid name="HGCalBeamWChambAl2"/>
+    <rMaterial name="materials:Aluminium"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamS1" category="unspecified">
+    <rSolid name="HGCalBeamS1"/>
+    <rMaterial name="materials:Scintillator"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamS2" category="unspecified">
+    <rSolid name="HGCalBeamS2"/>
+    <rMaterial name="materials:Scintillator"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamS3" category="unspecified">
+    <rSolid name="HGCalBeamS3"/>
+    <rMaterial name="materials:Scintillator"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamS4" category="unspecified">
+    <rSolid name="HGCalBeamS4"/>
+    <rMaterial name="materials:Scintillator"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamHaloCounter" category="unspecified">
+    <rSolid name="HGCalBeamHaloCounter"/>
+    <rMaterial name="materials:Scintillator"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamCK3" category="unspecified">
+    <rSolid name="HGCalBeamCK3"/>
+    <rMaterial name="materials:Freon-12"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamDown" category="unspecified">
+    <rSolid name="HGCalBeamDown"/>
+    <rMaterial name="materials:Air"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamMuonCounter" category="unspecified">
+    <rSolid name="HGCalBeamMuonCounter"/>
+    <rMaterial name="materials:Scintillator"/>
+  </LogicalPart>
+</LogicalPartSection>
+
+<RotationSection label="hgcalBeam.xml">
+  <Rotation name="R1" phiX="90*deg" thetaX="90*deg" phiY="180*deg" thetaY="90*deg" phiZ="0*deg" thetaZ="0*deg"/>
+</RotationSection>
+
+<PosPartSection label="hgcalBeam.xml">
+  <PosPart copyNumber="1">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambGas"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl1"/>
+    <Translation x="[chambAl1X]" y="[chambAl1Y]" z="[chambAl1Z]"/>
+  </PosPart>
+  <PosPart copyNumber="2">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl1"/>
+    <Translation x="-[chambAl1Y]" y="[chambAl1X]" z="[chambAl1Z]"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="3">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl1"/>
+    <Translation x="-[chambAl1X]" y="-[chambAl1Y]" z="[chambAl1Z]"/>
+  </PosPart>
+  <PosPart copyNumber="4">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl1"/>
+    <Translation x="[chambAl1Y]" y="-[chambAl1X]" z="[chambAl1Z]"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="5">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl1"/>
+    <Translation x="[chambAl1X]" y="[chambAl1Y]" z="-[chambAl1Z]"/>
+  </PosPart>
+  <PosPart copyNumber="6">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl1"/>
+    <Translation x="-[chambAl1Y]" y="[chambAl1X]" z="-[chambAl1Z]"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="7">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl1"/>
+    <Translation x="-[chambAl1X]" y="-[chambAl1Y]" z="-[chambAl1Z]"/>
+  </PosPart>
+  <PosPart copyNumber="8">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl1"/>
+    <Translation x="[chambAl1Y]" y="-[chambAl1X]" z="-[chambAl1Z]"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl2"/>
+    <Translation x="[chambAl2X]" y="[chambAl2Y]" z="0*fm"/>
+  </PosPart>
+  <PosPart copyNumber="2">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl2"/>
+    <Translation x="-[chambAl2Y]" y="[chambAl2X]" z="0*fm"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="3">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl2"/>
+    <Translation x="-[chambAl2X]" y="-[chambAl2Y]" z="0*fm"/>
+  </PosPart>
+  <PosPart copyNumber="4">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl2"/>
+    <Translation x="[chambAl2Y]" y="-[chambAl2X]" z="0*fm"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambWindow"/>
+    <Translation x="0*fm" y="0*fm" z="([chambDzby2]-0.5*[chambKapT])"/>
+  </PosPart>
+  <PosPart copyNumber="2">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambWindow"/>
+    <Translation x="0*fm" y="0*fm" z="-([chambDzby2]-0.5*[chambKapT])"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="[chambVetX]" y="[chambVetL]" z="[chambVetZ]"/>
+  </PosPart>
+  <PosPart copyNumber="2">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="-[chambVetL]" y="[chambVetX]" z="[chambVetZ]"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="3">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="-[chambVetX]" y="-[chambVetL]" z="[chambVetZ]"/>
+  </PosPart>
+  <PosPart copyNumber="4">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="[chambVetL]" y="-[chambVetX]" z="[chambVetZ]"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="5">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="[chambVetX]" y="[chambVetL]" z="0*fm"/>
+  </PosPart>
+  <PosPart copyNumber="6">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="-[chambVetL]" y="[chambVetX]" z="0*fm"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="7">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="-[chambVetX]" y="-[chambVetL]" z="0*fm"/>
+  </PosPart>
+  <PosPart copyNumber="8">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="[chambVetL]" y="-[chambVetX]" z="0*fm"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="9">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="[chambVetX]" y="[chambVetL]" z="-[chambVetZ]"/>
+  </PosPart>
+  <PosPart copyNumber="10">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="-[chambVetL]" y="[chambVetX]" z="-[chambVetZ]"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="11">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="-[chambVetX]" y="-[chambVetL]" z="-[chambVetZ]"/>
+  </PosPart>
+  <PosPart copyNumber="12">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="[chambVetL]" y="-[chambVetX]" z="-[chambVetZ]"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamWChamb"/>
+    <Translation x="0*fm" y="0*fm" z="([chamb1Z]-[upstreamZ]-[chambDzby2])"/>
+  </PosPart>
+  <PosPart copyNumber="2">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamWChamb"/>
+    <Translation x="0*fm" y="0*fm" z="([chamb2Z]-[upstreamZ]-[chambDzby2])"/>
+  </PosPart>
+  <PosPart copyNumber="3">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamWChamb"/>
+    <Translation x="0*fm" y="0*fm" z="([chamb3Z]-[upstreamZ]-[chambDzby2])"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamS1"/>
+    <Translation x="0*fm" y="0*fm" z="([s1Z]-[upstreamZ]-[s1Dzby2])"/>
+  </PosPart>
+  <PosPart copyNumber="2">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamS2"/>
+    <Translation x="0*fm" y="0*fm" z="([s2Z]-[upstreamZ]-[s2Dzby2])"/>
+  </PosPart>
+  <PosPart copyNumber="3">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamS3"/>
+    <Translation x="0*fm" y="0*fm" z="([s3Z]-[upstreamZ]-[s3Dzby2])"/>
+  </PosPart>
+  <PosPart copyNumber="4">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamS4"/>
+    <Translation x="0*fm" y="0*fm" z="([s4Z]-[upstreamZ]-[s1Dzby2])"/>
+  </PosPart>
+  <PosPart copyNumber="11">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamHaloCounter"/>
+    <Translation x="0*fm" y="[bhY]" z="([bhZ2]+[bhDzby2]-[upstreamZ])"/>
+  </PosPart>
+  <PosPart copyNumber="12">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamHaloCounter"/>
+    <Translation x="0*fm" y="-[bhY]" z="([bhZ2]+[bhDzby2]-[upstreamZ])"/>
+  </PosPart>
+  <PosPart copyNumber="13">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamHaloCounter"/>
+    <Translation x="-[bhY]" y="0*fm" z="([bhZ1]+[bhDzby2]-[upstreamZ])"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="14">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamHaloCounter"/>
+    <Translation x="[bhY]" y="0*fm" z="([bhZ1]+[bhDzby2]-[upstreamZ])"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="0">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamCK3"/>
+    <Translation x="0*fm" y="0*fm" z="([ck3Z]-[upstreamZ]-0.5*[ck3L])"/>
+  </PosPart>
+  <PosPart copyNumber="4">
+    <rParent name="hgcalBeam:HGCalBeamDown"/>
+    <rChild name="hgcalBeam:HGCalBeamWChamb"/>
+    <Translation x="0*fm" y="0*fm" z="([chamb4Z]-[downstreamZ]-[chambDzby2])"/>
+  </PosPart>
+  <PosPart copyNumber="5">
+    <rParent name="hgcalBeam:HGCalBeamDown"/>
+    <rChild name="hgcalBeam:HGCalBeamWChamb"/>
+    <Translation x="0*fm" y="0*fm" z="([chamb5Z]-[downstreamZ]-[chambDzby2])"/>
+  </PosPart>
+  <PosPart copyNumber="7">
+    <rParent name="hgcalBeam:HGCalBeamDown"/>
+    <rChild name="hgcalBeam:HGCalBeamMuonCounter"/>
+    <Translation x="0*fm" y="0*fm" z="([mc1Z]-[downstreamZ]-[mcDzby2])"/>
+  </PosPart>
+  <PosPart copyNumber="8">
+    <rParent name="hgcalBeam:HGCalBeamDown"/>
+    <rChild name="hgcalBeam:HGCalBeamMuonCounter"/>
+    <Translation x="0*fm" y="0*fm" z="([mc2Z]-[downstreamZ]-[mcDzby2])"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="cms:CMSE"/>
+    <rChild name="hgcalBeam:HGCalBeam"/>
+    <Translation x="0*fm" y="0*fm" z="[upstreamZ]"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="cms:CMSE"/>
+    <rChild name="hgcalBeam:HGCalBeamDown"/>
+    <Translation x="0*fm" y="0*fm" z="[downstreamZ]"/>
+  </PosPart>
+</PosPartSection>
+
+<SpecParSection label="hgcalBeam.xml" eval="true">
+  <SpecPar name="hgcalbeam">
+    <PartSelector path="//HGCalBeamS.*"/>
+    <PartSelector path="//HGCalBeamHaloCounter"/>
+    <PartSelector path="//HGCalBeamMuonCounter"/>
+    <PartSelector path="//HGCalBeamCK3"/>
+    <PartSelector path="//HGCalBeamWChambGas"/>
+    <Parameter name="SensitiveDetector" value="HcalTB06BeamDetector" eval="false"/>
+    <Parameter name="ReadOutName" value="HcalTB06BeamHits" eval="false"/>
+  </SpecPar>
+  <SpecPar name="hgcalbeamWC">
+    <PartSelector path="//HGCalBeamWChambGas"/>
+    <Parameter name="Volume" value="WireChamber" eval="false"/>
+  </SpecPar>
+  <SpecPar name="hgcProdCutsBeam">
+    <PartSelector path="//HGCalBeam"/>
+    <PartSelector path="//HGCalBeamDown"/>
+    <Parameter name="CMSCutsRegion" value="HGCalBeamRegion" eval="false"/>
+    <Parameter name="ProdCutsForElectrons" value="1.0*mm"/>
+<Parameter name="ProdCutsForProtons" value="1.0*mm"/>
+    <Parameter name="ProdCutsForPositrons" value="1.0*mm"/>
+    <Parameter name="ProdCutsForGamma"     value="1.0*mm"/>
+  </SpecPar>
+</SpecParSection>
+
+</DDDefinition>
diff --git a/Geometry/HGCalTBCommonData/data/TB170/hgcalCons.xml b/Geometry/HGCalTBCommonData/data/TB170/hgcalCons.xml
new file mode 100644
index 0000000000000..df259eec18e51
--- /dev/null
+++ b/Geometry/HGCalTBCommonData/data/TB170/hgcalCons.xml
@@ -0,0 +1,401 @@
+<?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">
+
+<SpecParSection label="hgcalReco.xml" eval="true">
+  <SpecPar name="HGCalEEWafer">
+    <PartSelector path="//HGCalEEWafer.*"/>
+    <Parameter name="Volume" value="HGCalEEWafer" eval="false"/>
+    <Parameter name="WaferSize"      value="[hgcal:WaferW]"/>
+  </SpecPar>
+  <SpecPar name="HGCalHEWafer">
+    <PartSelector path="//HGCalHEWafer.*"/>
+    <Parameter name="Volume" value="HGCalHEWafer" eval="false"/>
+    <Parameter name="WaferSize"      value="[hgcal:WaferW]"/>
+  </SpecPar>
+  <SpecPar name="HGCalEECell">
+    <PartSelector path="//HGCalEECell.*"/>
+    <Parameter name="Volume" value="HGCalEECell" eval="false"/>
+    <Parameter name="CellSize"      value="[hgcalwafer:CellWF]"/>
+    <Parameter name="CellSize"      value="[hgcalwafer:CellWC]"/>
+  </SpecPar>
+  <SpecPar name="HGCalHECell">
+    <PartSelector path="//HGCalHECell.*"/>
+    <Parameter name="Volume" value="HGCalHECell" eval="false"/>
+    <Parameter name="CellSize"      value="[hgcalwafer:CellWF]"/>
+    <Parameter name="CellSize"      value="[hgcalwafer:CellWC]"/>
+  </SpecPar>
+  <SpecPar name="HGCalEESensitive">
+    <PartSelector path="//HGCalEESensitive.*"/>
+    <Parameter name="Volume" value="HGCalEESensitive" eval="false"/>
+    <Parameter name="Slope"  value="0.0"/>
+    <Parameter name="GroupingZFine"  value="1"/>
+    <Parameter name="GroupingZFine"  value="1"/>
+    <Parameter name="GroupingZFine"  value="1"/>
+    <Parameter name="GroupingZFine"  value="2"/>
+    <Parameter name="GroupingZFine"  value="2"/>
+    <Parameter name="GroupingZFine"  value="2"/>
+    <Parameter name="GroupingZFine"  value="3"/>
+    <Parameter name="GroupingZFine"  value="3"/>
+    <Parameter name="GroupingZFine"  value="3"/>
+    <Parameter name="GroupingZFine"  value="4"/>
+    <Parameter name="GroupingZFine"  value="4"/>
+    <Parameter name="GroupingZFine"  value="4"/>
+    <Parameter name="GroupingZFine"  value="5"/>
+    <Parameter name="GroupingZFine"  value="5"/>
+    <Parameter name="GroupingZFine"  value="5"/>
+    <Parameter name="GroupingZFine"  value="6"/>
+    <Parameter name="GroupingZFine"  value="6"/>
+    <Parameter name="GroupingZFine"  value="6"/>
+    <Parameter name="GroupingZFine"  value="7"/>
+    <Parameter name="GroupingZFine"  value="7"/>
+    <Parameter name="GroupingZFine"  value="7"/>
+    <Parameter name="GroupingZFine"  value="8"/>
+    <Parameter name="GroupingZFine"  value="8"/>
+    <Parameter name="GroupingZFine"  value="8"/>
+    <Parameter name="GroupingZFine"  value="9"/>
+    <Parameter name="GroupingZFine"  value="9"/>
+    <Parameter name="GroupingZFine"  value="9"/>
+    <Parameter name="GroupingZFine"  value="10"/>
+    <Parameter name="GroupingZFine"  value="10"/>
+    <Parameter name="GroupingZFine"  value="10"/>
+    <Parameter name="GroupingZFine"  value="11"/>
+    <Parameter name="GroupingZFine"  value="11"/>
+    <Parameter name="GroupingZFine"  value="11"/>
+    <Parameter name="GroupingZFine"  value="12"/>
+    <Parameter name="GroupingZFine"  value="12"/>
+    <Parameter name="GroupingZFine"  value="12"/>
+    <Parameter name="GroupingZFine"  value="13"/>
+    <Parameter name="GroupingZFine"  value="13"/>
+    <Parameter name="GroupingZFine"  value="13"/>
+    <Parameter name="GroupingZFine"  value="14"/>
+    <Parameter name="GroupingZFine"  value="14"/>
+    <Parameter name="GroupingZFine"  value="14"/>
+    <Parameter name="GroupingZFine"  value="15"/>
+    <Parameter name="GroupingZFine"  value="15"/>
+    <Parameter name="GroupingZFine"  value="15"/>
+    <Parameter name="GroupingZFine"  value="16"/>
+    <Parameter name="GroupingZFine"  value="16"/>
+    <Parameter name="GroupingZFine"  value="16"/>
+    <Parameter name="GroupingZFine"  value="17"/>
+    <Parameter name="GroupingZFine"  value="17"/>
+    <Parameter name="GroupingZFine"  value="17"/>
+    <Parameter name="GroupingZFine"  value="18"/>
+    <Parameter name="GroupingZFine"  value="18"/>
+    <Parameter name="GroupingZFine"  value="18"/>
+    <Parameter name="GroupingZFine"  value="19"/>
+    <Parameter name="GroupingZFine"  value="19"/>
+    <Parameter name="GroupingZFine"  value="19"/>
+    <Parameter name="GroupingZFine"  value="20"/>
+    <Parameter name="GroupingZFine"  value="20"/>
+    <Parameter name="GroupingZFine"  value="20"/>
+    <Parameter name="GroupingZFine"  value="21"/>
+    <Parameter name="GroupingZFine"  value="21"/>
+    <Parameter name="GroupingZFine"  value="21"/>
+    <Parameter name="GroupingZFine"  value="22"/>
+    <Parameter name="GroupingZFine"  value="22"/>
+    <Parameter name="GroupingZFine"  value="22"/>
+    <Parameter name="GroupingZFine"  value="23"/>
+    <Parameter name="GroupingZFine"  value="23"/>
+    <Parameter name="GroupingZFine"  value="23"/>
+    <Parameter name="GroupingZFine"  value="24"/>
+    <Parameter name="GroupingZFine"  value="24"/>
+    <Parameter name="GroupingZFine"  value="24"/>
+    <Parameter name="GroupingZFine"  value="25"/>
+    <Parameter name="GroupingZFine"  value="25"/>
+    <Parameter name="GroupingZFine"  value="25"/>
+    <Parameter name="GroupingZFine"  value="26"/>
+    <Parameter name="GroupingZFine"  value="26"/>
+    <Parameter name="GroupingZFine"  value="26"/>
+    <Parameter name="GroupingZFine"  value="27"/>
+    <Parameter name="GroupingZFine"  value="27"/>
+    <Parameter name="GroupingZFine"  value="27"/>
+    <Parameter name="GroupingZFine"  value="28"/>
+    <Parameter name="GroupingZFine"  value="28"/>
+    <Parameter name="GroupingZFine"  value="28"/>
+    <Parameter name="GroupingZMid"  value="1"/>
+    <Parameter name="GroupingZMid"  value="1"/>
+    <Parameter name="GroupingZMid"  value="1"/>
+    <Parameter name="GroupingZMid"  value="2"/>
+    <Parameter name="GroupingZMid"  value="2"/>
+    <Parameter name="GroupingZMid"  value="2"/>
+    <Parameter name="GroupingZMid"  value="3"/>
+    <Parameter name="GroupingZMid"  value="3"/>
+    <Parameter name="GroupingZMid"  value="3"/>
+    <Parameter name="GroupingZMid"  value="4"/>
+    <Parameter name="GroupingZMid"  value="4"/>
+    <Parameter name="GroupingZMid"  value="4"/>
+    <Parameter name="GroupingZMid"  value="5"/>
+    <Parameter name="GroupingZMid"  value="5"/>
+    <Parameter name="GroupingZMid"  value="5"/>
+    <Parameter name="GroupingZMid"  value="6"/>
+    <Parameter name="GroupingZMid"  value="6"/>
+    <Parameter name="GroupingZMid"  value="6"/>
+    <Parameter name="GroupingZMid"  value="7"/>
+    <Parameter name="GroupingZMid"  value="7"/>
+    <Parameter name="GroupingZMid"  value="7"/>
+    <Parameter name="GroupingZMid"  value="8"/>
+    <Parameter name="GroupingZMid"  value="8"/>
+    <Parameter name="GroupingZMid"  value="8"/>
+    <Parameter name="GroupingZMid"  value="9"/>
+    <Parameter name="GroupingZMid"  value="9"/>
+    <Parameter name="GroupingZMid"  value="9"/>
+    <Parameter name="GroupingZMid"  value="10"/>
+    <Parameter name="GroupingZMid"  value="10"/>
+    <Parameter name="GroupingZMid"  value="10"/>
+    <Parameter name="GroupingZMid"  value="11"/>
+    <Parameter name="GroupingZMid"  value="11"/>
+    <Parameter name="GroupingZMid"  value="11"/>
+    <Parameter name="GroupingZMid"  value="12"/>
+    <Parameter name="GroupingZMid"  value="12"/>
+    <Parameter name="GroupingZMid"  value="12"/>
+    <Parameter name="GroupingZMid"  value="13"/>
+    <Parameter name="GroupingZMid"  value="13"/>
+    <Parameter name="GroupingZMid"  value="13"/>
+    <Parameter name="GroupingZMid"  value="14"/>
+    <Parameter name="GroupingZMid"  value="14"/>
+    <Parameter name="GroupingZMid"  value="14"/>
+    <Parameter name="GroupingZMid"  value="15"/>
+    <Parameter name="GroupingZMid"  value="15"/>
+    <Parameter name="GroupingZMid"  value="15"/>
+    <Parameter name="GroupingZMid"  value="16"/>
+    <Parameter name="GroupingZMid"  value="16"/>
+    <Parameter name="GroupingZMid"  value="16"/>
+    <Parameter name="GroupingZMid"  value="17"/>
+    <Parameter name="GroupingZMid"  value="17"/>
+    <Parameter name="GroupingZMid"  value="17"/>
+    <Parameter name="GroupingZMid"  value="18"/>
+    <Parameter name="GroupingZMid"  value="18"/>
+    <Parameter name="GroupingZMid"  value="18"/>
+    <Parameter name="GroupingZMid"  value="19"/>
+    <Parameter name="GroupingZMid"  value="19"/>
+    <Parameter name="GroupingZMid"  value="19"/>
+    <Parameter name="GroupingZMid"  value="20"/>
+    <Parameter name="GroupingZMid"  value="20"/>
+    <Parameter name="GroupingZMid"  value="20"/>
+    <Parameter name="GroupingZMid"  value="21"/>
+    <Parameter name="GroupingZMid"  value="21"/>
+    <Parameter name="GroupingZMid"  value="21"/>
+    <Parameter name="GroupingZMid"  value="22"/>
+    <Parameter name="GroupingZMid"  value="22"/>
+    <Parameter name="GroupingZMid"  value="22"/>
+    <Parameter name="GroupingZMid"  value="23"/>
+    <Parameter name="GroupingZMid"  value="23"/>
+    <Parameter name="GroupingZMid"  value="23"/>
+    <Parameter name="GroupingZMid"  value="24"/>
+    <Parameter name="GroupingZMid"  value="24"/>
+    <Parameter name="GroupingZMid"  value="24"/>
+    <Parameter name="GroupingZMid"  value="25"/>
+    <Parameter name="GroupingZMid"  value="25"/>
+    <Parameter name="GroupingZMid"  value="25"/>
+    <Parameter name="GroupingZMid"  value="26"/>
+    <Parameter name="GroupingZMid"  value="26"/>
+    <Parameter name="GroupingZMid"  value="26"/>
+    <Parameter name="GroupingZMid"  value="27"/>
+    <Parameter name="GroupingZMid"  value="27"/>
+    <Parameter name="GroupingZMid"  value="27"/>
+    <Parameter name="GroupingZMid"  value="28"/>
+    <Parameter name="GroupingZMid"  value="28"/>
+    <Parameter name="GroupingZMid"  value="28"/>
+    <Parameter name="GroupingZOut"  value="1"/>
+    <Parameter name="GroupingZOut"  value="1"/>
+    <Parameter name="GroupingZOut"  value="1"/>
+    <Parameter name="GroupingZOut"  value="2"/>
+    <Parameter name="GroupingZOut"  value="2"/>
+    <Parameter name="GroupingZOut"  value="2"/>
+    <Parameter name="GroupingZOut"  value="3"/>
+    <Parameter name="GroupingZOut"  value="3"/>
+    <Parameter name="GroupingZOut"  value="3"/>
+    <Parameter name="GroupingZOut"  value="4"/>
+    <Parameter name="GroupingZOut"  value="4"/>
+    <Parameter name="GroupingZOut"  value="4"/>
+    <Parameter name="GroupingZOut"  value="5"/>
+    <Parameter name="GroupingZOut"  value="5"/>
+    <Parameter name="GroupingZOut"  value="5"/>
+    <Parameter name="GroupingZOut"  value="6"/>
+    <Parameter name="GroupingZOut"  value="6"/>
+    <Parameter name="GroupingZOut"  value="6"/>
+    <Parameter name="GroupingZOut"  value="7"/>
+    <Parameter name="GroupingZOut"  value="7"/>
+    <Parameter name="GroupingZOut"  value="7"/>
+    <Parameter name="GroupingZOut"  value="8"/>
+    <Parameter name="GroupingZOut"  value="8"/>
+    <Parameter name="GroupingZOut"  value="8"/>
+    <Parameter name="GroupingZOut"  value="9"/>
+    <Parameter name="GroupingZOut"  value="9"/>
+    <Parameter name="GroupingZOut"  value="9"/>
+    <Parameter name="GroupingZOut"  value="10"/>
+    <Parameter name="GroupingZOut"  value="10"/>
+    <Parameter name="GroupingZOut"  value="10"/>
+    <Parameter name="GroupingZOut"  value="11"/>
+    <Parameter name="GroupingZOut"  value="11"/>
+    <Parameter name="GroupingZOut"  value="11"/>
+    <Parameter name="GroupingZOut"  value="12"/>
+    <Parameter name="GroupingZOut"  value="12"/>
+    <Parameter name="GroupingZOut"  value="12"/>
+    <Parameter name="GroupingZOut"  value="13"/>
+    <Parameter name="GroupingZOut"  value="13"/>
+    <Parameter name="GroupingZOut"  value="13"/>
+    <Parameter name="GroupingZOut"  value="14"/>
+    <Parameter name="GroupingZOut"  value="14"/>
+    <Parameter name="GroupingZOut"  value="14"/>
+    <Parameter name="GroupingZOut"  value="15"/>
+    <Parameter name="GroupingZOut"  value="15"/>
+    <Parameter name="GroupingZOut"  value="15"/>
+    <Parameter name="GroupingZOut"  value="16"/>
+    <Parameter name="GroupingZOut"  value="16"/>
+    <Parameter name="GroupingZOut"  value="16"/>
+    <Parameter name="GroupingZOut"  value="17"/>
+    <Parameter name="GroupingZOut"  value="17"/>
+    <Parameter name="GroupingZOut"  value="17"/>
+    <Parameter name="GroupingZOut"  value="18"/>
+    <Parameter name="GroupingZOut"  value="18"/>
+    <Parameter name="GroupingZOut"  value="18"/>
+    <Parameter name="GroupingZOut"  value="19"/>
+    <Parameter name="GroupingZOut"  value="19"/>
+    <Parameter name="GroupingZOut"  value="19"/>
+    <Parameter name="GroupingZOut"  value="20"/>
+    <Parameter name="GroupingZOut"  value="20"/>
+    <Parameter name="GroupingZOut"  value="20"/>
+    <Parameter name="GroupingZOut"  value="21"/>
+    <Parameter name="GroupingZOut"  value="21"/>
+    <Parameter name="GroupingZOut"  value="21"/>
+    <Parameter name="GroupingZOut"  value="22"/>
+    <Parameter name="GroupingZOut"  value="22"/>
+    <Parameter name="GroupingZOut"  value="22"/>
+    <Parameter name="GroupingZOut"  value="23"/>
+    <Parameter name="GroupingZOut"  value="23"/>
+    <Parameter name="GroupingZOut"  value="23"/>
+    <Parameter name="GroupingZOut"  value="24"/>
+    <Parameter name="GroupingZOut"  value="24"/>
+    <Parameter name="GroupingZOut"  value="24"/>
+    <Parameter name="GroupingZOut"  value="25"/>
+    <Parameter name="GroupingZOut"  value="25"/>
+    <Parameter name="GroupingZOut"  value="25"/>
+    <Parameter name="GroupingZOut"  value="26"/>
+    <Parameter name="GroupingZOut"  value="26"/>
+    <Parameter name="GroupingZOut"  value="26"/>
+    <Parameter name="GroupingZOut"  value="27"/>
+    <Parameter name="GroupingZOut"  value="27"/>
+    <Parameter name="GroupingZOut"  value="27"/>
+    <Parameter name="GroupingZOut"  value="28"/>
+    <Parameter name="GroupingZOut"  value="28"/>
+    <Parameter name="GroupingZOut"  value="28"/>
+    <Parameter name="LayerOffset"    value="0"/>
+  </SpecPar>
+  <SpecPar name="HGCalHESiliconSensitive">
+    <PartSelector path="//HGCalHESiliconSensitive.*"/>
+    <Parameter name="Volume" value="HGCalHESiliconSensitive" eval="false"/>
+    <Parameter name="Slope"  value="0.0"/>
+    <Parameter name="GroupingZFine"  value="1"/>
+    <Parameter name="GroupingZFine"  value="1"/>
+    <Parameter name="GroupingZFine"  value="1"/>
+    <Parameter name="GroupingZFine"  value="2"/>
+    <Parameter name="GroupingZFine"  value="2"/>
+    <Parameter name="GroupingZFine"  value="2"/>
+    <Parameter name="GroupingZFine"  value="3"/>
+    <Parameter name="GroupingZFine"  value="3"/>
+    <Parameter name="GroupingZFine"  value="3"/>
+    <Parameter name="GroupingZFine"  value="4"/>
+    <Parameter name="GroupingZFine"  value="4"/>
+    <Parameter name="GroupingZFine"  value="4"/>
+    <Parameter name="GroupingZFine"  value="5"/>
+    <Parameter name="GroupingZFine"  value="5"/>
+    <Parameter name="GroupingZFine"  value="5"/>
+    <Parameter name="GroupingZFine"  value="6"/>
+    <Parameter name="GroupingZFine"  value="6"/>
+    <Parameter name="GroupingZFine"  value="6"/>
+    <Parameter name="GroupingZFine"  value="7"/>
+    <Parameter name="GroupingZFine"  value="7"/>
+    <Parameter name="GroupingZFine"  value="7"/>
+    <Parameter name="GroupingZFine"  value="8"/>
+    <Parameter name="GroupingZFine"  value="8"/>
+    <Parameter name="GroupingZFine"  value="8"/>
+    <Parameter name="GroupingZFine"  value="9"/>
+    <Parameter name="GroupingZFine"  value="9"/>
+    <Parameter name="GroupingZFine"  value="9"/>
+    <Parameter name="GroupingZFine"  value="10"/>
+    <Parameter name="GroupingZFine"  value="10"/>
+    <Parameter name="GroupingZFine"  value="10"/>
+    <Parameter name="GroupingZFine"  value="11"/>
+    <Parameter name="GroupingZFine"  value="11"/>
+    <Parameter name="GroupingZFine"  value="11"/>
+    <Parameter name="GroupingZFine"  value="12"/>
+    <Parameter name="GroupingZFine"  value="12"/>
+    <Parameter name="GroupingZFine"  value="1"/>
+    <Parameter name="GroupingZMid"   value="1"/>
+    <Parameter name="GroupingZMid"   value="1"/>
+    <Parameter name="GroupingZMid"   value="1"/>
+    <Parameter name="GroupingZMid"   value="2"/>
+    <Parameter name="GroupingZMid"   value="2"/>
+    <Parameter name="GroupingZMid"   value="2"/>
+    <Parameter name="GroupingZMid"   value="3"/>
+    <Parameter name="GroupingZMid"   value="3"/>
+    <Parameter name="GroupingZMid"   value="3"/>
+    <Parameter name="GroupingZMid"   value="4"/>
+    <Parameter name="GroupingZMid"   value="4"/>
+    <Parameter name="GroupingZMid"   value="4"/>
+    <Parameter name="GroupingZMid"   value="5"/>
+    <Parameter name="GroupingZMid"   value="5"/>
+    <Parameter name="GroupingZMid"   value="5"/>
+    <Parameter name="GroupingZMid"   value="6"/>
+    <Parameter name="GroupingZMid"   value="6"/>
+    <Parameter name="GroupingZMid"   value="6"/>
+    <Parameter name="GroupingZMid"   value="7"/>
+    <Parameter name="GroupingZMid"   value="7"/>
+    <Parameter name="GroupingZMid"   value="7"/>
+    <Parameter name="GroupingZMid"   value="8"/>
+    <Parameter name="GroupingZMid"   value="8"/>
+    <Parameter name="GroupingZMid"   value="8"/>
+    <Parameter name="GroupingZMid"   value="9"/>
+    <Parameter name="GroupingZMid"   value="9"/>
+    <Parameter name="GroupingZMid"   value="9"/>
+    <Parameter name="GroupingZMid"   value="10"/>
+    <Parameter name="GroupingZMid"   value="10"/>
+    <Parameter name="GroupingZMid"   value="10"/>
+    <Parameter name="GroupingZMid"   value="11"/>
+    <Parameter name="GroupingZMid"   value="11"/>
+    <Parameter name="GroupingZMid"   value="11"/>
+    <Parameter name="GroupingZMid"   value="12"/>
+    <Parameter name="GroupingZMid"   value="12"/>
+    <Parameter name="GroupingZMid"   value="12"/>
+    <Parameter name="GroupingZOut"   value="1"/>
+    <Parameter name="GroupingZOut"   value="1"/>
+    <Parameter name="GroupingZOut"   value="1"/>
+    <Parameter name="GroupingZOut"   value="2"/>
+    <Parameter name="GroupingZOut"   value="2"/>
+    <Parameter name="GroupingZOut"   value="2"/>
+    <Parameter name="GroupingZOut"   value="3"/>
+    <Parameter name="GroupingZOut"   value="3"/>
+    <Parameter name="GroupingZOut"   value="3"/>
+    <Parameter name="GroupingZOut"   value="4"/>
+    <Parameter name="GroupingZOut"   value="4"/>
+    <Parameter name="GroupingZOut"   value="4"/>
+    <Parameter name="GroupingZOut"   value="5"/>
+    <Parameter name="GroupingZOut"   value="5"/>
+    <Parameter name="GroupingZOut"   value="5"/>
+    <Parameter name="GroupingZOut"   value="6"/>
+    <Parameter name="GroupingZOut"   value="6"/>
+    <Parameter name="GroupingZOut"   value="6"/>
+    <Parameter name="GroupingZOut"   value="7"/>
+    <Parameter name="GroupingZOut"   value="7"/>
+    <Parameter name="GroupingZOut"   value="7"/>
+    <Parameter name="GroupingZOut"   value="8"/>
+    <Parameter name="GroupingZOut"   value="8"/>
+    <Parameter name="GroupingZOut"   value="8"/>
+    <Parameter name="GroupingZOut"   value="9"/>
+    <Parameter name="GroupingZOut"   value="9"/>
+    <Parameter name="GroupingZOut"   value="9"/>
+    <Parameter name="GroupingZOut"   value="10"/>
+    <Parameter name="GroupingZOut"   value="10"/>
+    <Parameter name="GroupingZOut"   value="10"/>
+    <Parameter name="GroupingZOut"   value="11"/>
+    <Parameter name="GroupingZOut"   value="11"/>
+    <Parameter name="GroupingZOut"   value="11"/>
+    <Parameter name="GroupingZOut"   value="12"/>
+    <Parameter name="GroupingZOut"   value="12"/>
+    <Parameter name="GroupingZOut"   value="12"/>
+    <Parameter name="LayerOffset"    value="28"/>
+  </SpecPar>
+</SpecParSection>
+
+</DDDefinition>
diff --git a/Geometry/HGCalTBCommonData/data/TB170/hgcalEE.xml b/Geometry/HGCalTBCommonData/data/TB170/hgcalEE.xml
new file mode 100644
index 0000000000000..869f7dee9bd78
--- /dev/null
+++ b/Geometry/HGCalTBCommonData/data/TB170/hgcalEE.xml
@@ -0,0 +1,105 @@
+<?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="hgcalEE.xml" eval="true">
+  <Constant name="rMinFine"   value="0.0*fm"/>
+  <Constant name="rMaxFine"   value="0.0*cm"/>
+  <Constant name="rMaxMiddle" value="120.0*cm"/>
+  <Constant name="rMaxCoarse" value="2000.0*cm"/>
+  <Constant name="rMin"       value="0.0*fm"/>
+  <Constant name="rMax"       value="10.0*cm"/>
+  <Constant name="absorbW"    value="0.5*[hgcal:WaferW]"/>
+  <Constant name="absorbH"    value="[hgcal:WaferW]*[hgcal:tan30deg]"/>
+</ConstantsSection>
+
+<PosPartSection label="hgcalEE.xml">
+  <Algorithm name="hgcal:DDHGCalTBModule">
+    <rParent name="hgcal:HGCalEE"/>
+    <Vector name="WaferName" type="string" nEntries="2">
+      hgcalwafer:HGCalEEWaferFine, hgcalwafer:HGCalEEWaferCoarse</Vector>
+    <Vector name="CoverName" type="string" nEntries="3">
+      hgcal:HGCalEESiliconPCB, hgcal:HGCalEESiliconKapton, 
+      hgcal:HGCalEESiliconCuW</Vector>
+    <Vector name="MaterialNames" type="string" nEntries="8">
+      materials:Air, materials:Air, materials:Air, materials:Air, 
+      materials:StainlessSteel, materials:Lead, materials:Copper,
+      materials:Air</Vector>
+    <Vector name="VolumeNames" type="string" nEntries="8">
+      EEPCB1,     EEKapton1, EEAirGap, EECuW, 
+      EEAbsSteel, EEAbsLead, EEAbsCu,  EESensitive</Vector>
+    <Vector name="Thickness" type="numeric" nEntries="8">
+      [hgcal:thPCB], [hgcal:thKapton], 3.0*mm, [hgcal:thAbsEE], 0.3*mm,
+      4.9*mm, 6.0*mm, 0.10*mm</Vector>
+    <Vector name="Layers" type="numeric" nEntries="14"> 
+      18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18</Vector>
+    <Vector name="LayerThick" type="numeric" nEntries="14"> 
+      23.72*mm, 23.72*mm, 23.72*mm, 23.72*mm, 23.72*mm, 23.72*mm, 23.72*mm,
+      23.72*mm, 23.72*mm, 23.72*mm, 23.72*mm, 23.72*mm, 23.72*mm, 23.72*mm
+    </Vector>
+    <Vector name="LayerType" type="numeric" nEntries="252"> 
+      4, 5, 4, 2, 0, 7, 7, 7, 1, 3, 6, 3, 1, 7, 7, 7, 0, 2,
+      4, 5, 4, 2, 0, 7, 7, 7, 1, 3, 6, 3, 1, 7, 7, 7, 0, 2,
+      4, 5, 4, 2, 0, 7, 7, 7, 1, 3, 6, 3, 1, 7, 7, 7, 0, 2,
+      4, 5, 4, 2, 0, 7, 7, 7, 1, 3, 6, 3, 1, 7, 7, 7, 0, 2,
+      4, 5, 4, 2, 0, 7, 7, 7, 1, 3, 6, 3, 1, 7, 7, 7, 0, 2,
+      4, 5, 4, 2, 0, 7, 7, 7, 1, 3, 6, 3, 1, 7, 7, 7, 0, 2,
+      4, 5, 4, 2, 0, 7, 7, 7, 1, 3, 6, 3, 1, 7, 7, 7, 0, 2,
+      4, 5, 4, 2, 0, 7, 7, 7, 1, 3, 6, 3, 1, 7, 7, 7, 0, 2,
+      4, 5, 4, 2, 0, 7, 7, 7, 1, 3, 6, 3, 1, 7, 7, 7, 0, 2,
+      4, 5, 4, 2, 0, 7, 7, 7, 1, 3, 6, 3, 1, 7, 7, 7, 0, 2,
+      4, 5, 4, 2, 0, 7, 7, 7, 1, 3, 6, 3, 1, 7, 7, 7, 0, 2,
+      4, 5, 4, 2, 0, 7, 7, 7, 1, 3, 6, 3, 1, 7, 7, 7, 0, 2,
+      4, 5, 4, 2, 0, 7, 7, 7, 1, 3, 6, 3, 1, 7, 7, 7, 0, 2,
+      4, 5, 4, 2, 0, 7, 7, 7, 1, 3, 6, 3, 1, 7, 7, 7, 0, 2
+    </Vector>
+    <Vector name="LayerSense" type="numeric" nEntries="252">
+      0, 0, 0, 0, 2, 1, 1, 1, 3, 4, 0, 4, 3, 1, 1, 1, 2, 0,
+      0, 0, 0, 0, 2, 1, 1, 1, 3, 4, 0, 4, 3, 1, 1, 1, 2, 0,
+      0, 0, 0, 0, 2, 1, 1, 1, 3, 4, 0, 4, 3, 1, 1, 1, 2, 0,
+      0, 0, 0, 0, 2, 1, 1, 1, 3, 4, 0, 4, 3, 1, 1, 1, 2, 0,
+      0, 0, 0, 0, 2, 1, 1, 1, 3, 4, 0, 4, 3, 1, 1, 1, 2, 0,
+      0, 0, 0, 0, 2, 1, 1, 1, 3, 4, 0, 4, 3, 1, 1, 1, 2, 0,
+      0, 0, 0, 0, 2, 1, 1, 1, 3, 4, 0, 4, 3, 1, 1, 1, 2, 0,
+      0, 0, 0, 0, 2, 1, 1, 1, 3, 4, 0, 4, 3, 1, 1, 1, 2, 0,
+      0, 0, 0, 0, 2, 1, 1, 1, 3, 4, 0, 4, 3, 1, 1, 1, 2, 0,
+      0, 0, 0, 0, 2, 1, 1, 1, 3, 4, 0, 4, 3, 1, 1, 1, 2, 0,
+      0, 0, 0, 0, 2, 1, 1, 1, 3, 4, 0, 4, 3, 1, 1, 1, 2, 0,
+      0, 0, 0, 0, 2, 1, 1, 1, 3, 4, 0, 4, 3, 1, 1, 1, 2, 0,
+      0, 0, 0, 0, 2, 1, 1, 1, 3, 4, 0, 4, 3, 1, 1, 1, 2, 0,
+      0, 0, 0, 0, 2, 1, 1, 1, 3, 4, 0, 4, 3, 1, 1, 1, 2, 0
+    </Vector>
+    <Numeric name="zMinBlock"   value="[hgcal:zminEE]"/>
+    <Numeric name="rMaxFine"    value="[rMaxFine]"/>
+    <Numeric name="waferW"      value="[hgcal:WaferW]"/>
+    <Numeric name="waferGap"    value="0.0*fm"/>
+    <Numeric name="absorberW"   value="[hgcalEE:absorbW]"/>
+    <Numeric name="absorberH"   value="[hgcalEE:absorbH]"/>
+    <Numeric name="Sectors"     value="12"/>
+    <Vector name="SlopeBottom" type="numeric" nEntries="2">
+      0.0, 0.0</Vector>
+    <Vector name="SlopeTop" type="numeric" nEntries="2">
+      0, 0</Vector>
+    <Vector name="ZFront" type="numeric" nEntries="2">
+      [hgcal:zminEE], [hgcal:zmaxEE]</Vector>
+    <Vector name="RMaxFront" type="numeric" nEntries="2">
+      [hgcal:rmaxEE], [hgcal:rmaxEE]</Vector>
+    <String name="RotNameSpace" value="hgcalmodule"/>
+  </Algorithm>
+</PosPartSection> 
+
+<SpecParSection label="hgcalEE.xml" eval="true">
+  <SpecPar name="HGCalEE">
+    <PartSelector path="//HGCalEESensitive.*"/>    
+    <Parameter name="Volume" value="HGCalEESensitive" eval="false"/>
+    <Parameter name="GeometryMode" value="HGCalGeometryMode::Hexagon" eval="false"/>
+    <Parameter name="RadiusBound"  value="[rMinFine]"/>
+    <Parameter name="RadiusBound"  value="[rMaxFine]"/>
+    <Parameter name="RadiusBound"  value="[rMaxMiddle]"/>
+    <Parameter name="RadiusBound"  value="[rMaxCoarse]"/>
+    <Parameter name="RadiusLimits" value="[rMin]"/>
+    <Parameter name="RadiusLimits" value="[rMax]"/>
+    <Parameter name="LevelTop"     value="99"/>
+  </SpecPar>
+</SpecParSection>
+
+</DDDefinition>
diff --git a/Geometry/HGCalTBCommonData/data/TB170/hgcalHE.xml b/Geometry/HGCalTBCommonData/data/TB170/hgcalHE.xml
new file mode 100644
index 0000000000000..d4c4d9102ac37
--- /dev/null
+++ b/Geometry/HGCalTBCommonData/data/TB170/hgcalHE.xml
@@ -0,0 +1,91 @@
+<?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="hgcalHE.xml" eval="true">
+  <Constant name="rMinFine"   value="0.0*fm"/>
+  <Constant name="rMaxFine"   value="0.0*fm"/>
+  <Constant name="rMaxMiddle" value="0.0*fm"/>
+  <Constant name="rMaxCoarse" value="2000.0*cm"/>
+  <Constant name="rMin"       value="[hgcal:rminHE]"/>
+  <Constant name="rMax"       value="[hgcal:rmaxHE]"/>
+  <Constant name="absorbW"    value="1.5*[hgcal:WaferW]"/>
+  <Constant name="absorbH"    value="1.5*[hgcal:WaferW]"/>
+</ConstantsSection>
+
+<PosPartSection label="hgcalHE.xml">
+  <Algorithm name="hgcal:DDHGCalTBModule">
+    <rParent name="hgcal:HGCalHE"/>
+    <Vector name="WaferName" type="string" nEntries="2">
+      hgcalwafer:HGCalHEWaferFine, hgcalwafer:HGCalHEWaferCoarse</Vector>
+    <Vector name="CoverName" type="string" nEntries="3">
+      hgcal:HGCalHESiliconPCB, hgcal:HGCalHESiliconKapton, 
+      hgcal:HGCalHESiliconCu</Vector>
+    <Vector name="MaterialNames" type="string" nEntries="8">
+      materials:StainlessSteel, materials:Air, materials:Air, 
+      materials:Copper, materials:Air, materials:Air, materials:Air,
+      materials:StainlessSteel</Vector>
+    <Vector name="VolumeNames" type="string" nEntries="8">
+      HESteel40mm,        HESiliconPCB1,    HESiliconCu,     HECu, 
+      HESiliconSensitive, HESiliconKapton1, HESiliconAirGap, 
+      HESteel10mm</Vector>
+    <Vector name="Thickness" type="numeric" nEntries="8">
+      40.0*mm, [hgcal:thPCB], [hgcal:thAbsHE], 6.0*mm, 0.1*mm, 
+      [hgcal:thKapton], 6.89*mm, 10.0*mm</Vector>
+    <Vector name="Layers" type="numeric" nEntries="13"> 
+      1, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 7</Vector>
+    <Vector name="LayerThick" type="numeric" nEntries="13"> 
+      10.0*mm, 56.0*mm, 56.0*mm, 56.0*mm, 56.0*mm, 56.0*mm, 56.0*mm, 56.0*mm,
+      56.0*mm, 56.0*mm, 56.0*mm, 56.0*mm, 9.11*mm</Vector>
+    <Vector name="LayerType" type="numeric" nEntries="107"> 
+      7, 
+      3, 2, 5, 4, 4, 4, 1, 6, 0,  3, 2, 5, 4, 4, 4, 1, 6, 0,  
+      3, 2, 5, 4, 4, 4, 1, 6, 0,  3, 2, 5, 4, 4, 4, 1, 6, 0,  
+      3, 2, 5, 4, 4, 4, 1, 6, 0,  3, 2, 5, 4, 4, 4, 1, 6, 0,  
+      3, 2, 5, 4, 4, 4, 1, 6, 0,  3, 2, 5, 4, 4, 4, 1, 6, 0,  
+      3, 2, 5, 4, 4, 4, 1, 6, 0,  3, 2, 5, 4, 4, 4, 1, 6, 0,  
+      3, 2, 5, 4, 4, 4, 1, 6, 0,  3, 2, 5, 4, 4, 4, 1  
+    </Vector>
+    <Vector name="LayerSense" type="numeric" nEntries="107">
+      0,
+      0, 4, 3, 1, 1, 1, 2, 0, 0,  0, 4, 3, 1, 1, 1, 2, 0, 0,
+      0, 4, 3, 1, 1, 1, 2, 0, 0,  0, 4, 3, 1, 1, 1, 2, 0, 0,
+      0, 4, 3, 1, 1, 1, 2, 0, 0,  0, 4, 3, 1, 1, 1, 2, 0, 0,
+      0, 4, 3, 1, 1, 1, 2, 0, 0,  0, 4, 3, 1, 1, 1, 2, 0, 0,
+      0, 4, 3, 1, 1, 1, 2, 0, 0,  0, 4, 3, 1, 1, 1, 2, 0, 0,
+      0, 4, 3, 1, 1, 1, 2, 0, 0,  0, 4, 3, 1, 1, 1, 2
+    </Vector>
+    <Numeric name="zMinBlock"   value="[hgcal:zminHE]"/>
+    <Numeric name="rMaxFine"    value="[rMaxFine]"/>
+    <Numeric name="waferW"      value="[hgcal:WaferW]"/>
+    <Numeric name="waferGap"    value="1.0*mm"/>
+    <Numeric name="absorberW"   value="[hgcalHE:absorbW]"/>
+    <Numeric name="absorberH"   value="[hgcalHE:absorbH]"/>
+    <Numeric name="Sectors"     value="12"/>
+    <Vector name="SlopeBottom" type="numeric" nEntries="2">
+      0.0, 0.0</Vector>
+    <Vector name="SlopeTop" type="numeric" nEntries="2">
+      0, 0</Vector>
+    <Vector name="ZFront" type="numeric" nEntries="2">
+      [hgcal:zminHE], [hgcal:zmaxHE]</Vector>
+    <Vector name="RMaxFront" type="numeric" nEntries="2">
+      [hgcal:rmaxHE], [hgcal:rmaxHE]</Vector>
+    <String name="RotNameSpace" value="hgcalmodule"/>
+  </Algorithm>
+</PosPartSection> 
+
+<SpecParSection label="hgcalHE.xml" eval="true">
+  <SpecPar name="HGCalHE">
+    <PartSelector path="//HGCalHESiliconSensitive.*"/>
+    <Parameter name="Volume" value="HGCalHESiliconSensitive" eval="false"/>
+    <Parameter name="GeometryMode" value="HGCalGeometryMode::Hexagon" eval="false"/>
+    <Parameter name="RadiusBound"  value="[rMinFine]"/>
+    <Parameter name="RadiusBound"  value="[rMaxFine]"/>
+    <Parameter name="RadiusBound"  value="[rMaxMiddle]"/>
+    <Parameter name="RadiusBound"  value="[rMaxCoarse]"/>
+    <Parameter name="RadiusLimits" value="[rMin]"/>
+    <Parameter name="RadiusLimits" value="[rMax]"/>
+    <Parameter name="LevelTop"     value="99"/>
+  </SpecPar>
+</SpecParSection>
+
+</DDDefinition>
diff --git a/Geometry/HGCalTBCommonData/data/TB170/hgcalsense.xml b/Geometry/HGCalTBCommonData/data/TB170/hgcalsense.xml
new file mode 100644
index 0000000000000..bd4037139475d
--- /dev/null
+++ b/Geometry/HGCalTBCommonData/data/TB170/hgcalsense.xml
@@ -0,0 +1,16 @@
+<?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">
+
+<SpecParSection label="hgcalsense.xml" eval="true">
+  <SpecPar name="hgcee">
+    <PartSelector path="//HGCalEECell.*"/>
+    <Parameter name="SensitiveDetector" value="HGCSensitiveDetector" eval="false"/>
+    <Parameter name="ReadOutName" value="HGCHitsEE" eval="false"/>
+  </SpecPar>
+  <SpecPar name="hgcfh">
+    <PartSelector path="//.*HGCalHECell.*"/> 
+    <Parameter name="SensitiveDetector" value="HGCSensitiveDetector" eval="false"/>
+    <Parameter name="ReadOutName" value="HGCHitsHEfront" eval="false"/>
+  </SpecPar>
+</SpecParSection>
+</DDDefinition>
diff --git a/Geometry/HGCalTBCommonData/data/TB180/Absorb12/hgcalAbsorber.xml b/Geometry/HGCalTBCommonData/data/TB180/Absorb12/hgcalAbsorber.xml
new file mode 100644
index 0000000000000..e54c3ac5bc5d4
--- /dev/null
+++ b/Geometry/HGCalTBCommonData/data/TB180/Absorb12/hgcalAbsorber.xml
@@ -0,0 +1,31 @@
+<?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="hgcalAbsorber.xml" eval="true">
+  <Constant name="zminAbs"    value="121.1*cm"/>
+  <Constant name="zmaxAbs"    value="122.3*cm"/>
+  <Constant name="thickAbs"   value="([zmaxAbs]-[zminAbs])"/>
+</ConstantsSection>
+
+<SolidSection label="hgcalAbsorber.xml">
+  <Polyhedra name="HGCalAbsorber" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thickAbs]/2" rMin="0*fm" rMax="[hgcal:WaferW]/2"/>
+    <ZSection z= "[thickAbs]/2" rMin="0*fm" rMax="[hgcal:WaferW]/2"/>
+  </Polyhedra>
+</SolidSection>
+
+<LogicalPartSection label="hgcalAbsorber.xml">
+  <LogicalPart name="HGCalAbsorber" category="unspecified">
+    <rSolid name="HGCalAbsorber"/>
+    <rMaterial name="materials:Tungsten"/>
+  </LogicalPart>
+</LogicalPartSection>
+
+<PosPartSection label="hgcalAbsorber.xml">
+  <PosPart copyNumber="1">
+    <rParent name="hgcal:HGCal"/>
+    <rChild name="hgcalAbsorber:HGCalAbsorber"/>
+    <rRotation name="rotations:R090"/>
+  </PosPart>
+</PosPartSection>
+</DDDefinition>
diff --git a/Geometry/HGCalTBCommonData/data/TB180/Absorb16/hgcalAbsorber.xml b/Geometry/HGCalTBCommonData/data/TB180/Absorb16/hgcalAbsorber.xml
new file mode 100644
index 0000000000000..9b0aafde23763
--- /dev/null
+++ b/Geometry/HGCalTBCommonData/data/TB180/Absorb16/hgcalAbsorber.xml
@@ -0,0 +1,31 @@
+<?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="hgcalAbsorber.xml" eval="true">
+  <Constant name="zminAbs"    value="118.7*cm"/>
+  <Constant name="zmaxAbs"    value="120.3*cm"/>
+  <Constant name="thickAbs"   value="([zmaxAbs]-[zminAbs])"/>
+</ConstantsSection>
+
+<SolidSection label="hgcalAbsorber.xml">
+  <Polyhedra name="HGCalAbsorber" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thickAbs]/2" rMin="0*fm" rMax="[hgcal:WaferW]/2"/>
+    <ZSection z= "[thickAbs]/2" rMin="0*fm" rMax="[hgcal:WaferW]/2"/>
+  </Polyhedra>
+</SolidSection>
+
+<LogicalPartSection label="hgcalAbsorber.xml">
+  <LogicalPart name="HGCalAbsorber" category="unspecified">
+    <rSolid name="HGCalAbsorber"/>
+    <rMaterial name="materials:Tungsten"/>
+  </LogicalPart>
+</LogicalPartSection>
+
+<PosPartSection label="hgcalAbsorber.xml">
+  <PosPart copyNumber="1">
+    <rParent name="hgcal:HGCal"/>
+    <rChild name="hgcalAbsorber:HGCalAbsorber"/>
+    <rRotation name="rotations:R090"/>
+  </PosPart>
+</PosPartSection>
+</DDDefinition>
diff --git a/Geometry/HGCalTBCommonData/data/TB180/Absorb20/hgcalAbsorber.xml b/Geometry/HGCalTBCommonData/data/TB180/Absorb20/hgcalAbsorber.xml
new file mode 100644
index 0000000000000..bcadf54b866f4
--- /dev/null
+++ b/Geometry/HGCalTBCommonData/data/TB180/Absorb20/hgcalAbsorber.xml
@@ -0,0 +1,31 @@
+<?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="hgcalAbsorber.xml" eval="true">
+  <Constant name="zminAbs"    value="120.3*cm"/>
+  <Constant name="zmaxAbs"    value="122.3*cm"/>
+  <Constant name="thickAbs"   value="([zmaxAbs]-[zminAbs])"/>
+</ConstantsSection>
+
+<SolidSection label="hgcalAbsorber.xml">
+  <Polyhedra name="HGCalAbsorber" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thickAbs]/2" rMin="0*fm" rMax="[hgcal:WaferW]/2"/>
+    <ZSection z= "[thickAbs]/2" rMin="0*fm" rMax="[hgcal:WaferW]/2"/>
+  </Polyhedra>
+</SolidSection>
+
+<LogicalPartSection label="hgcalAbsorber.xml">
+  <LogicalPart name="HGCalAbsorber" category="unspecified">
+    <rSolid name="HGCalAbsorber"/>
+    <rMaterial name="materials:Tungsten"/>
+  </LogicalPart>
+</LogicalPartSection>
+
+<PosPartSection label="hgcalAbsorber.xml">
+  <PosPart copyNumber="1">
+    <rParent name="hgcal:HGCal"/>
+    <rChild name="hgcalAbsorber:HGCalAbsorber"/>
+    <rRotation name="rotations:R090"/>
+  </PosPart>
+</PosPartSection>
+</DDDefinition>
diff --git a/Geometry/HGCalTBCommonData/data/TB180/Absorb22/hgcalAbsorber.xml b/Geometry/HGCalTBCommonData/data/TB180/Absorb22/hgcalAbsorber.xml
new file mode 100644
index 0000000000000..d511767c2a0e6
--- /dev/null
+++ b/Geometry/HGCalTBCommonData/data/TB180/Absorb22/hgcalAbsorber.xml
@@ -0,0 +1,31 @@
+<?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="hgcalAbsorber.xml" eval="true">
+  <Constant name="zminAbs"    value="120.1*cm"/>
+  <Constant name="zmaxAbs"    value="122.3*cm"/>
+  <Constant name="thickAbs"   value="([zmaxAbs]-[zminAbs])"/>
+</ConstantsSection>
+
+<SolidSection label="hgcalAbsorber.xml">
+  <Polyhedra name="HGCalAbsorber" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thickAbs]/2" rMin="0*fm" rMax="[hgcal:WaferW]/2"/>
+    <ZSection z= "[thickAbs]/2" rMin="0*fm" rMax="[hgcal:WaferW]/2"/>
+  </Polyhedra>
+</SolidSection>
+
+<LogicalPartSection label="hgcalAbsorber.xml">
+  <LogicalPart name="HGCalAbsorber" category="unspecified">
+    <rSolid name="HGCalAbsorber"/>
+    <rMaterial name="materials:Tungsten"/>
+  </LogicalPart>
+</LogicalPartSection>
+
+<PosPartSection label="hgcalAbsorber.xml">
+  <PosPart copyNumber="1">
+    <rParent name="hgcal:HGCal"/>
+    <rChild name="hgcalAbsorber:HGCalAbsorber"/>
+    <rRotation name="rotations:R090"/>
+  </PosPart>
+</PosPartSection>
+</DDDefinition>
diff --git a/Geometry/HGCalTBCommonData/data/TB180/cms.xml b/Geometry/HGCalTBCommonData/data/TB180/cms.xml
new file mode 100644
index 0000000000000..f1c4f7f375937
--- /dev/null
+++ b/Geometry/HGCalTBCommonData/data/TB180/cms.xml
@@ -0,0 +1,35 @@
+<?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">
+
+<SolidSection label="cms.xml">
+  <Tubs name="OCMS" rMin="0.0*fm" rMax="2.0*m" dz="3.0*m" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="CMSE" rMin="0.0*fm" rMax="2.0*m" dz="3.0*m" startPhi="0*deg" deltaPhi="360*deg"/>
+</SolidSection>
+
+<LogicalPartSection label="cms.xml">
+  <LogicalPart name="World" category="unspecified">
+    <rSolid name="OCMS"/>
+    <rMaterial name="materials:Air"/>
+  </LogicalPart>
+  <LogicalPart name="OCMS" category="unspecified">
+    <rSolid name="OCMS"/>
+    <rMaterial name="materials:Air"/>
+  </LogicalPart>
+  <LogicalPart name="CMSE" category="unspecified">
+    <rSolid name="CMSE"/>
+    <rMaterial name="materials:Air"/>
+  </LogicalPart>
+</LogicalPartSection>
+
+<PosPartSection label="cms.xml">
+  <PosPart copyNumber="1">
+    <rParent name="cms:World"/>
+    <rChild name="cms:OCMS"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="cms:OCMS"/>
+    <rChild name="cms:CMSE"/>
+  </PosPart>
+</PosPartSection>
+
+</DDDefinition>
diff --git a/Geometry/HGCalTBCommonData/data/TB180/hgcProdCuts.xml b/Geometry/HGCalTBCommonData/data/TB180/hgcProdCuts.xml
new file mode 100644
index 0000000000000..93b61cd2b857f
--- /dev/null
+++ b/Geometry/HGCalTBCommonData/data/TB180/hgcProdCuts.xml
@@ -0,0 +1,15 @@
+<?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">
+
+<SpecParSection label="hgcProdCuts.xml" eval="true">
+  <SpecPar name="hgcProdCuts">
+    <PartSelector path="//HGCal"/>
+    <Parameter name="CMSCutsRegion" value="HGCalRegion" eval="false"/>
+    <Parameter name="ProdCutsForElectrons" value="0.03*mm"/>
+<Parameter name="ProdCutsForProtons" value="0.03*mm"/>
+    <Parameter name="ProdCutsForPositrons" value="0.03*mm"/>
+    <Parameter name="ProdCutsForGamma" value="0.03*mm"/>
+  </SpecPar>
+</SpecParSection>
+
+</DDDefinition>
diff --git a/Geometry/HGCalTBCommonData/data/TB180/hgcal.xml b/Geometry/HGCalTBCommonData/data/TB180/hgcal.xml
new file mode 100644
index 0000000000000..ed762d6ee3246
--- /dev/null
+++ b/Geometry/HGCalTBCommonData/data/TB180/hgcal.xml
@@ -0,0 +1,113 @@
+<?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="rmin"       value="0.0*fm"/>
+  <Constant name="rmax"       value="50.0*cm"/>
+  <Constant name="zmin"       value="-1.0*cm"/>
+  <Constant name="zmax"       value="124.511*cm"/>
+  <Constant name="rminEE"     value="0.0*fm"/>
+  <Constant name="rmaxEE"     value="8.0*cm"/>
+  <Constant name="zminEE1"    value="36.647*cm"/>
+  <Constant name="zmaxEE1"    value="36.953*cm"/>
+  <Constant name="zminEE2"    value="122.7*cm"/>
+  <Constant name="zmaxEE2"    value="124.2*cm"/>
+  <Constant name="rmaxEEF"    value="9.5*cm"/>
+  <Constant name="thPCB"      value="1.6*mm"/>
+  <Constant name="thKapton"   value="0.01*mm"/>
+  <Constant name="thAbsEE"    value="1.2*mm"/>
+  <Constant name="thAbsCuEE"  value="1.15*mm"/>
+  <Constant name="WaferW"     value="123.7*mm"/>
+  <Constant name="tan30deg"   value="tan(30.0*deg)"/>
+</ConstantsSection>
+
+<MaterialSection label="hgcal.xml">
+  <CompositeMaterial name="WCu" density="14.979*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.75">
+      <rMaterial name="materials:Tungsten"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.25">
+      <rMaterial name="materials:Copper"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+</MaterialSection>
+
+<SolidSection label="hgcal.xml">
+  <Polycone name="HGCal"    startPhi="0*deg" deltaPhi="360*deg">
+    <ZSection z="[zmin]"    rMin="[rmin]" rMax="[rmax]"/>
+    <ZSection z="[zmax]"    rMin="[rmin]" rMax="[rmax]"/>
+  </Polycone>
+  <Polycone name="HGCalEE1" startPhi="0*deg" deltaPhi="360*deg">
+    <ZSection z="[zminEE1]" rMin="[rminEE]" rMax="[rmaxEE]"/>
+    <ZSection z="[zmaxEE1]" rMin="[rminEE]" rMax="[rmaxEE]"/>
+  </Polycone>
+  <Polycone name="HGCalEE2" startPhi="0*deg" deltaPhi="360*deg">
+    <ZSection z="[zminEE2]" rMin="[rminEE]" rMax="[rmaxEE]"/>
+    <ZSection z="[zmaxEE2]" rMin="[rminEE]" rMax="[rmaxEE]"/>
+  </Polycone>
+  <Polyhedra name="HGCalPCB" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thPCB]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thPCB]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+  <Polyhedra name="HGCalKapton" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thKapton]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thKapton]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+  <Polyhedra name="HGCalEEAbs" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thAbsEE]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thAbsEE]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+  <Polyhedra name="HGCalEECuAbs" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thAbsCuEE]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thAbsCuEE]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+</SolidSection>
+
+<LogicalPartSection label="hgcal.xml">
+  <LogicalPart name="HGCal" category="unspecified">
+    <rSolid name="HGCal"/>
+    <rMaterial name="materials:Air"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalEE1" category="unspecified">
+    <rSolid name="HGCalEE1"/>
+    <rMaterial name="materials:Air"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalEE2" category="unspecified">
+    <rSolid name="HGCalEE2"/>
+    <rMaterial name="materials:Air"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalEEPCB" category="unspecified">
+    <rSolid name="HGCalPCB"/>
+    <rMaterial name="materials:G10"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalEEKapton" category="unspecified">
+    <rSolid name="HGCalKapton"/>
+    <rMaterial name="materials:Kapton"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalEEAbsorber" category="unspecified">
+    <rSolid name="HGCalEEAbs"/>
+    <rMaterial name="hgcal:WCu"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalCuEEAbsorber" category="unspecified">
+    <rSolid name="HGCalEECuAbs"/>
+    <rMaterial name="materials:Copper"/>
+  </LogicalPart>
+</LogicalPartSection>
+
+<PosPartSection label="hgcal.xml">
+  <PosPart copyNumber="1">
+    <rParent name="cms:CMSE"/>
+    <rChild name="hgcal:HGCal"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcal:HGCal"/>
+    <rChild name="hgcal:HGCalEE1"/>
+    <rRotation name="rotations:R090"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcal:HGCal"/>
+    <rChild name="hgcal:HGCalEE2"/>
+    <rRotation name="rotations:R090"/>
+  </PosPart>
+</PosPartSection>
+</DDDefinition>
diff --git a/Geometry/HGCalTBCommonData/data/TB180/hgcalCons.xml b/Geometry/HGCalTBCommonData/data/TB180/hgcalCons.xml
new file mode 100644
index 0000000000000..2cb30b13d0d12
--- /dev/null
+++ b/Geometry/HGCalTBCommonData/data/TB180/hgcalCons.xml
@@ -0,0 +1,51 @@
+<?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">
+
+<SpecParSection label="hgcalReco.xml" eval="true">
+  <SpecPar name="HGCalEEWafer">
+    <PartSelector path="//HGCalEEWafer.*"/>
+    <Parameter name="Volume" value="HGCalEEWafer" eval="false"/>
+    <Parameter name="WaferSize"      value="[hgcal:WaferW]"/>
+  </SpecPar>
+  <SpecPar name="HGCalEECell">
+    <PartSelector path="//HGCalEECell.*"/>
+    <Parameter name="Volume" value="HGCalEECell" eval="false"/>
+    <Parameter name="CellSize"      value="[hgcalwafer:CellWF]"/>
+    <Parameter name="CellSize"      value="[hgcalwafer:CellWC]"/>
+  </SpecPar>
+  <SpecPar name="HGCalEESensitive">
+    <PartSelector path="//HGCalEESensitive.*"/>
+    <Parameter name="Volume" value="HGCalEESensitive" eval="false"/>
+    <Parameter name="Slope"  value="0.0"/>
+    <Parameter name="GroupingZFine"  value="1"/>
+    <Parameter name="GroupingZFine"  value="1"/>
+    <Parameter name="GroupingZFine"  value="1"/>
+    <Parameter name="GroupingZFine"  value="2"/>
+    <Parameter name="GroupingZFine"  value="2"/>
+    <Parameter name="GroupingZFine"  value="2"/>
+    <Parameter name="GroupingZFine"  value="3"/>
+    <Parameter name="GroupingZFine"  value="3"/>
+    <Parameter name="GroupingZFine"  value="3"/>
+    <Parameter name="GroupingZMid"   value="1"/>
+    <Parameter name="GroupingZMid"   value="1"/>
+    <Parameter name="GroupingZMid"   value="1"/>
+    <Parameter name="GroupingZMid"   value="2"/>
+    <Parameter name="GroupingZMid"   value="2"/>
+    <Parameter name="GroupingZMid"   value="2"/>
+    <Parameter name="GroupingZMid"   value="3"/>
+    <Parameter name="GroupingZMid"   value="3"/>
+    <Parameter name="GroupingZMid"   value="3"/>
+    <Parameter name="GroupingZOut"   value="1"/>
+    <Parameter name="GroupingZOut"   value="1"/>
+    <Parameter name="GroupingZOut"   value="1"/>
+    <Parameter name="GroupingZOut"   value="2"/>
+    <Parameter name="GroupingZOut"   value="2"/>
+    <Parameter name="GroupingZOut"   value="2"/>
+    <Parameter name="GroupingZOut"   value="3"/>
+    <Parameter name="GroupingZOut"   value="3"/>
+    <Parameter name="GroupingZOut"   value="3"/>
+    <Parameter name="LayerOffset"    value="0"/>
+  </SpecPar>
+</SpecParSection>
+
+</DDDefinition>
diff --git a/Geometry/HGCalTBCommonData/data/TB180/hgcalEE.xml b/Geometry/HGCalTBCommonData/data/TB180/hgcalEE.xml
new file mode 100644
index 0000000000000..731abb598a09f
--- /dev/null
+++ b/Geometry/HGCalTBCommonData/data/TB180/hgcalEE.xml
@@ -0,0 +1,243 @@
+<?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="hgcalEE.xml" eval="true">
+  <Constant name="rMinFine"     value="0.0*fm"/>
+  <Constant name="rMaxFine"     value="0.0*cm"/>
+  <Constant name="rMaxMiddle"   value="120.0*cm"/>
+  <Constant name="rMaxCoarse"   value="2000.0*cm"/>
+  <Constant name="rMin"         value="0.0*fm"/>
+  <Constant name="rMax"         value="10.0*cm"/>
+  <Constant name="widthSilicon" value="150.0*mm"/>
+  <Constant name="widthKapton"  value="150.0*mm"/>
+  <Constant name="widthScint1"  value="100.0*mm"/>
+  <Constant name="widthScint2"  value="20.0*mm"/>
+  <Constant name="thickKapton"  value="0.050*mm"/>
+  <Constant name="thickSilicon" value="0.050*mm"/>
+  <Constant name="thickScint1"  value="5.0*mm"/>
+  <Constant name="thickScint2"  value="5.0*mm"/>
+  <Constant name="zposTel1"     value="0.0*cm"/>
+  <Constant name="zposTel2"     value="15.3*cm"/>
+  <Constant name="zposTel3"     value="30.5*cm"/>
+  <Constant name="zposTel4"     value="64.8*cm"/>
+  <Constant name="zposTel5"     value="80.0*cm"/>
+  <Constant name="zposTel6"     value="95.3*cm"/>
+  <Constant name="zposScint1"   value="-1.0*cm"/>
+  <Constant name="zposScint2"   value="-0.5*cm"/>
+  <Constant name="zposScint3"   value="95.3*cm"/>
+  <Constant name="zposScint4"   value="95.8*cm"/>
+  <Constant name="absorbW"      value="0.5*[hgcal:WaferW]"/>
+  <Constant name="absorbH"      value="[hgcal:WaferW]*[hgcal:tan30deg]"/>
+</ConstantsSection>
+
+<SolidSection label="hgcalEE.xml">
+  <Box name="HGCalEETelScint1"  dx="[widthScint1]/2"  dy="[widthScint1]/2"  dz="[thickScint1]/2"/>
+  <Box name="HGCalEETelScint2"  dx="[widthScint2]/2"  dy="[widthScint2]/2"  dz="[thickScint2]/2"/>
+  <Box name="HGCalEETelSilicon" dx="[widthSilicon]/2" dy="[widthSilicon]/2" dz="[thickSilicon]/2"/>
+  <Box name="HGCalEETelKapton"  dx="[widthKapton]/2"  dy="[widthKapton]/2"  dz="[thickKapton]/2"/>
+</SolidSection>
+
+<LogicalPartSection label="hgcalEE.xml">
+  <LogicalPart name="HGCalEETelScint1" category="unspecified">
+    <rSolid name="HGCalEETelScint1"/>
+    <rMaterial name="materials:Scintillator"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalEETelScint2" category="unspecified">
+    <rSolid name="HGCalEETelScint2"/>
+    <rMaterial name="materials:Scintillator"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalEETelSilicon" category="unspecified">
+    <rSolid name="HGCalEETelSilicon"/>
+    <rMaterial name="materials:Silicon"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalEETelKapton" category="unspecified">
+    <rSolid name="HGCalEETelKapton"/>
+    <rMaterial name="materials:Kapton"/>
+  </LogicalPart>
+</LogicalPartSection>
+  
+<PosPartSection label="hgcalEE.xml">
+  <PosPart copyNumber="1">
+    <rParent name="hgcal:HGCal"/>
+    <rChild name="hgcalEE:HGCalEETelScint1"/>
+    <Translation x="0*fm" y="0*fm" z="([zposScint1]+0.5*[thickScint1])"/>
+  </PosPart>
+  <PosPart copyNumber="2">
+    <rParent name="hgcal:HGCal"/>
+    <rChild name="hgcalEE:HGCalEETelScint2"/>
+    <Translation x="0*fm" y="0*fm" z="([zposScint2]+0.5*[thickScint2])"/>
+  </PosPart>
+  <PosPart copyNumber="3">
+    <rParent name="hgcal:HGCal"/>
+    <rChild name="hgcalEE:HGCalEETelScint1"/>
+    <Translation x="0*fm" y="0*fm" z="([zposScint3]+0.5*[thickScint1])"/>
+  </PosPart>
+  <PosPart copyNumber="4">
+    <rParent name="hgcal:HGCal"/>
+    <rChild name="hgcalEE:HGCalEETelScint2"/>
+    <Translation x="0*fm" y="0*fm" z="([zposScint4]+0.5*[thickScint2])"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcal:HGCal"/>
+    <rChild name="hgcalEE:HGCalEETelSilicon"/>
+    <Translation x="0*fm" y="0*fm" z="([zposTel1]-0.5*[thickSilicon])"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcal:HGCal"/>
+    <rChild name="hgcalEE:HGCalEETelKapton"/>
+    <Translation x="0*fm" y="0*fm" z="([zposTel1]+0.5*[thickKapton])"/>
+  </PosPart>
+  <PosPart copyNumber="2">
+    <rParent name="hgcal:HGCal"/>
+    <rChild name="hgcalEE:HGCalEETelSilicon"/>
+    <Translation x="0*fm" y="0*fm" z="([zposTel2]-0.5*[thickSilicon])"/>
+  </PosPart>
+  <PosPart copyNumber="2">
+    <rParent name="hgcal:HGCal"/>
+    <rChild name="hgcalEE:HGCalEETelKapton"/>
+    <Translation x="0*fm" y="0*fm" z="([zposTel2]+0.5*[thickKapton])"/>
+  </PosPart>
+  <PosPart copyNumber="3">
+    <rParent name="hgcal:HGCal"/>
+    <rChild name="hgcalEE:HGCalEETelSilicon"/>
+    <Translation x="0*fm" y="0*fm" z="([zposTel3]-0.5*[thickSilicon])"/>
+  </PosPart>
+  <PosPart copyNumber="3">
+    <rParent name="hgcal:HGCal"/>
+    <rChild name="hgcalEE:HGCalEETelKapton"/>
+    <Translation x="0*fm" y="0*fm" z="([zposTel3]+0.5*[thickKapton])"/>
+  </PosPart>
+  <PosPart copyNumber="4">
+    <rParent name="hgcal:HGCal"/>
+    <rChild name="hgcalEE:HGCalEETelSilicon"/>
+    <Translation x="0*fm" y="0*fm" z="([zposTel4]-0.5*[thickSilicon])"/>
+  </PosPart>
+  <PosPart copyNumber="4">
+    <rParent name="hgcal:HGCal"/>
+    <rChild name="hgcalEE:HGCalEETelKapton"/>
+    <Translation x="0*fm" y="0*fm" z="([zposTel4]+0.5*[thickKapton])"/>
+  </PosPart>
+  <PosPart copyNumber="5">
+    <rParent name="hgcal:HGCal"/>
+    <rChild name="hgcalEE:HGCalEETelSilicon"/>
+    <Translation x="0*fm" y="0*fm" z="([zposTel5]-0.5*[thickSilicon])"/>
+  </PosPart>
+  <PosPart copyNumber="5">
+    <rParent name="hgcal:HGCal"/>
+    <rChild name="hgcalEE:HGCalEETelKapton"/>
+    <Translation x="0*fm" y="0*fm" z="([zposTel5]+0.5*[thickKapton])"/>
+  </PosPart>
+  <PosPart copyNumber="6">
+    <rParent name="hgcal:HGCal"/>
+    <rChild name="hgcalEE:HGCalEETelSilicon"/>
+    <Translation x="0*fm" y="0*fm" z="([zposTel6]-0.5*[thickSilicon])"/>
+  </PosPart>
+  <PosPart copyNumber="6">
+    <rParent name="hgcal:HGCal"/>
+    <rChild name="hgcalEE:HGCalEETelKapton"/>
+    <Translation x="0*fm" y="0*fm" z="([zposTel6]+0.5*[thickKapton])"/>
+  </PosPart>
+  <Algorithm name="hgcal:DDHGCalTBModule">
+    <rParent name="hgcal:HGCalEE1"/>
+    <Vector name="WaferName" type="string" nEntries="2">
+      hgcalwafer:HGCalEEWaferFine, hgcalwafer:HGCalEEWaferCoarse</Vector>
+    <Vector name="CoverName" type="string" nEntries="4">
+      hgcal:HGCalEEPCB, hgcal:HGCalEEKapton, hgcal:HGCalEEAbsorber,
+      hgcal:HGCalCuEEAbsorber</Vector>
+    <Vector name="MaterialNames" type="string" nEntries="5">
+      materials:Air, materials:Air,  materials:Air, 
+      materials:Air, materials:Air</Vector>
+    <Vector name="VolumeNames" type="string" nEntries="5">
+      EEPCB1,      EEKapton1,   EEShield1, 
+      EESensitive, EEBaseCu</Vector>
+    <Vector name="Thickness" type="numeric" nEntries="5">
+      [hgcal:thPCB], [hgcal:thKapton], [hgcal:thAbsEE],
+      0.10*mm,       [hgcal:thAbsCuEE]</Vector>
+    <Vector name="Layers" type="numeric" nEntries="1"> 
+      6</Vector>
+    <Vector name="LayerThick" type="numeric" nEntries="1"> 
+      3.06*mm</Vector>
+    <Vector name="LayerType" type="numeric" nEntries="6"> 
+      0, 3, 3, 3, 1, 4</Vector>
+    <Vector name="LayerSense" type="numeric" nEntries="6">
+      2, 1, 1, 1, 3, 5</Vector>
+    <Numeric name="firstCopy"   value="1"/>
+    <Numeric name="zMinBlock"   value="[hgcal:zminEE1]"/>
+    <Numeric name="rMaxFine"    value="[rMaxFine]"/>
+    <Numeric name="waferW"      value="[hgcal:WaferW]"/>
+    <Numeric name="waferGap"    value="0.0*fm"/>
+    <Numeric name="absorberW"   value="[hgcalEE:absorbW]"/>
+    <Numeric name="absorberH"   value="[hgcalEE:absorbH]"/>
+    <Numeric name="Sectors"     value="12"/>
+    <Vector name="SlopeBottom" type="numeric" nEntries="2">
+      0.0, 0.0</Vector>
+    <Vector name="SlopeTop" type="numeric" nEntries="2">
+      0, 0</Vector>
+    <Vector name="ZFront" type="numeric" nEntries="2">
+      [hgcal:zminEE1], [hgcal:zmaxEE2]</Vector>
+    <Vector name="RMaxFront" type="numeric" nEntries="2">
+      [hgcal:rmaxEE], [hgcal:rmaxEE]</Vector>
+    <String name="RotNameSpace" value="hgcalmodule"/>
+  </Algorithm>
+  <Algorithm name="hgcal:DDHGCalTBModule">
+    <rParent name="hgcal:HGCalEE2"/>
+    <Vector name="WaferName" type="string" nEntries="2">
+      hgcalwafer:HGCalEEWaferFine, hgcalwafer:HGCalEEWaferCoarse</Vector>
+    <Vector name="CoverName" type="string" nEntries="4">
+      hgcal:HGCalEEPCB, hgcal:HGCalEEKapton, hgcal:HGCalEEAbsorber,
+      hgcal:HGCalCuEEAbsorber</Vector>
+    <Vector name="MaterialNames" type="string" nEntries="5">
+      materials:Air, materials:Air, materials:Air, 
+      materials:Air, materials:Air</Vector>
+    <Vector name="VolumeNames" type="string" nEntries="5">
+      EEPCB1,      EEKapton1,   EEShield1, 
+      EESensitive, EEgap1</Vector>
+    <Vector name="Thickness" type="numeric" nEntries="5">
+      [hgcal:thPCB], [hgcal:thKapton], [hgcal:thAbsEE],
+      0.10*mm,       11.89*mm</Vector>
+    <Vector name="Layers" type="numeric" nEntries="2"> 
+      7, 6</Vector>
+    <Vector name="LayerThick" type="numeric" nEntries="2"> 
+      15.0*mm, 3.11*mm</Vector>
+    <Vector name="LayerType" type="numeric" nEntries="13"> 
+     2, 1, 3, 3, 3, 0, 4, 0, 3, 3, 3, 1, 2
+    </Vector>
+    <Vector name="LayerSense" type="numeric" nEntries="13">
+     4, 3, 1, 1, 1, 2, 0, 2, 1, 1, 1, 3, 4  
+    </Vector>
+    <Numeric name="firstCopy"   value="4"/>
+    <Numeric name="zMinBlock"   value="[hgcal:zminEE2]"/>
+    <Numeric name="rMaxFine"    value="[rMaxFine]"/>
+    <Numeric name="waferW"      value="[hgcal:WaferW]"/>
+    <Numeric name="waferGap"    value="0.0*fm"/>
+    <Numeric name="absorberW"   value="[hgcalEE:absorbW]"/>
+    <Numeric name="absorberH"   value="[hgcalEE:absorbH]"/>
+    <Numeric name="Sectors"     value="12"/>
+    <Vector name="SlopeBottom" type="numeric" nEntries="2">
+      0.0, 0.0</Vector>
+    <Vector name="SlopeTop" type="numeric" nEntries="2">
+      0, 0</Vector>
+    <Vector name="ZFront" type="numeric" nEntries="2">
+      [hgcal:zminEE1], [hgcal:zmaxEE2]</Vector>
+    <Vector name="RMaxFront" type="numeric" nEntries="2">
+      [hgcal:rmaxEE], [hgcal:rmaxEE]</Vector>
+    <String name="RotNameSpace" value="hgcalmodule"/>
+  </Algorithm>
+</PosPartSection> 
+
+<SpecParSection label="hgcalEE.xml" eval="true">
+  <SpecPar name="HGCalEE">
+    <PartSelector path="//HGCalEESensitive.*"/>    
+    <Parameter name="Volume" value="HGCalEESensitive" eval="false"/>
+    <Parameter name="GeometryMode" value="HGCalGeometryMode::Hexagon" eval="false"/>
+    <Parameter name="RadiusBound"  value="[rMinFine]"/>
+    <Parameter name="RadiusBound"  value="[rMaxFine]"/>
+    <Parameter name="RadiusBound"  value="[rMaxMiddle]"/>
+    <Parameter name="RadiusBound"  value="[rMaxCoarse]"/>
+    <Parameter name="RadiusLimits" value="[rMin]"/>
+    <Parameter name="RadiusLimits" value="[rMax]"/>
+    <Parameter name="LevelTop"     value="99"/>
+  </SpecPar>
+</SpecParSection>
+
+</DDDefinition>
diff --git a/Geometry/HGCalTBCommonData/data/TB180/hgcalsense.xml b/Geometry/HGCalTBCommonData/data/TB180/hgcalsense.xml
new file mode 100644
index 0000000000000..2f2587f5dbfaa
--- /dev/null
+++ b/Geometry/HGCalTBCommonData/data/TB180/hgcalsense.xml
@@ -0,0 +1,11 @@
+<?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">
+
+<SpecParSection label="hgcalsense.xml" eval="true">
+  <SpecPar name="hgcee">
+    <PartSelector path="//HGCalEECell.*"/>
+    <Parameter name="SensitiveDetector" value="HGCSensitiveDetector" eval="false"/>
+    <Parameter name="ReadOutName" value="HGCHitsEE" eval="false"/>
+  </SpecPar>
+</SpecParSection>
+</DDDefinition>
diff --git a/Geometry/HGCalTBCommonData/data/TB181/June18/hgcProdCuts.xml b/Geometry/HGCalTBCommonData/data/TB181/June18/hgcProdCuts.xml
new file mode 100644
index 0000000000000..ae42985283c4a
--- /dev/null
+++ b/Geometry/HGCalTBCommonData/data/TB181/June18/hgcProdCuts.xml
@@ -0,0 +1,15 @@
+<?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">
+
+<SpecParSection label="hgcProdCuts.xml" eval="true">
+  <SpecPar name="hgcProdCuts">
+    <PartSelector path="//HGCalEE"/>
+    <Parameter name="CMSCutsRegion" value="HGCalRegion" eval="false"/>
+    <Parameter name="ProdCutsForElectrons" value="0.03*mm"/>
+<Parameter name="ProdCutsForProtons" value="0.03*mm"/>
+    <Parameter name="ProdCutsForPositrons" value="0.03*mm"/>
+    <Parameter name="ProdCutsForGamma" value="0.03*mm"/>
+  </SpecPar>
+</SpecParSection>
+
+</DDDefinition>
diff --git a/Geometry/HGCalTBCommonData/data/TB181/June18/hgcal.xml b/Geometry/HGCalTBCommonData/data/TB181/June18/hgcal.xml
new file mode 100644
index 0000000000000..f3012f9c3f571
--- /dev/null
+++ b/Geometry/HGCalTBCommonData/data/TB181/June18/hgcal.xml
@@ -0,0 +1,135 @@
+<?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="rmin"       value="0.0*fm"/>
+  <Constant name="rmax"       value="50.0*cm"/>
+  <Constant name="zCaloFront" value="1069.8*cm"/>
+  <Constant name="rminEE"     value="0.0*fm"/>
+  <Constant name="rmaxEE"     value="8.0*cm"/>
+  <Constant name="rmaxEEF"    value="9.5*cm"/>
+  <Constant name="zminEE"     value="0.0*fm"/>
+  <Constant name="zmaxEE"     value="61*cm"/>
+  <Constant name="rminHE"     value="0.0*fm"/>
+  <Constant name="rmaxHE"     value="19.5*cm"/>
+  <Constant name="rmaxHEF"    value="26.5*cm"/>
+  <Constant name="zminHE"     value="0.0*fm"/>
+  <Constant name="zmaxHE"     value="88.2*cm"/>
+  <Constant name="rminAH"     value="0.0*fm"/>
+  <Constant name="rmaxAH"     value="30.0*cm"/>
+  <Constant name="zminAH"     value="0.0*fm"/>
+  <Constant name="zmaxAH"     value="92.2*cm"/>
+  <Constant name="zgapEEFH"   value="3.8*cm"/>
+  <Constant name="zgapFHBH"   value="3.0*cm"/>
+  <Constant name="zCalor"     value="([zmaxEE]+[zgapEEFH]+[zmaxHE]+[zgapFHBH]+
+				     [zmaxAH])/2.0"/>
+  <Constant name="zposCalo"   value="([zCaloFront]+[zCalor])"/>
+  <Constant name="zposEE"     value="-[zCalor]"/>
+  <Constant name="zposHE"     value="[zposEE]+[zmaxEE]+[zgapEEFH]"/>
+  <Constant name="zposAH"     value="[zposHE]+[zmaxHE]+[zgapFHBH]"/>
+  <Constant name="thPCB"      value="1.6*mm"/>
+  <Constant name="thKapton"   value="0.01*mm"/>
+  <Constant name="thAbsEE"    value="1.2*mm"/>
+  <Constant name="thAbsCuEE"  value="1.2*mm"/>
+  <Constant name="thAbsHE"    value="1.2*mm"/>
+  <Constant name="WaferW"     value="123.7*mm"/>
+  <Constant name="tan30deg"   value="tan(30.0*deg)"/>
+</ConstantsSection>
+
+<SolidSection label="hgcal.xml">
+  <Tubs name="HGCal" rMin="[rmin]" rMax="[rmax]" dz="[zCalor]" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Polycone name="HGCalEE" startPhi="0*deg" deltaPhi="360*deg">
+    <ZSection z="[zminEE]" rMin="[rminEE]" rMax="[rmaxEEF]"/>
+    <ZSection z="[zmaxEE]" rMin="[rminEE]" rMax="[rmaxEEF]"/>
+  </Polycone>
+  <Polycone name="HGCalHE" startPhi="0*deg" deltaPhi="360*deg">
+    <ZSection z="[zminHE]" rMin="[rminHE]" rMax="[rmaxHEF]"/>
+    <ZSection z="[zmaxHE]" rMin="[rminHE]" rMax="[rmaxHEF]"/>
+  </Polycone>
+  <Polycone name="HGCalAH" startPhi="0*deg" deltaPhi="360*deg">
+    <ZSection z="[zminAH]" rMin="[rminAH]" rMax="[rmaxAH]"/>
+    <ZSection z="[zmaxAH]" rMin="[rminAH]" rMax="[rmaxAH]"/>
+  </Polycone>
+  <Polyhedra name="HGCalPCB" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thPCB]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thPCB]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+  <Polyhedra name="HGCalKapton" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thKapton]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thKapton]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+  <Polyhedra name="HGCalEEAbs" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thAbsEE]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thAbsEE]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+  <Polyhedra name="HGCalEECuAbs" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thAbsEE]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thAbsEE]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+  <Polyhedra name="HGCalHEAbs" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thAbsHE]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thAbsHE]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+</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>
+  <LogicalPart name="HGCalAH" category="unspecified">
+    <rSolid name="HGCalAH"/>
+    <rMaterial name="materials:Air"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalEEPCB" category="unspecified">
+    <rSolid name="HGCalPCB"/>
+    <rMaterial name="materials:G10"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalHEPCB" category="unspecified">
+    <rSolid name="HGCalPCB"/>
+    <rMaterial name="materials:G10"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalEEKapton" category="unspecified">
+    <rSolid name="HGCalKapton"/>
+    <rMaterial name="materials:Kapton"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalHEKapton" category="unspecified">
+    <rSolid name="HGCalKapton"/>
+    <rMaterial name="materials:Kapton"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalEEAbsorber" category="unspecified">
+    <rSolid name="HGCalEEAbs"/>
+    <rMaterial name="hgcalMaterial:WCu"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalEECuAbsorber" category="unspecified">
+    <rSolid name="HGCalEECuAbs"/>
+    <rMaterial name="materials:Copper"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalHEAbsorber" category="unspecified">
+    <rSolid name="HGCalHEAbs"/>
+    <rMaterial name="materials:Copper"/>
+  </LogicalPart>
+</LogicalPartSection>
+
+<PosPartSection label="hgcal.xml">
+  <PosPart copyNumber="1">
+    <rParent name="cms:CMSE"/>
+    <rChild name="hgcal:HGCal"/>
+    <Translation x="0*fm" y="0*fm" z="[zposCalo]"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcal:HGCal"/>
+    <rChild name="hgcal:HGCalEE"/>
+    <Translation x="0*fm" y="0*fm" z="[zposEE]"/>
+    <rRotation name="rotations:R090"/>
+  </PosPart>
+</PosPartSection>
+</DDDefinition>
diff --git a/Geometry/HGCalTBCommonData/data/TB181/June18/hgcalBeam.xml b/Geometry/HGCalTBCommonData/data/TB181/June18/hgcalBeam.xml
new file mode 100644
index 0000000000000..cfc7105ca6e74
--- /dev/null
+++ b/Geometry/HGCalTBCommonData/data/TB181/June18/hgcalBeam.xml
@@ -0,0 +1,431 @@
+<?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="hgcalBeam.xml" eval="true">
+  <Constant name="upstreamDxby2" value="100.0*cm"/>
+  <Constant name="upstreamDyby2" value="100.0*cm"/>
+  <Constant name="upstreamDzby2" value="400.0*cm"/>
+  <Constant name="upstreamZ" value="-400.0*cm"/>
+  <Constant name="tol" value="0.0*mm"/>
+  <Constant name="chambDxby2" value="11.0*cm"/>
+  <Constant name="chambAlT" value="5.0*mm"/>
+  <Constant name="chambKapW" value="11.0*cm"/>
+  <Constant name="chambKapT" value="0.025*mm"/>
+  <Constant name="chambVetW" value="25.0*mm"/>
+  <Constant name="chambVetT" value="5.0*mm"/>
+  <Constant name="chambVetGap" value="12.0*cm"/>
+  <Constant name="chambVetL" value="0.5*([chambVetGap]+[chambVetW])"/>
+  <Constant name="chambVetX" value="0.5*[chambVetW]"/>
+  <Constant name="chambVetZ" value="20.0*mm"/>
+  <Constant name="chambGasGap" value="([chambVetZ]+0.5*[chambVetT]+[tol])"/>
+  <Constant name="chambGasW" value="([chambVetW]+0.5*[chambVetGap]+[tol])"/>
+  <Constant name="chambDzby2" value="([chambGasGap]+[chambAlT]+2*[tol])"/>
+  <Constant name="chambAl1L" value="0.5*([chambDxby2]+0.5*[chambKapW])"/>
+  <Constant name="chambAl1W" value="0.5*([chambDxby2]-0.5*[chambKapW])"/>
+  <Constant name="chambAl1X" value="([chambDxby2]-[chambAl1L])"/>
+  <Constant name="chambAl1Y" value="([chambDxby2]-[chambAl1W])"/>
+  <Constant name="chambAl1Z" value="([chambGasGap]+0.5*[chambAlT]+[tol])"/>
+  <Constant name="chambAl2L" value="([chambDxby2]-0.5*[chambAlT])"/>
+  <Constant name="chambAl2X" value="([chambDxby2]-[chambAl2L])"/>
+  <Constant name="chambAl2Y" value="([chambDxby2]-0.5*[chambAlT])"/>
+  <Constant name="chamb1Z" value="-507.6*cm"/>
+  <Constant name="chamb2Z" value="-400.3*cm"/>
+  <Constant name="chamb3Z" value="-200.5*cm"/>
+  <Constant name="s1Dxby2" value="7.0*cm"/>
+  <Constant name="s1Dzby2" value="5.0*mm"/>
+  <Constant name="s1Z" value="-375.4*cm"/>
+  <Constant name="s2Dxby2" value="2.0*cm"/>
+  <Constant name="s2Dzby2" value="5.0*mm"/>
+  <Constant name="s2Z" value="-360.5*cm"/>
+  <Constant name="s3Dxby2" value="1.0*cm"/>
+  <Constant name="s3Dzby2" value="5.0*mm"/>
+  <Constant name="s3Z" value="-345.6*cm"/>
+  <Constant name="s4Z" value="-240.8*cm"/>
+  <Constant name="bhDxby2" value="50.0*cm"/>
+  <Constant name="bhDyby2" value="15.0*cm"/>
+  <Constant name="bhDzby2" value="0.5*cm"/>
+  <Constant name="bhGap" value="7.5*cm"/>
+  <Constant name="bhX" value="([bhDxby2]-0.5*[bhGap])"/>
+  <Constant name="bhY" value="([bhDyby2]+0.5*[bhGap])"/>
+  <Constant name="bhZ1" value="-229.3*cm"/>
+  <Constant name="bhZ2" value="-221.3*cm"/>
+  <Constant name="ck3Rad" value="8.35*cm"/>
+  <Constant name="ck3L" value="200.0*cm"/>
+  <Constant name="ck3Z" value="-569.0*cm"/>
+  <Constant name="downstreamDxby2" value="50.0*cm"/>
+  <Constant name="downstreamDyby2" value="50.0*cm"/>
+  <Constant name="downstreamDzby2" value="100.0*cm"/>
+  <Constant name="downstreamZ" value="900.0*cm"/>
+  <Constant name="chamb4Z" value="840.8*cm"/>
+  <Constant name="chamb5Z" value="966.8*cm"/>
+  <Constant name="mcDxby2" value="40.0*cm"/>
+  <Constant name="mcDzby2" value="20.0*mm"/>
+  <Constant name="mc1Z" value="892.8*cm"/>
+  <Constant name="mc2Z" value="984.8*cm"/>
+  <Constant name="s5Dxby2" value="9.5*cm"/>
+  <Constant name="s5Dzby2" value="2.0*cm"/>
+  <Constant name="s5Z"     value="([hgcal:zCaloFront]-[s5Dzby2])"/>
+</ConstantsSection>
+
+<SolidSection label="hgcalBeam.xml">
+  <Box name="HGCalBeam" dx="[upstreamDxby2]" dy="[upstreamDyby2]" dz="[upstreamDzby2]"/>
+  <Box name="HGCalBeamWChamb" dx="[chambDxby2]" dy="[chambDxby2]" dz="[chambDzby2]"/>
+  <Box name="HGCalBeamWChambGas" dx="[chambGasW]" dy="[chambGasW]" dz="[chambGasGap]"/>
+  <Box name="HGCalBeamWChambVet" dx="[chambVetL]" dy="[chambVetW]/2" dz="[chambVetT]/2"/>
+  <Box name="HGCalBeamWChambWindow" dx="[chambKapW]/2" dy="[chambKapW]/2" dz="[chambKapT]/2"/>
+  <Box name="HGCalBeamWChambAl1" dx="[chambAl1L]" dy="[chambAl1W]" dz="[chambAlT]/2"/>
+  <Box name="HGCalBeamWChambAl2" dx="[chambAl2L]" dy="[chambAlT]/2" dz="[chambGasGap]"/>
+  <Box name="HGCalBeamS1" dx="[s1Dxby2]" dy="[s1Dxby2]" dz="[s1Dzby2]"/>
+  <Box name="HGCalBeamS2" dx="[s2Dxby2]" dy="[s2Dxby2]" dz="[s2Dzby2]"/>
+  <Box name="HGCalBeamS3" dx="[s3Dxby2]" dy="[s3Dxby2]" dz="[s3Dzby2]"/>
+  <Box name="HGCalBeamS4" dx="[s1Dxby2]" dy="[s1Dxby2]" dz="[s1Dzby2]"/>
+  <Box name="HGCalBeamS5" dx="[s5Dxby2]" dy="[s5Dxby2]" dz="[s5Dzby2]"/>
+  <Box name="HGCalBeamHaloCounter" dx="[bhDxby2]" dy="[bhDyby2]" dz="[bhDzby2]"/>
+  <Tubs name="HGCalBeamCK3" rMin="0*fm" rMax="[ck3Rad]" dz="[ck3L]/2" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Box name="HGCalBeamDown" dx="[downstreamDxby2]" dy="[downstreamDyby2]" dz="[downstreamDzby2]"/>
+  <Box name="HGCalBeamMuonCounter" dx="[mcDxby2]" dy="[mcDxby2]" dz="[mcDzby2]"/>
+</SolidSection>
+
+<LogicalPartSection label="hgcalBeam.xml">
+  <LogicalPart name="HGCalBeam" category="unspecified">
+    <rSolid name="HGCalBeam"/>
+    <rMaterial name="materials:Air"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamWChamb" category="unspecified">
+    <rSolid name="HGCalBeamWChamb"/>
+    <rMaterial name="materials:Air"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamWChambGas" category="unspecified">
+    <rSolid name="HGCalBeamWChambGas"/>
+    <rMaterial name="materials:Ar 50pct plus CO_2 50pct"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamWChambVet" category="unspecified">
+    <rSolid name="HGCalBeamWChambVet"/>
+    <rMaterial name="materials:Polyethylene"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamWChambWindow" category="unspecified">
+    <rSolid name="HGCalBeamWChambWindow"/>
+    <rMaterial name="materials:Kapton"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamWChambAl1" category="unspecified">
+    <rSolid name="HGCalBeamWChambAl1"/>
+    <rMaterial name="materials:Aluminium"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamWChambAl2" category="unspecified">
+    <rSolid name="HGCalBeamWChambAl2"/>
+    <rMaterial name="materials:Aluminium"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamS1" category="unspecified">
+    <rSolid name="HGCalBeamS1"/>
+    <rMaterial name="materials:Scintillator"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamS2" category="unspecified">
+    <rSolid name="HGCalBeamS2"/>
+    <rMaterial name="materials:Scintillator"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamS3" category="unspecified">
+    <rSolid name="HGCalBeamS3"/>
+    <rMaterial name="materials:Scintillator"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamS4" category="unspecified">
+    <rSolid name="HGCalBeamS4"/>
+    <rMaterial name="materials:Scintillator"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamS5" category="unspecified">
+    <rSolid name="HGCalBeamS5"/>
+    <rMaterial name="materials:Scintillator"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamHaloCounter" category="unspecified">
+    <rSolid name="HGCalBeamHaloCounter"/>
+    <rMaterial name="materials:Scintillator"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamCK3" category="unspecified">
+    <rSolid name="HGCalBeamCK3"/>
+    <rMaterial name="materials:Freon-12"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamDown" category="unspecified">
+    <rSolid name="HGCalBeamDown"/>
+    <rMaterial name="materials:Air"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamMuonCounter" category="unspecified">
+    <rSolid name="HGCalBeamMuonCounter"/>
+    <rMaterial name="materials:Scintillator"/>
+  </LogicalPart>
+</LogicalPartSection>
+
+<RotationSection label="hgcalBeam.xml">
+  <Rotation name="R1" phiX="90*deg" thetaX="90*deg" phiY="180*deg" thetaY="90*deg" phiZ="0*deg" thetaZ="0*deg"/>
+</RotationSection>
+
+<PosPartSection label="hgcalBeam.xml">
+  <PosPart copyNumber="1">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambGas"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl1"/>
+    <Translation x="[chambAl1X]" y="[chambAl1Y]" z="[chambAl1Z]"/>
+  </PosPart>
+  <PosPart copyNumber="2">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl1"/>
+    <Translation x="-[chambAl1Y]" y="[chambAl1X]" z="[chambAl1Z]"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="3">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl1"/>
+    <Translation x="-[chambAl1X]" y="-[chambAl1Y]" z="[chambAl1Z]"/>
+  </PosPart>
+  <PosPart copyNumber="4">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl1"/>
+    <Translation x="[chambAl1Y]" y="-[chambAl1X]" z="[chambAl1Z]"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="5">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl1"/>
+    <Translation x="[chambAl1X]" y="[chambAl1Y]" z="-[chambAl1Z]"/>
+  </PosPart>
+  <PosPart copyNumber="6">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl1"/>
+    <Translation x="-[chambAl1Y]" y="[chambAl1X]" z="-[chambAl1Z]"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="7">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl1"/>
+    <Translation x="-[chambAl1X]" y="-[chambAl1Y]" z="-[chambAl1Z]"/>
+  </PosPart>
+  <PosPart copyNumber="8">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl1"/>
+    <Translation x="[chambAl1Y]" y="-[chambAl1X]" z="-[chambAl1Z]"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl2"/>
+    <Translation x="[chambAl2X]" y="[chambAl2Y]" z="0*fm"/>
+  </PosPart>
+  <PosPart copyNumber="2">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl2"/>
+    <Translation x="-[chambAl2Y]" y="[chambAl2X]" z="0*fm"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="3">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl2"/>
+    <Translation x="-[chambAl2X]" y="-[chambAl2Y]" z="0*fm"/>
+  </PosPart>
+  <PosPart copyNumber="4">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl2"/>
+    <Translation x="[chambAl2Y]" y="-[chambAl2X]" z="0*fm"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambWindow"/>
+    <Translation x="0*fm" y="0*fm" z="([chambDzby2]-0.5*[chambKapT])"/>
+  </PosPart>
+  <PosPart copyNumber="2">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambWindow"/>
+    <Translation x="0*fm" y="0*fm" z="-([chambDzby2]-0.5*[chambKapT])"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="[chambVetX]" y="[chambVetL]" z="[chambVetZ]"/>
+  </PosPart>
+  <PosPart copyNumber="2">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="-[chambVetL]" y="[chambVetX]" z="[chambVetZ]"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="3">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="-[chambVetX]" y="-[chambVetL]" z="[chambVetZ]"/>
+  </PosPart>
+  <PosPart copyNumber="4">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="[chambVetL]" y="-[chambVetX]" z="[chambVetZ]"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="5">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="[chambVetX]" y="[chambVetL]" z="0*fm"/>
+  </PosPart>
+  <PosPart copyNumber="6">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="-[chambVetL]" y="[chambVetX]" z="0*fm"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="7">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="-[chambVetX]" y="-[chambVetL]" z="0*fm"/>
+  </PosPart>
+  <PosPart copyNumber="8">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="[chambVetL]" y="-[chambVetX]" z="0*fm"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="9">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="[chambVetX]" y="[chambVetL]" z="-[chambVetZ]"/>
+  </PosPart>
+  <PosPart copyNumber="10">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="-[chambVetL]" y="[chambVetX]" z="-[chambVetZ]"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="11">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="-[chambVetX]" y="-[chambVetL]" z="-[chambVetZ]"/>
+  </PosPart>
+  <PosPart copyNumber="12">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="[chambVetL]" y="-[chambVetX]" z="-[chambVetZ]"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamWChamb"/>
+    <Translation x="0*fm" y="0*fm" z="([chamb1Z]-[upstreamZ]-[chambDzby2])"/>
+  </PosPart>
+  <PosPart copyNumber="2">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamWChamb"/>
+    <Translation x="0*fm" y="0*fm" z="([chamb2Z]-[upstreamZ]-[chambDzby2])"/>
+  </PosPart>
+  <PosPart copyNumber="3">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamWChamb"/>
+    <Translation x="0*fm" y="0*fm" z="([chamb3Z]-[upstreamZ]-[chambDzby2])"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamS1"/>
+    <Translation x="0*fm" y="0*fm" z="([s1Z]-[upstreamZ]-[s1Dzby2])"/>
+  </PosPart>
+  <PosPart copyNumber="2">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamS2"/>
+    <Translation x="0*fm" y="0*fm" z="([s2Z]-[upstreamZ]-[s2Dzby2])"/>
+  </PosPart>
+  <PosPart copyNumber="3">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamS3"/>
+    <Translation x="0*fm" y="0*fm" z="([s3Z]-[upstreamZ]-[s3Dzby2])"/>
+  </PosPart>
+  <PosPart copyNumber="4">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamS4"/>
+    <Translation x="0*fm" y="0*fm" z="([s4Z]-[upstreamZ]-[s1Dzby2])"/>
+  </PosPart>
+  <PosPart copyNumber="11">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamHaloCounter"/>
+    <Translation x="0*fm" y="[bhY]" z="([bhZ2]+[bhDzby2]-[upstreamZ])"/>
+  </PosPart>
+  <PosPart copyNumber="12">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamHaloCounter"/>
+    <Translation x="0*fm" y="-[bhY]" z="([bhZ2]+[bhDzby2]-[upstreamZ])"/>
+  </PosPart>
+  <PosPart copyNumber="13">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamHaloCounter"/>
+    <Translation x="-[bhY]" y="0*fm" z="([bhZ1]+[bhDzby2]-[upstreamZ])"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="14">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamHaloCounter"/>
+    <Translation x="[bhY]" y="0*fm" z="([bhZ1]+[bhDzby2]-[upstreamZ])"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="0">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamCK3"/>
+    <Translation x="0*fm" y="0*fm" z="([ck3Z]-[upstreamZ]-0.5*[ck3L])"/>
+  </PosPart>
+  <PosPart copyNumber="4">
+    <rParent name="hgcalBeam:HGCalBeamDown"/>
+    <rChild name="hgcalBeam:HGCalBeamWChamb"/>
+    <Translation x="0*fm" y="0*fm" z="([chamb4Z]-[downstreamZ]-[chambDzby2])"/>
+  </PosPart>
+  <PosPart copyNumber="5">
+    <rParent name="hgcalBeam:HGCalBeamDown"/>
+    <rChild name="hgcalBeam:HGCalBeamWChamb"/>
+    <Translation x="0*fm" y="0*fm" z="([chamb5Z]-[downstreamZ]-[chambDzby2])"/>
+  </PosPart>
+  <PosPart copyNumber="7">
+    <rParent name="hgcalBeam:HGCalBeamDown"/>
+    <rChild name="hgcalBeam:HGCalBeamMuonCounter"/>
+    <Translation x="0*fm" y="0*fm" z="([mc1Z]-[downstreamZ]-[mcDzby2])"/>
+  </PosPart>
+  <PosPart copyNumber="8">
+    <rParent name="hgcalBeam:HGCalBeamDown"/>
+    <rChild name="hgcalBeam:HGCalBeamMuonCounter"/>
+    <Translation x="0*fm" y="0*fm" z="([mc2Z]-[downstreamZ]-[mcDzby2])"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="cms:CMSE"/>
+    <rChild name="hgcalBeam:HGCalBeam"/>
+    <Translation x="0*fm" y="0*fm" z="[upstreamZ]"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="cms:CMSE"/>
+    <rChild name="hgcalBeam:HGCalBeamDown"/>
+    <Translation x="0*fm" y="0*fm" z="[downstreamZ]"/>
+  </PosPart>
+  <PosPart copyNumber="5">
+    <rParent name="cms:CMSE"/>
+    <rChild name="hgcalBeam:HGCalBeamS5"/>
+    <Translation x="0*fm" y="0*fm" z="[s5Z]"/>
+  </PosPart>
+</PosPartSection>
+
+<SpecParSection label="hgcalBeam.xml" eval="true">
+  <SpecPar name="hgcalbeam">
+    <PartSelector path="//HGCalBeamS.*"/>
+    <PartSelector path="//HGCalBeamHaloCounter"/>
+    <PartSelector path="//HGCalBeamMuonCounter"/>
+    <PartSelector path="//HGCalBeamCK3"/>
+    <PartSelector path="//HGCalBeamWChambGas"/>
+    <Parameter name="SensitiveDetector" value="HcalTB06BeamDetector" eval="false"/>
+    <Parameter name="ReadOutName" value="HcalTB06BeamHits" eval="false"/>
+  </SpecPar>
+  <SpecPar name="hgcalbeamWC">
+    <PartSelector path="//HGCalBeamWChambGas"/>
+    <Parameter name="Volume" value="WireChamber" eval="false"/>
+  </SpecPar>
+  <SpecPar name="hgcProdCutsBeam">
+    <PartSelector path="//HGCalBeam"/>
+    <PartSelector path="//HGCalBeamDown"/>
+    <Parameter name="CMSCutsRegion" value="HGCalBeamRegion" eval="false"/>
+    <Parameter name="ProdCutsForElectrons" value="1.0*mm"/>
+<Parameter name="ProdCutsForProtons" value="1.0*mm"/>
+    <Parameter name="ProdCutsForPositrons" value="1.0*mm"/>
+    <Parameter name="ProdCutsForGamma"     value="1.0*mm"/>
+  </SpecPar>
+</SpecParSection>
+
+</DDDefinition>
diff --git a/Geometry/HGCalTBCommonData/data/TB181/June18/hgcalCons.xml b/Geometry/HGCalTBCommonData/data/TB181/June18/hgcalCons.xml
new file mode 100644
index 0000000000000..ba51916be6f54
--- /dev/null
+++ b/Geometry/HGCalTBCommonData/data/TB181/June18/hgcalCons.xml
@@ -0,0 +1,276 @@
+<?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">
+
+<SpecParSection label="hgcalReco.xml" eval="true">
+  <SpecPar name="HGCalEEWafer">
+    <PartSelector path="//HGCalEEWafer.*"/>
+    <Parameter name="Volume" value="HGCalEEWafer" eval="false"/>
+    <Parameter name="WaferSize"      value="[hgcal:WaferW]"/>
+  </SpecPar>
+  <SpecPar name="HGCalEECell">
+    <PartSelector path="//HGCalEECell.*"/>
+    <Parameter name="Volume" value="HGCalEECell" eval="false"/>
+    <Parameter name="CellSize"      value="[hgcalwafer:CellWF]"/>
+    <Parameter name="CellSize"      value="[hgcalwafer:CellWC]"/>
+  </SpecPar>
+  <SpecPar name="HGCalEESensitive">
+    <PartSelector path="//HGCalEESensitive.*"/>
+    <Parameter name="Volume" value="HGCalEESensitive" eval="false"/>
+    <Parameter name="Slope"  value="0.0"/>
+    <Parameter name="GroupingZFine"  value="1"/>
+    <Parameter name="GroupingZFine"  value="1"/>
+    <Parameter name="GroupingZFine"  value="1"/>
+    <Parameter name="GroupingZFine"  value="2"/>
+    <Parameter name="GroupingZFine"  value="2"/>
+    <Parameter name="GroupingZFine"  value="2"/>
+    <Parameter name="GroupingZFine"  value="3"/>
+    <Parameter name="GroupingZFine"  value="3"/>
+    <Parameter name="GroupingZFine"  value="3"/>
+    <Parameter name="GroupingZFine"  value="4"/>
+    <Parameter name="GroupingZFine"  value="4"/>
+    <Parameter name="GroupingZFine"  value="4"/>
+    <Parameter name="GroupingZFine"  value="5"/>
+    <Parameter name="GroupingZFine"  value="5"/>
+    <Parameter name="GroupingZFine"  value="5"/>
+    <Parameter name="GroupingZFine"  value="6"/>
+    <Parameter name="GroupingZFine"  value="6"/>
+    <Parameter name="GroupingZFine"  value="6"/>
+    <Parameter name="GroupingZFine"  value="7"/>
+    <Parameter name="GroupingZFine"  value="7"/>
+    <Parameter name="GroupingZFine"  value="7"/>
+    <Parameter name="GroupingZFine"  value="8"/>
+    <Parameter name="GroupingZFine"  value="8"/>
+    <Parameter name="GroupingZFine"  value="8"/>
+    <Parameter name="GroupingZFine"  value="9"/>
+    <Parameter name="GroupingZFine"  value="9"/>
+    <Parameter name="GroupingZFine"  value="9"/>
+    <Parameter name="GroupingZFine"  value="10"/>
+    <Parameter name="GroupingZFine"  value="10"/>
+    <Parameter name="GroupingZFine"  value="10"/>
+    <Parameter name="GroupingZFine"  value="11"/>
+    <Parameter name="GroupingZFine"  value="11"/>
+    <Parameter name="GroupingZFine"  value="11"/>
+    <Parameter name="GroupingZFine"  value="12"/>
+    <Parameter name="GroupingZFine"  value="12"/>
+    <Parameter name="GroupingZFine"  value="12"/>
+    <Parameter name="GroupingZFine"  value="13"/>
+    <Parameter name="GroupingZFine"  value="13"/>
+    <Parameter name="GroupingZFine"  value="13"/>
+    <Parameter name="GroupingZFine"  value="14"/>
+    <Parameter name="GroupingZFine"  value="14"/>
+    <Parameter name="GroupingZFine"  value="14"/>
+    <Parameter name="GroupingZFine"  value="15"/>
+    <Parameter name="GroupingZFine"  value="15"/>
+    <Parameter name="GroupingZFine"  value="15"/>
+    <Parameter name="GroupingZFine"  value="16"/>
+    <Parameter name="GroupingZFine"  value="16"/>
+    <Parameter name="GroupingZFine"  value="16"/>
+    <Parameter name="GroupingZFine"  value="17"/>
+    <Parameter name="GroupingZFine"  value="17"/>
+    <Parameter name="GroupingZFine"  value="17"/>
+    <Parameter name="GroupingZFine"  value="18"/>
+    <Parameter name="GroupingZFine"  value="18"/>
+    <Parameter name="GroupingZFine"  value="18"/>
+    <Parameter name="GroupingZFine"  value="19"/>
+    <Parameter name="GroupingZFine"  value="19"/>
+    <Parameter name="GroupingZFine"  value="19"/>
+    <Parameter name="GroupingZFine"  value="20"/>
+    <Parameter name="GroupingZFine"  value="20"/>
+    <Parameter name="GroupingZFine"  value="20"/>
+    <Parameter name="GroupingZFine"  value="21"/>
+    <Parameter name="GroupingZFine"  value="21"/>
+    <Parameter name="GroupingZFine"  value="21"/>
+    <Parameter name="GroupingZFine"  value="22"/>
+    <Parameter name="GroupingZFine"  value="22"/>
+    <Parameter name="GroupingZFine"  value="22"/>
+    <Parameter name="GroupingZFine"  value="23"/>
+    <Parameter name="GroupingZFine"  value="23"/>
+    <Parameter name="GroupingZFine"  value="23"/>
+    <Parameter name="GroupingZFine"  value="24"/>
+    <Parameter name="GroupingZFine"  value="24"/>
+    <Parameter name="GroupingZFine"  value="24"/>
+    <Parameter name="GroupingZFine"  value="25"/>
+    <Parameter name="GroupingZFine"  value="25"/>
+    <Parameter name="GroupingZFine"  value="25"/>
+    <Parameter name="GroupingZFine"  value="26"/>
+    <Parameter name="GroupingZFine"  value="26"/>
+    <Parameter name="GroupingZFine"  value="26"/>
+    <Parameter name="GroupingZFine"  value="27"/>
+    <Parameter name="GroupingZFine"  value="27"/>
+    <Parameter name="GroupingZFine"  value="27"/>
+    <Parameter name="GroupingZFine"  value="28"/>
+    <Parameter name="GroupingZFine"  value="28"/>
+    <Parameter name="GroupingZFine"  value="28"/>
+    <Parameter name="GroupingZMid"  value="1"/>
+    <Parameter name="GroupingZMid"  value="1"/>
+    <Parameter name="GroupingZMid"  value="1"/>
+    <Parameter name="GroupingZMid"  value="2"/>
+    <Parameter name="GroupingZMid"  value="2"/>
+    <Parameter name="GroupingZMid"  value="2"/>
+    <Parameter name="GroupingZMid"  value="3"/>
+    <Parameter name="GroupingZMid"  value="3"/>
+    <Parameter name="GroupingZMid"  value="3"/>
+    <Parameter name="GroupingZMid"  value="4"/>
+    <Parameter name="GroupingZMid"  value="4"/>
+    <Parameter name="GroupingZMid"  value="4"/>
+    <Parameter name="GroupingZMid"  value="5"/>
+    <Parameter name="GroupingZMid"  value="5"/>
+    <Parameter name="GroupingZMid"  value="5"/>
+    <Parameter name="GroupingZMid"  value="6"/>
+    <Parameter name="GroupingZMid"  value="6"/>
+    <Parameter name="GroupingZMid"  value="6"/>
+    <Parameter name="GroupingZMid"  value="7"/>
+    <Parameter name="GroupingZMid"  value="7"/>
+    <Parameter name="GroupingZMid"  value="7"/>
+    <Parameter name="GroupingZMid"  value="8"/>
+    <Parameter name="GroupingZMid"  value="8"/>
+    <Parameter name="GroupingZMid"  value="8"/>
+    <Parameter name="GroupingZMid"  value="9"/>
+    <Parameter name="GroupingZMid"  value="9"/>
+    <Parameter name="GroupingZMid"  value="9"/>
+    <Parameter name="GroupingZMid"  value="10"/>
+    <Parameter name="GroupingZMid"  value="10"/>
+    <Parameter name="GroupingZMid"  value="10"/>
+    <Parameter name="GroupingZMid"  value="11"/>
+    <Parameter name="GroupingZMid"  value="11"/>
+    <Parameter name="GroupingZMid"  value="11"/>
+    <Parameter name="GroupingZMid"  value="12"/>
+    <Parameter name="GroupingZMid"  value="12"/>
+    <Parameter name="GroupingZMid"  value="12"/>
+    <Parameter name="GroupingZMid"  value="13"/>
+    <Parameter name="GroupingZMid"  value="13"/>
+    <Parameter name="GroupingZMid"  value="13"/>
+    <Parameter name="GroupingZMid"  value="14"/>
+    <Parameter name="GroupingZMid"  value="14"/>
+    <Parameter name="GroupingZMid"  value="14"/>
+    <Parameter name="GroupingZMid"  value="15"/>
+    <Parameter name="GroupingZMid"  value="15"/>
+    <Parameter name="GroupingZMid"  value="15"/>
+    <Parameter name="GroupingZMid"  value="16"/>
+    <Parameter name="GroupingZMid"  value="16"/>
+    <Parameter name="GroupingZMid"  value="16"/>
+    <Parameter name="GroupingZMid"  value="17"/>
+    <Parameter name="GroupingZMid"  value="17"/>
+    <Parameter name="GroupingZMid"  value="17"/>
+    <Parameter name="GroupingZMid"  value="18"/>
+    <Parameter name="GroupingZMid"  value="18"/>
+    <Parameter name="GroupingZMid"  value="18"/>
+    <Parameter name="GroupingZMid"  value="19"/>
+    <Parameter name="GroupingZMid"  value="19"/>
+    <Parameter name="GroupingZMid"  value="19"/>
+    <Parameter name="GroupingZMid"  value="20"/>
+    <Parameter name="GroupingZMid"  value="20"/>
+    <Parameter name="GroupingZMid"  value="20"/>
+    <Parameter name="GroupingZMid"  value="21"/>
+    <Parameter name="GroupingZMid"  value="21"/>
+    <Parameter name="GroupingZMid"  value="21"/>
+    <Parameter name="GroupingZMid"  value="22"/>
+    <Parameter name="GroupingZMid"  value="22"/>
+    <Parameter name="GroupingZMid"  value="22"/>
+    <Parameter name="GroupingZMid"  value="23"/>
+    <Parameter name="GroupingZMid"  value="23"/>
+    <Parameter name="GroupingZMid"  value="23"/>
+    <Parameter name="GroupingZMid"  value="24"/>
+    <Parameter name="GroupingZMid"  value="24"/>
+    <Parameter name="GroupingZMid"  value="24"/>
+    <Parameter name="GroupingZMid"  value="25"/>
+    <Parameter name="GroupingZMid"  value="25"/>
+    <Parameter name="GroupingZMid"  value="25"/>
+    <Parameter name="GroupingZMid"  value="26"/>
+    <Parameter name="GroupingZMid"  value="26"/>
+    <Parameter name="GroupingZMid"  value="26"/>
+    <Parameter name="GroupingZMid"  value="27"/>
+    <Parameter name="GroupingZMid"  value="27"/>
+    <Parameter name="GroupingZMid"  value="27"/>
+    <Parameter name="GroupingZMid"  value="28"/>
+    <Parameter name="GroupingZMid"  value="28"/>
+    <Parameter name="GroupingZMid"  value="28"/>
+    <Parameter name="GroupingZOut"  value="1"/>
+    <Parameter name="GroupingZOut"  value="1"/>
+    <Parameter name="GroupingZOut"  value="1"/>
+    <Parameter name="GroupingZOut"  value="2"/>
+    <Parameter name="GroupingZOut"  value="2"/>
+    <Parameter name="GroupingZOut"  value="2"/>
+    <Parameter name="GroupingZOut"  value="3"/>
+    <Parameter name="GroupingZOut"  value="3"/>
+    <Parameter name="GroupingZOut"  value="3"/>
+    <Parameter name="GroupingZOut"  value="4"/>
+    <Parameter name="GroupingZOut"  value="4"/>
+    <Parameter name="GroupingZOut"  value="4"/>
+    <Parameter name="GroupingZOut"  value="5"/>
+    <Parameter name="GroupingZOut"  value="5"/>
+    <Parameter name="GroupingZOut"  value="5"/>
+    <Parameter name="GroupingZOut"  value="6"/>
+    <Parameter name="GroupingZOut"  value="6"/>
+    <Parameter name="GroupingZOut"  value="6"/>
+    <Parameter name="GroupingZOut"  value="7"/>
+    <Parameter name="GroupingZOut"  value="7"/>
+    <Parameter name="GroupingZOut"  value="7"/>
+    <Parameter name="GroupingZOut"  value="8"/>
+    <Parameter name="GroupingZOut"  value="8"/>
+    <Parameter name="GroupingZOut"  value="8"/>
+    <Parameter name="GroupingZOut"  value="9"/>
+    <Parameter name="GroupingZOut"  value="9"/>
+    <Parameter name="GroupingZOut"  value="9"/>
+    <Parameter name="GroupingZOut"  value="10"/>
+    <Parameter name="GroupingZOut"  value="10"/>
+    <Parameter name="GroupingZOut"  value="10"/>
+    <Parameter name="GroupingZOut"  value="11"/>
+    <Parameter name="GroupingZOut"  value="11"/>
+    <Parameter name="GroupingZOut"  value="11"/>
+    <Parameter name="GroupingZOut"  value="12"/>
+    <Parameter name="GroupingZOut"  value="12"/>
+    <Parameter name="GroupingZOut"  value="12"/>
+    <Parameter name="GroupingZOut"  value="13"/>
+    <Parameter name="GroupingZOut"  value="13"/>
+    <Parameter name="GroupingZOut"  value="13"/>
+    <Parameter name="GroupingZOut"  value="14"/>
+    <Parameter name="GroupingZOut"  value="14"/>
+    <Parameter name="GroupingZOut"  value="14"/>
+    <Parameter name="GroupingZOut"  value="15"/>
+    <Parameter name="GroupingZOut"  value="15"/>
+    <Parameter name="GroupingZOut"  value="15"/>
+    <Parameter name="GroupingZOut"  value="16"/>
+    <Parameter name="GroupingZOut"  value="16"/>
+    <Parameter name="GroupingZOut"  value="16"/>
+    <Parameter name="GroupingZOut"  value="17"/>
+    <Parameter name="GroupingZOut"  value="17"/>
+    <Parameter name="GroupingZOut"  value="17"/>
+    <Parameter name="GroupingZOut"  value="18"/>
+    <Parameter name="GroupingZOut"  value="18"/>
+    <Parameter name="GroupingZOut"  value="18"/>
+    <Parameter name="GroupingZOut"  value="19"/>
+    <Parameter name="GroupingZOut"  value="19"/>
+    <Parameter name="GroupingZOut"  value="19"/>
+    <Parameter name="GroupingZOut"  value="20"/>
+    <Parameter name="GroupingZOut"  value="20"/>
+    <Parameter name="GroupingZOut"  value="20"/>
+    <Parameter name="GroupingZOut"  value="21"/>
+    <Parameter name="GroupingZOut"  value="21"/>
+    <Parameter name="GroupingZOut"  value="21"/>
+    <Parameter name="GroupingZOut"  value="22"/>
+    <Parameter name="GroupingZOut"  value="22"/>
+    <Parameter name="GroupingZOut"  value="22"/>
+    <Parameter name="GroupingZOut"  value="23"/>
+    <Parameter name="GroupingZOut"  value="23"/>
+    <Parameter name="GroupingZOut"  value="23"/>
+    <Parameter name="GroupingZOut"  value="24"/>
+    <Parameter name="GroupingZOut"  value="24"/>
+    <Parameter name="GroupingZOut"  value="24"/>
+    <Parameter name="GroupingZOut"  value="25"/>
+    <Parameter name="GroupingZOut"  value="25"/>
+    <Parameter name="GroupingZOut"  value="25"/>
+    <Parameter name="GroupingZOut"  value="26"/>
+    <Parameter name="GroupingZOut"  value="26"/>
+    <Parameter name="GroupingZOut"  value="26"/>
+    <Parameter name="GroupingZOut"  value="27"/>
+    <Parameter name="GroupingZOut"  value="27"/>
+    <Parameter name="GroupingZOut"  value="27"/>
+    <Parameter name="GroupingZOut"  value="28"/>
+    <Parameter name="GroupingZOut"  value="28"/>
+    <Parameter name="GroupingZOut"  value="28"/>
+    <Parameter name="LayerOffset"   value="0"/>
+  </SpecPar>
+</SpecParSection>
+
+</DDDefinition>
diff --git a/Geometry/HGCalTBCommonData/data/TB181/June18/hgcalEE.xml b/Geometry/HGCalTBCommonData/data/TB181/June18/hgcalEE.xml
new file mode 100644
index 0000000000000..63f661dec8761
--- /dev/null
+++ b/Geometry/HGCalTBCommonData/data/TB181/June18/hgcalEE.xml
@@ -0,0 +1,122 @@
+<?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="hgcalEE.xml" eval="true">
+  <Constant name="rMinFine"   value="0.0*fm"/>
+  <Constant name="rMaxFine"   value="0.0*cm"/>
+  <Constant name="rMaxMiddle" value="120.0*cm"/>
+  <Constant name="rMaxCoarse" value="2000.0*cm"/>
+  <Constant name="rMin"       value="0.0*fm"/>
+  <Constant name="rMax"       value="10.0*cm"/>
+  <Constant name="absorbW"    value="0.5*[hgcal:WaferW]"/>
+  <Constant name="absorbH"    value="[hgcal:WaferW]*[hgcal:tan30deg]"/>
+</ConstantsSection>
+
+<PosPartSection label="hgcalEE.xml">
+  <Algorithm name="hgcal:DDHGCalTBModule">
+    <rParent name="hgcal:HGCalEE"/>
+    <Vector name="WaferName" type="string" nEntries="2">
+      hgcalwafer:HGCalEEWaferFine, hgcalwafer:HGCalEEWaferCoarse</Vector>
+    <Vector name="CoverName" type="string" nEntries="4">
+      hgcal:HGCalEEPCB, hgcal:HGCalEEKapton, hgcal:HGCalEEAbsorber, 
+      hgcal:HGCalEECuAbsorber</Vector>
+    <Vector name="MaterialNames" type="string" nEntries="19">
+      materials:Air,    materials:Air,            materials:Air, 
+      materials:Air,    materials:StainlessSteel, materials:Lead, 
+      materials:Copper, materials:Air,            materials:Aluminium, 
+      materials:Air,    materials:Air,            materials:Air,
+      materials:Air,    materials:Air,            materials:Air, 
+      materials:Air,    materials:Air,            materials:Air, 
+      materials:Air</Vector>
+    <Vector name="VolumeNames" type="string" nEntries="19">
+      EEPCB,          EEKapton,     EECuWShield, 
+      EECuShield,     EEFeAbsorber, EEPbAbsorber, 
+      EECuHeatShield, EESensitive,  EEAlcase, 
+      EEgap1,         EEgap2,       EEgap3,       
+      EEgap4,         EEgap5,       EEgap6,
+      EEgap7,         EEgap8,       EEgap9,
+      EEgap10</Vector>
+    <Vector name="Thickness" type="numeric" nEntries="19">
+      [hgcal:thPCB],    [hgcal:thKapton], [hgcal:thAbsEE], 
+      [hgcal:thAbsEE],  0.3*mm,           4.9*mm,
+      6.0*mm,           0.10*mm,          2.1*mm, 
+      4.6*mm,           5.4*mm,           6.2*mm, 
+      6.7*mm,           7.8*mm,           8.0*mm, 
+      10.6*mm,          15.2*mm,          79.96*mm,
+      90.6*mm</Vector>
+    <Vector name="Layers" type="numeric" nEntries="15"> 
+      19, 18, 18, 18, 18, 18, 18, 20, 18, 20, 18, 19, 18, 18, 2</Vector>
+    <Vector name="LayerThick" type="numeric" nEntries="15"> 
+      104.38*mm, 30.12*mm, 29.02*mm,
+      28.52*mm, 28.52*mm, 28.52*mm,
+      28.52*mm, 31.72*mm, 30.32*mm,
+      31.72*mm, 30.32*mm, 30.52*mm,
+      43.52*mm, 43.52*mm, 92.7*mm
+    </Vector>
+    <Vector name="LayerType" type="numeric" nEntries="260"> 
+      8, 17, 4, 5, 4, 9, 0, 7, 7, 7, 1, 2, 6, 2, 1, 7, 7, 7, 0,
+      13, 4, 5, 4, 9, 0, 7, 7, 7, 1, 2, 6, 2, 1, 7, 7, 7, 0,
+      12, 4, 5, 4, 9, 0, 7, 7, 7, 1, 2, 6, 2, 1, 7, 7, 7, 0,
+      11, 4, 5, 4, 9, 0, 7, 7, 7, 1, 2, 6, 2, 1, 7, 7, 7, 0,
+      11, 4, 5, 4, 9, 0, 7, 7, 7, 1, 2, 6, 2, 1, 7, 7, 7, 0,
+      11, 4, 5, 4, 9, 0, 7, 7, 7, 1, 2, 6, 2, 1, 7, 7, 7, 0,
+      11, 4, 5, 4, 9, 0, 7, 7, 7, 1, 2, 6, 2, 1, 7, 7, 7, 0,
+      11, 4, 5, 4, 10, 0, 7, 7, 7,1, 3, 2, 6, 2, 3, 1, 7, 7, 7, 0,
+      14, 4, 5, 4, 9, 0, 7, 7, 7, 1, 2, 6, 2, 1, 7, 7, 7, 0,
+      11, 4, 5, 4, 10, 0, 7, 7, 7, 1,3, 2, 6, 2, 3, 1, 7, 7, 7, 0,
+      14, 4, 5, 4, 9, 0, 7, 7, 7, 1, 2, 6, 2, 1, 7, 7, 7, 0,
+      11, 4, 5, 4, 10, 0, 7, 7, 7,1, 3, 2, 6, 2, 1, 7, 7, 7, 0,
+      16, 4, 5, 4, 15, 0, 7, 7, 7, 1, 2, 6, 2, 1, 7, 7, 7, 0,
+      16, 4, 5, 4, 15, 0, 7, 7, 7, 1, 2, 6, 2, 1, 7, 7, 7, 0,
+      18, 8</Vector>
+    <Vector name="LayerSense" type="numeric" nEntries="260">
+     0, 0, 0, 0, 0, 0, 2, 1, 1, 1, 3, 4, 0, 4, 3, 1, 1, 1, 2,
+     0, 0, 0, 0, 0, 2, 1, 1, 1, 3, 4, 0, 4, 3, 1, 1, 1, 2,
+     0, 0, 0, 0, 0, 2, 1, 1, 1, 3, 4, 0, 4, 3, 1, 1, 1, 2,
+     0, 0, 0, 0, 0, 2, 1, 1, 1, 3, 4, 0, 4, 3, 1, 1, 1, 2,
+     0, 0, 0, 0, 0, 2, 1, 1, 1, 3, 4, 0, 4, 3, 1, 1, 1, 2,
+     0, 0, 0, 0, 0, 2, 1, 1, 1, 3, 4, 0, 4, 3, 1, 1, 1, 2,
+     0, 0, 0, 0, 0, 2, 1, 1, 1, 3, 4, 0, 4, 3, 1, 1, 1, 2,
+     0, 0, 0, 0, 0, 2, 1, 1, 1, 3, 5, 4, 0, 4, 5, 3, 1, 1, 1, 2,
+     0, 0, 0, 0, 0, 2, 1, 1, 1, 3, 4, 0, 4, 3, 1, 1, 1, 2,
+     0, 0, 0, 0, 0, 2, 1, 1, 1, 3, 5, 4, 0, 4, 5, 3, 1, 1, 1, 2,
+     0, 0, 0, 0, 0, 2, 1, 1, 1, 3, 4, 0, 4, 3, 1, 1, 1, 2,
+     0, 0, 0, 0, 0, 2, 1, 1, 1, 3, 5, 4, 0, 4, 3, 1, 1, 1, 2,
+     0, 0, 0, 0, 0, 2, 1, 1, 1, 3, 4, 0, 4, 3, 1, 1, 1, 2,
+     0, 0, 0, 0, 0, 2, 1, 1, 1, 3, 4, 0, 4, 3, 1, 1, 1, 2,
+     0, 0</Vector>
+    <Numeric name="zMinBlock"   value="[hgcal:zminEE]"/>
+    <Numeric name="rMaxFine"    value="[rMaxFine]"/>
+    <Numeric name="waferW"      value="[hgcal:WaferW]"/>
+    <Numeric name="waferGap"    value="0.0*fm"/>
+    <Numeric name="absorberW"   value="[hgcalEE:absorbW]"/>
+    <Numeric name="absorberH"   value="[hgcalEE:absorbH]"/>
+    <Numeric name="Sectors"     value="12"/>
+    <Vector name="SlopeBottom" type="numeric" nEntries="2">
+      0.0, 0.0</Vector>
+    <Vector name="SlopeTop" type="numeric" nEntries="2">
+      0, 0</Vector>
+    <Vector name="ZFront" type="numeric" nEntries="2">
+      [hgcal:zminEE], [hgcal:zmaxEE]</Vector>
+    <Vector name="RMaxFront" type="numeric" nEntries="2">
+      [hgcal:rmaxEE], [hgcal:rmaxEE]</Vector>
+    <String name="RotNameSpace" value="hgcalmodule"/>
+  </Algorithm>
+</PosPartSection> 
+
+<SpecParSection label="hgcalEE.xml" eval="true">
+  <SpecPar name="HGCalEE">
+    <PartSelector path="//HGCalEESensitive.*"/>    
+    <Parameter name="Volume" value="HGCalEESensitive" eval="false"/>
+    <Parameter name="GeometryMode" value="HGCalGeometryMode::Hexagon" eval="false"/>
+    <Parameter name="RadiusBound"  value="[rMinFine]"/>
+    <Parameter name="RadiusBound"  value="[rMaxFine]"/>
+    <Parameter name="RadiusBound"  value="[rMaxMiddle]"/>
+    <Parameter name="RadiusBound"  value="[rMaxCoarse]"/>
+    <Parameter name="RadiusLimits" value="[rMin]"/>
+    <Parameter name="RadiusLimits" value="[rMax]"/>
+    <Parameter name="LevelTop"     value="99"/>
+  </SpecPar>
+</SpecParSection>
+
+</DDDefinition>
diff --git a/Geometry/HGCalTBCommonData/data/TB181/June18/hgcalsense.xml b/Geometry/HGCalTBCommonData/data/TB181/June18/hgcalsense.xml
new file mode 100644
index 0000000000000..6898dbed7070d
--- /dev/null
+++ b/Geometry/HGCalTBCommonData/data/TB181/June18/hgcalsense.xml
@@ -0,0 +1,11 @@
+<?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">
+
+<SpecParSection label="hgcalsense.xml" eval="true">
+  <SpecPar name="hgcee">
+    <PartSelector path="//HGCalEECell.*"/>
+    <Parameter name="SensitiveDetector" value="HGCSensitiveDetector" eval="false"/>
+    <Parameter name="ReadOutName" value="HGCHitsEE" eval="false"/>
+  </SpecPar>
+</SpecParSection>
+</DDDefinition>
diff --git a/Geometry/HGCalTBCommonData/data/TB181/Oct180/hgcalBeam.xml b/Geometry/HGCalTBCommonData/data/TB181/Oct180/hgcalBeam.xml
new file mode 100644
index 0000000000000..f2259dfbe460c
--- /dev/null
+++ b/Geometry/HGCalTBCommonData/data/TB181/Oct180/hgcalBeam.xml
@@ -0,0 +1,403 @@
+<?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="hgcalBeam.xml" eval="true">
+  <Constant name="dxBy2BeamPipe" value="100.0*cm"/>
+  <Constant name="dyBy2BeamPipe" value="100.0*cm"/>
+  <Constant name="dzBy2BeamPipe" value="16.5*m"/>
+  <Constant name="zBeamPipe"     value="([cms:zCaloFront]-[dzBy2BeamPipe])"/>
+  <Constant name="zFrontHGCal"   value="606.332*m"/>
+  <Constant name="zFrontScint1"  value="605.282*m"/>
+  <Constant name="zFrontScint2"  value="606.220*m"/>
+  <Constant name="zFrontMCP1"    value="606.080*m"/>
+  <Constant name="zFrontMCP2"    value="606.140*m"/>
+  <Constant name="dxBy2Scint"    value="10.0*cm"/>
+  <Constant name="dzBy2ScintMy"  value="5.05*mm"/>
+  <Constant name="dzBy2Scint"    value="5.0*mm"/>
+  <Constant name="dzBy2MCPAl1"   value="2.50*mm"/>
+  <Constant name="dzBy2MCPAl2"   value="1.25*mm"/>
+  <Constant name="dzBy2MCPPyrex" value="0.6*mm"/>
+  <Constant name="dzBy2MCPPbGls" value="0.2*mm"/>
+  <Constant name="dxBy2MCP"      value="10.0*cm"/>
+  <Constant name="zScint1"       value="([dzBy2BeamPipe]+[zFrontScint1]+
+                                         [dzBy2ScintMy]-[zFrontHGCal])"/>
+  <Constant name="zScint2"       value="([dzBy2BeamPipe]+[zFrontScint2]+
+                                         [dzBy2ScintMy]-[zFrontHGCal])"/>
+  <Constant name="zMCPAl1"       value="([dzBy2BeamPipe]+[zFrontMCP1]+
+                                         [dzBy2MCPAl1]-[zFrontHGCal])"/>
+  <Constant name="zMCPAl2"       value="([dzBy2BeamPipe]+[zFrontMCP2]+
+                                         [dzBy2MCPAl2]-[zFrontHGCal])"/>
+  <Constant name="zMCPPyrex1"    value="([zMCPAl1]+[dzBy2MCPAl1]+
+					 [dzBy2MCPPyrex])"/>
+  <Constant name="zMCPPyrex2"    value="([zMCPAl2]+[dzBy2MCPAl2]+
+					 [dzBy2MCPPyrex])"/>
+  <Constant name="zMCPPbGlass1"  value="([zMCPPyrex1]+[dzBy2MCPPyrex]+
+					 [dzBy2MCPPbGls])"/>
+  <Constant name="zMCPPbGlass2"  value="([zMCPPyrex2]+[dzBy2MCPPyrex]+
+					 [dzBy2MCPPbGls])"/>
+  <Constant name="zFrontTube1"   value="574.028*m"/>
+  <Constant name="zFrontPE1"     value="576.513*m"/>
+  <Constant name="zFrontTube2"   value="579.205*m"/>
+  <Constant name="zFrontPE2"     value="593.382*m"/>
+  <Constant name="zFrontTube3"   value="598.836*m"/>
+  <Constant name="zFrontPE3"     value="604.438*m"/>
+  <Constant name="dzBy2PETape"   value="0.05*mm"/>
+  <Constant name="dzBy2Mylar"    value="0.06*mm"/>
+  <Constant name="rBeamTube"     value="25.0*cm"/>
+  <Constant name="dzBy2Tube1"    value="0.5*([zFrontPE1]+2*[dzBy2PETape]-
+					[zFrontTube1])"/>
+  <Constant name="dzBy2Tube2"    value="0.5*([zFrontPE2]+2*[dzBy2PETape]-
+					[zFrontTube2])"/>
+  <Constant name="dzBy2Tube3"    value="0.5*([zFrontPE3]+2*[dzBy2PETape]-
+					[zFrontTube3])"/>
+  <Constant name="dzBy2Mylar1"   value="([dzBy2Tube1]-2*[dzBy2PETape])"/>
+  <Constant name="dzBy2Mylar2"   value="([dzBy2Tube2]-2*[dzBy2PETape])"/>
+  <Constant name="dzBy2Mylar3"   value="([dzBy2Tube3]-2*[dzBy2PETape])"/>
+  <Constant name="dzBy2Vacuum1"  value="([dzBy2Mylar1]-2*[dzBy2Mylar])"/>
+  <Constant name="dzBy2Vacuum2"  value="([dzBy2Mylar2]-2*[dzBy2Mylar])"/>
+  <Constant name="dzBy2Vacuum3"  value="([dzBy2Mylar3]-2*[dzBy2Mylar])"/>
+  <Constant name="zTube1"        value="([dzBy2BeamPipe]+[zFrontTube1]+
+                                         [dzBy2Tube1]-[zFrontHGCal])"/>
+  <Constant name="zTube2"        value="([dzBy2BeamPipe]+[zFrontTube2]+
+                                         [dzBy2Tube2]-[zFrontHGCal])"/>
+  <Constant name="zTube3"        value="([dzBy2BeamPipe]+[zFrontTube3]+
+                                         [dzBy2Tube3]-[zFrontHGCal])"/>
+  <Constant name="dxBy2Chamber"  value="11.0*cm"/>
+  <Constant name="dzBy2Chamber"  value="30.0*mm"/>
+  <Constant name="dzBy2Gas"      value="27.5*mm"/>
+  <Constant name="dzBy2Be"       value="(0.0015*mm+[dzBy2Gas])"/>
+  <Constant name="dzBy2Kapton"   value="(0.1*mm+[dzBy2Be])"/>
+  <Constant name="zFrontChamb1"  value="573.572*m"/>
+  <Constant name="zFrontChamb2"  value="576.977*m"/>
+  <Constant name="zFrontChamb3"  value="578.004*m"/>
+  <Constant name="zFrontChamb4"  value="578.957*m"/>
+  <Constant name="zFrontChamb5"  value="598.610*m"/>
+  <Constant name="zFrontChamb6"  value="604.670*m"/>
+  <Constant name="zChamber1"     value="([dzBy2BeamPipe]+[zFrontChamb1]+
+                                         [dzBy2Chamber]-[zFrontHGCal])"/>
+  <Constant name="zChamber2"     value="([dzBy2BeamPipe]+[zFrontChamb2]+
+                                         [dzBy2Chamber]-[zFrontHGCal])"/>
+  <Constant name="zChamber3"     value="([dzBy2BeamPipe]+[zFrontChamb3]+
+                                         [dzBy2Chamber]-[zFrontHGCal])"/>
+  <Constant name="zChamber4"     value="([dzBy2BeamPipe]+[zFrontChamb4]+
+                                         [dzBy2Chamber]-[zFrontHGCal])"/>
+  <Constant name="zChamber5"     value="([dzBy2BeamPipe]+[zFrontChamb5]+
+                                         [dzBy2Chamber]-[zFrontHGCal])"/>
+  <Constant name="zChamber6"     value="([dzBy2BeamPipe]+[zFrontChamb6]+
+                                         [dzBy2Chamber]-[zFrontHGCal])"/>
+  <Constant name="chambVetW"     value="25.0*mm"/>
+  <Constant name="chambVetT"     value="11.0*mm"/>
+  <Constant name="chambVetGap"   value="12.0*cm"/>
+  <Constant name="chambVetL"     value="0.5*([chambVetGap]+[chambVetW])"/>
+  <Constant name="chambVetX"     value="0.5*[chambVetW]"/>
+  <Constant name="chambVetZF"    value="578.900*m"/>
+  <Constant name="chambVetZ"     value="([dzBy2BeamPipe]+[chambVetZF]+
+                                         0.5*[chambVetT]-[zFrontHGCal])"/>
+</ConstantsSection>
+
+<RotationSection label="hgcalBeam.xml">
+  <Rotation name="R1" phiX="90*deg" thetaX="90*deg" phiY="180*deg" thetaY="90*deg" phiZ="0*deg" thetaZ="0*deg"/>
+</RotationSection>
+
+<SolidSection label="hgcalBeam.xml">
+  <Box name="HGCalBeam" dx="[dxBy2BeamPipe]" dy="[dyBy2BeamPipe]" dz="[dzBy2BeamPipe]"/>
+  <Box name="HGCalBeamMy1" dx="[dxBy2Scint]" dy="[dxBy2Scint]" dz="[dzBy2ScintMy]"/>
+  <Box name="HGCalBeamS1" dx="[dxBy2Scint]" dy="[dxBy2Scint]" dz="[dzBy2Scint]"/>
+  <Box name="HGCalBeamMy2" dx="[dxBy2Scint]" dy="[dxBy2Scint]" dz="[dzBy2ScintMy]"/>
+  <Box name="HGCalBeamS2" dx="[dxBy2Scint]" dy="[dxBy2Scint]" dz="[dzBy2Scint]"/>
+  <Tubs name="HGCalBeamTube1" rMin="0*fm" rMax="[rBeamTube]" dz="[dzBy2Tube1]" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="HGCalBeamMylar1" rMin="0*fm" rMax="[rBeamTube]" dz="[dzBy2Mylar1]" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="HGCalBeamVacuum1" rMin="0*fm" rMax="[rBeamTube]" dz="[dzBy2Vacuum1]" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="HGCalBeamTube2" rMin="0*fm" rMax="[rBeamTube]" dz="[dzBy2Tube2]" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="HGCalBeamMylar2" rMin="0*fm" rMax="[rBeamTube]" dz="[dzBy2Mylar2]" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="HGCalBeamVacuum2" rMin="0*fm" rMax="[rBeamTube]" dz="[dzBy2Vacuum2]" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="HGCalBeamTube3" rMin="0*fm" rMax="[rBeamTube]" dz="[dzBy2Tube3]" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="HGCalBeamMylar3" rMin="0*fm" rMax="[rBeamTube]" dz="[dzBy2Mylar3]" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="HGCalBeamVacuum3" rMin="0*fm" rMax="[rBeamTube]" dz="[dzBy2Vacuum3]" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Box name="HGCalBeamWChamb" dx="[dxBy2Chamber]" dy="[dxBy2Chamber]" dz="[dzBy2Chamber]"/>
+  <Box name="HGCalBeamWChambKap" dx="[dxBy2Chamber]" dy="[dxBy2Chamber]" dz="[dzBy2Kapton]"/>
+  <Box name="HGCalBeamWChambBe" dx="[dxBy2Chamber]" dy="[dxBy2Chamber]" dz="[dzBy2Be]"/>
+  <Box name="HGCalBeamWChambGas" dx="[dxBy2Chamber]" dy="[dxBy2Chamber]" dz="[dzBy2Gas]"/>
+  <Box name="HGCalMCPAluminium1" dx="[dxBy2MCP]" dy="[dxBy2MCP]" dz="[dzBy2MCPAl1]"/>
+  <Box name="HGCalMCPAluminium2" dx="[dxBy2MCP]" dy="[dxBy2MCP]" dz="[dzBy2MCPAl2]"/>
+  <Box name="HGCalMCPPyrexGlass" dx="[dxBy2MCP]" dy="[dxBy2MCP]" dz="[dzBy2MCPPyrex]"/>
+  <Box name="HGCalMCPLeadGlass" dx="[dxBy2MCP]" dy="[dxBy2MCP]" dz="[dzBy2MCPPbGls]"/>
+  <Box name="HGCalBeamWChambVet" dx="[chambVetL]" dy="0.5*[chambVetW]" dz="0.5*[chambVetT]"/>
+</SolidSection>
+
+<LogicalPartSection label="hgcalBeam.xml">
+  <LogicalPart name="HGCalBeam" category="unspecified">
+    <rSolid name="HGCalBeam"/>
+    <rMaterial name="materials:Air"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamWChamb" category="unspecified">
+    <rSolid name="HGCalBeamWChamb"/>
+    <rMaterial name="materials:Air"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamWChambKap" category="unspecified">
+    <rSolid name="HGCalBeamWChambKap"/>
+    <rMaterial name="materials:Kapton"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamWChambBe" category="unspecified">
+    <rSolid name="HGCalBeamWChambBe"/>
+    <rMaterial name="materials:Beryllium"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamWChambGas" category="unspecified">
+    <rSolid name="HGCalBeamWChambGas"/>
+    <rMaterial name="materials:80pct Argon plus 20pct CO_2"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamMy1" category="unspecified">
+    <rSolid name="HGCalBeamMy1"/>
+    <rMaterial name="materials:Mylar"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamS1" category="unspecified">
+    <rSolid name="HGCalBeamS1"/>
+    <rMaterial name="materials:Scintillator"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamMy2" category="unspecified">
+    <rSolid name="HGCalBeamMy2"/>
+    <rMaterial name="materials:Mylar"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamS2" category="unspecified">
+    <rSolid name="HGCalBeamS2"/>
+    <rMaterial name="materials:Scintillator"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamTube1" category="unspecified">
+    <rSolid name="HGCalBeamTube1"/>
+    <rMaterial name="materials:Polyethylene"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamMylar1" category="unspecified">
+    <rSolid name="HGCalBeamMylar1"/>
+    <rMaterial name="materials:Mylar"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamVacuum1" category="unspecified">
+    <rSolid name="HGCalBeamVacuum1"/>
+    <rMaterial name="materials:Vacuum"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamTube2" category="unspecified">
+    <rSolid name="HGCalBeamTube2"/>
+    <rMaterial name="materials:Polyethylene"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamMylar2" category="unspecified">
+    <rSolid name="HGCalBeamMylar2"/>
+    <rMaterial name="materials:Mylar"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamVacuum2" category="unspecified">
+    <rSolid name="HGCalBeamVacuum2"/>
+    <rMaterial name="materials:Vacuum"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamTube3" category="unspecified">
+    <rSolid name="HGCalBeamTube3"/>
+    <rMaterial name="materials:Polyethylene"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamMylar3" category="unspecified">
+    <rSolid name="HGCalBeamMylar3"/>
+    <rMaterial name="materials:Mylar"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamVacuum3" category="unspecified">
+    <rSolid name="HGCalBeamVacuum3"/>
+    <rMaterial name="materials:Vacuum"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalMCPAluminium1" category="unspecified">
+    <rSolid name="HGCalMCPAluminium1"/>
+    <rMaterial name="materials:Aluminium"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalMCPAluminium2" category="unspecified">
+    <rSolid name="HGCalMCPAluminium2"/>
+    <rMaterial name="materials:Aluminium"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalMCPPyrexGlass" category="unspecified">
+    <rSolid name="HGCalMCPPyrexGlass"/>
+    <rMaterial name="hgcalMaterial:PyrexGlass"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalMCPLeadGlass" category="unspecified">
+    <rSolid name="HGCalMCPLeadGlass"/>
+    <rMaterial name="hgcalMaterial:LeadGlass"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamWChambVet" category="unspecified">
+    <rSolid name="HGCalBeamWChambVet"/>
+    <rMaterial name="materials:Polyethylene"/>
+  </LogicalPart>
+</LogicalPartSection>
+
+<PosPartSection label="hgcalBeam.xml">
+  <PosPart copyNumber="1">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambKap"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcalBeam:HGCalBeamWChambKap"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambBe"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcalBeam:HGCalBeamWChambBe"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambGas"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamWChamb"/>
+    <Translation x="0*fm" y="0*fm" z="[zChamber1]"/>
+  </PosPart>
+  <PosPart copyNumber="2">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamWChamb"/>
+    <Translation x="0*fm" y="0*fm" z="[zChamber2]"/>
+  </PosPart>
+  <PosPart copyNumber="3">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamWChamb"/>
+    <Translation x="0*fm" y="0*fm" z="[zChamber3]"/>
+  </PosPart>
+  <PosPart copyNumber="4">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamWChamb"/>
+    <Translation x="0*fm" y="0*fm" z="[zChamber4]"/>
+  </PosPart>
+  <PosPart copyNumber="5">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamWChamb"/>
+    <Translation x="0*fm" y="0*fm" z="[zChamber5]"/>
+  </PosPart>
+  <PosPart copyNumber="6">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamWChamb"/>
+    <Translation x="0*fm" y="0*fm" z="[zChamber6]"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcalBeam:HGCalBeamMy1"/>
+    <rChild name="hgcalBeam:HGCalBeamS1"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamMy1"/>
+    <Translation x="0*fm" y="0*fm" z="[zScint1]"/>
+  </PosPart>
+  <PosPart copyNumber="2">
+    <rParent name="hgcalBeam:HGCalBeamMy2"/>
+    <rChild name="hgcalBeam:HGCalBeamS2"/>
+  </PosPart>
+  <PosPart copyNumber="2">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamMy2"/>
+    <Translation x="0*fm" y="0*fm" z="[zScint2]"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcalBeam:HGCalBeamTube1"/>
+    <rChild name="hgcalBeam:HGCalBeamMylar1"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcalBeam:HGCalBeamMylar1"/>
+    <rChild name="hgcalBeam:HGCalBeamVacuum1"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamTube1"/>
+    <Translation x="0*fm" y="0*fm" z="[zTube1]"/>
+  </PosPart>
+  <PosPart copyNumber="2">
+    <rParent name="hgcalBeam:HGCalBeamTube2"/>
+    <rChild name="hgcalBeam:HGCalBeamMylar2"/>
+  </PosPart>
+  <PosPart copyNumber="2">
+    <rParent name="hgcalBeam:HGCalBeamMylar2"/>
+    <rChild name="hgcalBeam:HGCalBeamVacuum2"/>
+  </PosPart>
+  <PosPart copyNumber="2">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamTube2"/>
+    <Translation x="0*fm" y="0*fm" z="[zTube2]"/>
+  </PosPart>
+  <PosPart copyNumber="3">
+    <rParent name="hgcalBeam:HGCalBeamTube3"/>
+    <rChild name="hgcalBeam:HGCalBeamMylar3"/>
+  </PosPart>
+  <PosPart copyNumber="3">
+    <rParent name="hgcalBeam:HGCalBeamMylar3"/>
+    <rChild name="hgcalBeam:HGCalBeamVacuum3"/>
+  </PosPart>
+  <PosPart copyNumber="3">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamTube3"/>
+    <Translation x="0*fm" y="0*fm" z="[zTube3]"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalMCPAluminium1"/>
+    <Translation x="0*fm" y="0*fm" z="[zMCPAl1]"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalMCPPyrexGlass"/>
+    <Translation x="0*fm" y="0*fm" z="[zMCPPyrex1]"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalMCPLeadGlass"/>
+    <Translation x="0*fm" y="0*fm" z="[zMCPPbGlass1]"/>
+  </PosPart>
+  <PosPart copyNumber="2">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalMCPAluminium2"/>
+    <Translation x="0*fm" y="0*fm" z="[zMCPAl2]"/>
+  </PosPart>
+  <PosPart copyNumber="2">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalMCPPyrexGlass"/>
+    <Translation x="0*fm" y="0*fm" z="[zMCPPyrex2]"/>
+  </PosPart>
+  <PosPart copyNumber="2">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalMCPLeadGlass"/>
+    <Translation x="0*fm" y="0*fm" z="[zMCPPbGlass2]"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="[chambVetX]" y="[chambVetL]" z="[chambVetZ]"/>
+  </PosPart>
+  <PosPart copyNumber="2">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="-[chambVetL]" y="[chambVetX]" z="[chambVetZ]"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="3">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="-[chambVetX]" y="-[chambVetL]" z="[chambVetZ]"/>
+  </PosPart>
+  <PosPart copyNumber="4">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="[chambVetL]" y="-[chambVetX]" z="[chambVetZ]"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="cms:CMSE"/>
+    <rChild name="hgcalBeam:HGCalBeam"/>
+    <Translation x="0*fm" y="0*fm" z="[zBeamPipe]"/>
+  </PosPart>
+</PosPartSection>
+
+<SpecParSection label="hgcalBeam.xml" eval="true">
+  <SpecPar name="hgcalbeam">
+    <PartSelector path="//HGCalBeamS.*"/>
+    <PartSelector path="//HGCalBeamWChambGas"/>
+    <Parameter name="SensitiveDetector" value="HcalTB06BeamDetector" eval="false"/>
+    <Parameter name="ReadOutName" value="HcalTB06BeamHits" eval="false"/>
+  </SpecPar>
+  <SpecPar name="hgcalbeamWC">
+    <PartSelector path="//HGCalBeamWChambGas"/>
+    <Parameter name="Volume" value="WireChamber" eval="false"/>
+  </SpecPar>
+  <SpecPar name="hgcProdCutsBeam">
+    <PartSelector path="//HGCalBeam"/>
+    <Parameter name="CMSCutsRegion" value="HGCalBeamRegion" eval="false"/>
+    <Parameter name="ProdCutsForElectrons" value="1.0*mm"/>
+    <Parameter name="ProdCutsForProtons"   value="1.0*mm"/>
+    <Parameter name="ProdCutsForPositrons" value="1.0*mm"/>
+    <Parameter name="ProdCutsForGamma"     value="1.0*mm"/>
+  </SpecPar>
+</SpecParSection>
+
+</DDDefinition>
diff --git a/Geometry/HGCalTBCommonData/data/TB181/Oct181/ahcal.xml b/Geometry/HGCalTBCommonData/data/TB181/Oct181/ahcal.xml
new file mode 100644
index 0000000000000..834e1256ae54a
--- /dev/null
+++ b/Geometry/HGCalTBCommonData/data/TB181/Oct181/ahcal.xml
@@ -0,0 +1,214 @@
+<?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="ahcal.xml" eval="true">
+  <Constant name="absorberThick" value="17.2*mm"/>
+  <Constant name="radiatorThick" value="17.2*mm"/>
+  <Constant name="airgapThick"   value="1.285*mm"/>
+  <Constant name="cassetteThick" value="0.5*mm"/>
+  <Constant name="cableThick"    value="1.5*mm"/>
+  <Constant name="pcbThick"      value="0.7*mm"/>
+  <Constant name="foilThick"     value="0.115*mm"/>
+  <Constant name="scintThick"    value="3.0*mm"/>
+  <Constant name="passiveHeight" value="72.0*cm"/>
+  <Constant name="passiveWidth"  value="72.0*cm"/>
+  <Constant name="activeHeight"  value="72.0*cm"/>
+  <Constant name="activeWidth"   value="72.0*cm"/>
+  <Constant name="tileGap"       value="30.0*mm"/>
+  <Constant name="tileHeight"    value="30*mm"/>
+  <Constant name="tileWidth"     value="30*mm"/>
+  <Constant name="tileEdge"      value="0.1*mm"/>
+</ConstantsSection>
+
+<MaterialSection label="ahcal.xml">
+  <CompositeMaterial name="Steel235" density="7.87*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.9843">
+      <rMaterial name="materials:Iron"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.0017">
+      <rMaterial name="materials:Carbon"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.0140">
+      <rMaterial name="materials:Manganese"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+  <CompositeMaterial name="PCB" density="1.70*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.180774">
+      <rMaterial name="materials:Silicon"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.405633">
+      <rMaterial name="materials:Oxygen"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.278042">
+      <rMaterial name="materials:Carbon"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.0684428">
+      <rMaterial name="materials:Hydrogen"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.0671091">
+      <rMaterial name="materials:Bromine"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+  <CompositeMaterial name="Polystyrene" density="1.060*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.077418">
+      <rMaterial name="materials:Hydrogen"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.922582">
+      <rMaterial name="materials:Carbon"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+  <CompositeMaterial name="PVC" density="1.35*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.048384">
+      <rMaterial name="materials:Hydrogen"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.384378">
+      <rMaterial name="materials:Carbon"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.567238">
+      <rMaterial name="materials:Chlorine"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+  <CompositeMaterial name="Polystyrole" density="1.065*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.077421">
+      <rMaterial name="materials:Hydrogen"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.922579">
+      <rMaterial name="materials:Carbon"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+  <CompositeMaterial name="CFM" density="0.120*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.009">
+      <rMaterial name="materials:Air"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.872">
+      <rMaterial name="ahcal:PVC"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.119">
+      <rMaterial name="ahcal:Polystyrole"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+</MaterialSection>
+
+
+<SolidSection label="ahcal.xml">
+  <Box name="AHcalTileSensitive" dx="[tileWidth]/2" dy="[tileHeight]/2"
+       dz="[scintThick]/2"/>
+</SolidSection>
+
+<LogicalPartSection label="ahcal.xml">
+  <LogicalPart name="AHcalTileSensitive" category="unspecified">
+    <rSolid name="AHcalTileSensitive"/>
+    <rMaterial name="ahcal:Polystyrene"/>
+  </LogicalPart>
+</LogicalPartSection>
+
+<PosPartSection label="ahcal.xml">
+  <Algorithm name="hgcal:DDAHcalModuleAlgo">
+    <rParent name="hgcal:HGCalAH"/>
+    <String name="TileName" value="ahcal:AHcalTileSensitive"/>
+    <Vector name="MaterialNames" type="string" nEntries="10">
+      ahcal:Steel235, materials:Air, ahcal:Steel235, ahcal:CFM, ahcal:PCB, 
+      ahcal:Polystyrole, ahcal:Polystyrene, ahcal:Steel235, ahcal:Steel235, 
+      materials:Air</Vector>
+    <Vector name="VolumeNames" type="string" nEntries="10">
+      AHcalRadiator, AHcalAirGa1p, AHcalCassette, AHcalCable, AHcalPCB,
+      AHcalFoil, AHcalActive, AHcalAbsorber, AHcalAbsorberLastCover,
+      AHcalAirGap2</Vector>
+    <Vector name="Thickness" type="numeric" nEntries="10">
+      [ahcal:radiatorThick], [ahcal:airgapThick], [ahcal:cassetteThick], 
+      [ahcal:cableThick], [ahcal:pcbThick], [ahcal:foilThick], 
+      [ahcal:scintThick], [ahcal:absorberThick], 5.0*mm,
+      9.0*mm</Vector>
+    <Vector name="Layers" type="numeric" nEntries="22"> 
+      20, 20, 20, 20, 20, 
+      20, 20, 20, 20, 20, 
+      20, 20, 20, 20, 20, 
+      20, 20, 20, 20, 4, 
+      12, 3
+    </Vector>
+    <Vector name="LayerThick" type="numeric" nEntries="22"> 
+      52.4*mm, 52.4*mm, 52.4*mm, 52.4*mm, 52.4*mm, 
+      52.4*mm, 52.4*mm, 52.4*mm, 52.4*mm, 52.4*mm, 
+      52.4*mm, 52.4*mm, 52.4*mm, 52.4*mm, 52.4*mm, 
+      52.4*mm, 52.4*mm, 52.4*mm, 52.4*mm, 52.4*mm, 
+      44.685*mm, 43.4*mm
+      </Vector>
+    <Vector name="LayerType" type="numeric" nEntries="399"> 
+      7, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1,
+      0, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1,
+      0, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1,
+      0, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1,
+      0, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1,
+      0, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1, 
+      0, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1, 
+      0, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1, 
+      0, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1, 
+      0, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1, 
+      0, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1, 
+      0, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1, 
+      0, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1, 
+      0, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1, 
+      0, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1, 
+      0, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1, 
+      0, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1, 
+      0, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1, 
+      0, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1, 
+      0, 9, 0, 9, 
+      0, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 
+      0, 9, 0
+    </Vector>
+    <Vector name="LayerSense" type="numeric" nEntries="399">
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
+      0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 
+      0, 0, 0
+    </Vector>
+    <Vector name="Widths" type="numeric" nEntries="2">
+      [ahcal:passiveWidth], [ahcal:activeWidth] </Vector>
+    <Vector name="Heights" type="numeric" nEntries="2">
+      [ahcal:passiveHeight], [ahcal:activeHeight] </Vector>
+    <Vector name="TileN" type="numeric" nEntries="2">
+      24, 24 </Vector>
+    <Vector name="TileStep" type="numeric" nEntries="2">
+      [ahcal:tileGap], [ahcal:tileGap] </Vector>
+    <Numeric name="zMinBlock"   value="[hgcal:zminAH]"/>
+    <String name="RotNameSpace" value="hgcalmodule"/>
+  </Algorithm>
+</PosPartSection> 
+
+<SpecParSection label="ahcal.xml" eval="true">
+  <SpecPar name="AHcal">
+    <PartSelector path="//AHcalTileSensitive.*"/>
+    <Parameter name="Volume" value="AHcalTileSensitive" eval="false"/>
+    <Parameter name="SensitiveDetector" value="AHcalSensitiveDetector" eval="false"/>
+    <Parameter name="ReadOutName" value="HcalHits" eval="false"/>
+  </SpecPar>
+  <SpecPar name="hgcProdCutsAHcal">
+    <PartSelector path="//HGCalAH"/>
+    <Parameter name="CMSCutsRegion" value="HGCalAHcalRegion" eval="false"/>
+    <Parameter name="ProdCutsForElectrons" value="1.0*mm"/>
+<Parameter name="ProdCutsForProtons" value="1.0*mm"/>
+    <Parameter name="ProdCutsForPositrons" value="1.0*mm"/>
+    <Parameter name="ProdCutsForGamma"     value="1.0*mm"/>
+  </SpecPar>
+</SpecParSection>
+
+</DDDefinition>
diff --git a/Geometry/HGCalTBCommonData/data/TB181/Oct181/cms.xml b/Geometry/HGCalTBCommonData/data/TB181/Oct181/cms.xml
new file mode 100644
index 0000000000000..fb85d17de4ef5
--- /dev/null
+++ b/Geometry/HGCalTBCommonData/data/TB181/Oct181/cms.xml
@@ -0,0 +1,39 @@
+<?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="cms.xml" eval="true">
+  <Constant name="zCaloFront" value="2500.0*cm"/>
+</ConstantsSection>
+
+<SolidSection label="cms.xml" eval="true">
+  <Tubs name="OCMS" rMin="0.0*fm" rMax="2.0*m" dz="45.0*m" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="CMSE" rMin="0.0*fm" rMax="2.0*m" dz="45.0*m" startPhi="0*deg" deltaPhi="360*deg"/>
+</SolidSection>
+
+<LogicalPartSection label="cms.xml">
+  <LogicalPart name="World" category="unspecified">
+    <rSolid name="OCMS"/>
+    <rMaterial name="materials:Air"/>
+  </LogicalPart>
+  <LogicalPart name="OCMS" category="unspecified">
+    <rSolid name="OCMS"/>
+    <rMaterial name="materials:Air"/>
+  </LogicalPart>
+  <LogicalPart name="CMSE" category="unspecified">
+    <rSolid name="CMSE"/>
+    <rMaterial name="materials:Air"/>
+  </LogicalPart>
+</LogicalPartSection>
+
+<PosPartSection label="cms.xml">
+  <PosPart copyNumber="1">
+    <rParent name="cms:World"/>
+    <rChild name="cms:OCMS"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="cms:OCMS"/>
+    <rChild name="cms:CMSE"/>
+  </PosPart>
+</PosPartSection>
+
+</DDDefinition>
diff --git a/Geometry/HGCalTBCommonData/data/TB181/Oct181/hgcProdCuts.xml b/Geometry/HGCalTBCommonData/data/TB181/Oct181/hgcProdCuts.xml
new file mode 100644
index 0000000000000..0ffd0886482c8
--- /dev/null
+++ b/Geometry/HGCalTBCommonData/data/TB181/Oct181/hgcProdCuts.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<DDDefinition>
+
+<SpecParSection label="hgcProdCuts.xml" eval="true">
+  <SpecPar name="hgcProdCuts">
+    <PartSelector path="//HGCalEE"/>
+    <PartSelector path="//HGCalHE"/>
+    <Parameter name="CMSCutsRegion" value="HGCalRegion" eval="false"/>
+    <Parameter name="ProdCutsForElectrons" value="1.0*mm"/>
+    <Parameter name="ProdCutsForProtons" value="1.0*mm"/>
+    <Parameter name="ProdCutsForPositrons" value="1.0*mm"/>
+    <Parameter name="ProdCutsForGamma" value="1.0*mm"/>
+  </SpecPar>
+</SpecParSection>
+
+</DDDefinition>
diff --git a/Geometry/HGCalTBCommonData/data/TB181/Oct181/hgcal.xml b/Geometry/HGCalTBCommonData/data/TB181/Oct181/hgcal.xml
new file mode 100644
index 0000000000000..347d2891b85bb
--- /dev/null
+++ b/Geometry/HGCalTBCommonData/data/TB181/Oct181/hgcal.xml
@@ -0,0 +1,259 @@
+<?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="rmin"          value="0.0*fm"/>
+  <Constant name="rmax"          value="52.0*cm"/>
+  <Constant name="zCaloFront"    value="[cms:zCaloFront]"/>
+  <Constant name="rminEE"        value="0.0*fm"/>
+  <Constant name="rmaxEE"        value="8.0*cm"/>
+  <Constant name="rmaxEEF"       value="9.5*cm"/>
+  <Constant name="zminEE"        value="0.0*fm"/>
+  <Constant name="zmaxEE"        value="63.0*cm"/>
+  <Constant name="rminHE"        value="0.0*fm"/>
+  <Constant name="rmaxHE"        value="19.5*cm"/>
+  <Constant name="rmaxHEF"       value="26.5*cm"/>
+  <Constant name="zminHE"        value="0.0*fm"/>
+  <Constant name="zmaxHE"        value="94.5*cm"/>
+  <Constant name="rminAH"        value="0.0*fm"/>
+  <Constant name="rmaxAH"        value="[rmax]"/>
+  <Constant name="zminAH"        value="0.0*fm"/>
+  <Constant name="zmaxAH"        value="114*cm"/>
+  <Constant name="zgapEEFH"      value="3.5*cm"/>
+  <Constant name="zgapFHBH"      value="36.5*cm"/>
+  <Constant name="zCalor"        value="([zmaxEE]+[zgapEEFH]+[zmaxHE]+
+					[zgapFHBH]+[zmaxAH])/2.0"/>
+  <Constant name="zposCalo"      value="([zCaloFront]+[zCalor])"/>
+  <Constant name="zposEE"        value="-[zCalor]"/>
+  <Constant name="zposHE"        value="[zposEE]+[zmaxEE]+[zgapEEFH]"/>
+  <Constant name="zposAH"        value="[zposHE]+[zmaxHE]+[zgapFHBH]"/>
+  <Constant name="thSilicon"     value="0.1*mm"/>
+  <Constant name="thPCB"         value="1.3*mm"/>
+  <Constant name="thKapton"      value="0.075*mm"/>
+  <Constant name="thCuKapton"    value="0.025*mm"/>
+  <Constant name="thCuPCB"       value="0.175*mm"/>
+  <Constant name="thAbsEE"       value="1.2*mm"/>
+  <Constant name="thAbsEE48To63" value="0.55*mm"/>
+  <Constant name="thAbsEE52To70" value="0.60*mm"/>
+  <Constant name="thAbsEE59To62" value="0.61*mm"/>
+  <Constant name="thAbsEE68To74" value="0.71*mm"/>
+  <Constant name="thAbsCuEE"     value="1.2*mm"/>
+  <Constant name="thAbsHE"       value="1.2*mm"/>
+  <Constant name="thAbsCuHE"     value="1.2*mm"/>
+  <Constant name="thAbsPCBHE"    value="1.2*mm"/>
+  <Constant name="WaferW"        value="123.7*mm"/>
+  <Constant name="tan30deg"      value="tan(30.0*deg)"/>
+</ConstantsSection>
+
+<MaterialSection label="hgcal.xml">
+  <CompositeMaterial name="WCu" density="14.979*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.75">
+      <rMaterial name="materials:Tungsten"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.25">
+      <rMaterial name="materials:Copper"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+</MaterialSection>
+
+<SolidSection label="hgcal.xml">
+  <Tubs name="HGCal" rMin="[rmin]" rMax="[rmax]" dz="[zCalor]" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Polycone name="HGCalEE" startPhi="0*deg" deltaPhi="360*deg">
+    <ZSection z="[zminEE]" rMin="[rminEE]" rMax="[rmaxEEF]"/>
+    <ZSection z="[zmaxEE]" rMin="[rminEE]" rMax="[rmaxEEF]"/>
+  </Polycone>
+  <Polycone name="HGCalHE" startPhi="0*deg" deltaPhi="360*deg">
+    <ZSection z="[zminHE]" rMin="[rminHE]" rMax="[rmaxHEF]"/>
+    <ZSection z="[zmaxHE]" rMin="[rminHE]" rMax="[rmaxHEF]"/>
+  </Polycone>
+  <Polycone name="HGCalAH" startPhi="0*deg" deltaPhi="360*deg">
+    <ZSection z="[zminAH]" rMin="[rminAH]" rMax="[rmaxAH]"/>
+    <ZSection z="[zmaxAH]" rMin="[rminAH]" rMax="[rmaxAH]"/>
+  </Polycone>
+  <Polyhedra name="HGCalEESensitive" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thSilicon]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thSilicon]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+  <Polyhedra name="HGCalHESiliconSensitive" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thSilicon]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thSilicon]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+  <Polyhedra name="HGCalPCB" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thPCB]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thPCB]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+  <Polyhedra name="HGCalKapton" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thKapton]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thKapton]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+  <Polyhedra name="HGCalCuKapton" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thCuKapton]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thCuKapton]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+  <Polyhedra name="HGCalCuPCB" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thCuPCB]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thCuPCB]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+  <Polyhedra name="HGCalEEAbs" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thAbsEE]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thAbsEE]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+  <Polyhedra name="HGCalEEAbs48To63" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thAbsEE48To63]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thAbsEE48To63]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+  <Polyhedra name="HGCalEEAbs52To70" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thAbsEE52To70]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thAbsEE52To70]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+  <Polyhedra name="HGCalEEAbs59To62" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thAbsEE59To62]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thAbsEE59To62]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+  <Polyhedra name="HGCalEEAbs68To74" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thAbsEE68To74]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thAbsEE68To74]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+  <Polyhedra name="HGCalEECuAbs" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thAbsCuEE]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thAbsCuEE]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+  <Polyhedra name="HGCalHEAbs" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thAbsHE]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thAbsHE]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+  <Polyhedra name="HGCalHECuAbs" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thAbsCuHE]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thAbsCuHE]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+  <Polyhedra name="HGCalHEPCBAbs" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thAbsPCBHE]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thAbsPCBHE]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+</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>
+  <LogicalPart name="HGCalAH" category="unspecified">
+    <rSolid name="HGCalAH"/>
+    <rMaterial name="materials:Air"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalEESensitive" category="unspecified">
+    <rSolid name="HGCalEESensitive"/>
+    <rMaterial name="materials:Air"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalHESiliconSensitive" category="unspecified">
+    <rSolid name="HGCalHESiliconSensitive"/>
+    <rMaterial name="materials:Air"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalEEPCB" category="unspecified">
+    <rSolid name="HGCalPCB"/>
+    <rMaterial name="materials:G10"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalHEPCB" category="unspecified">
+    <rSolid name="HGCalPCB"/>
+    <rMaterial name="materials:G10"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalEEKapton" category="unspecified">
+    <rSolid name="HGCalKapton"/>
+    <rMaterial name="materials:Kapton"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalEECuKapton" category="unspecified">
+    <rSolid name="HGCalCuKapton"/>
+    <rMaterial name="materials:Copper"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalEECuPCB" category="unspecified">
+    <rSolid name="HGCalCuPCB"/>
+    <rMaterial name="materials:Copper"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalHEKapton" category="unspecified">
+    <rSolid name="HGCalKapton"/>
+    <rMaterial name="materials:Kapton"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalHECuKapton" category="unspecified">
+    <rSolid name="HGCalCuKapton"/>
+    <rMaterial name="materials:Copper"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalHECuPCB" category="unspecified">
+    <rSolid name="HGCalCuPCB"/>
+    <rMaterial name="materials:Copper"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalEEAbsorber" category="unspecified">
+    <rSolid name="HGCalEEAbs"/>
+    <rMaterial name="hgcal:WCu"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalEEAbsorber48To63" category="unspecified">
+    <rSolid name="HGCalEEAbs48To63"/>
+    <rMaterial name="hgcal:WCu"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalEEAbsorber52To70" category="unspecified">
+    <rSolid name="HGCalEEAbs52To70"/>
+    <rMaterial name="hgcal:WCu"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalEEAbsorber59To62" category="unspecified">
+    <rSolid name="HGCalEEAbs59To62"/>
+    <rMaterial name="hgcal:WCu"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalEEAbsorber68To74" category="unspecified">
+    <rSolid name="HGCalEEAbs68To74"/>
+    <rMaterial name="hgcal:WCu"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalEECuAbsorber" category="unspecified">
+    <rSolid name="HGCalEECuAbs"/>
+    <rMaterial name="materials:Copper"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalHEAbsorber" category="unspecified">
+    <rSolid name="HGCalHEAbs"/>
+    <rMaterial name="hgcal:WCu"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalHECuAbsorber" category="unspecified">
+    <rSolid name="HGCalHECuAbs"/>
+    <rMaterial name="materials:Copper"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalHEPCBAbsorber" category="unspecified">
+    <rSolid name="HGCalHEPCBAbs"/>
+    <rMaterial name="materials:G10"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalHEAirAbsorber" category="unspecified">
+    <rSolid name="HGCalHEPCBAbs"/>
+    <rMaterial name="materials:Air"/>
+  </LogicalPart>
+</LogicalPartSection>
+
+<PosPartSection label="hgcal.xml">
+  <PosPart copyNumber="1">
+    <rParent name="cms:CMSE"/>
+    <rChild name="hgcal:HGCal"/>
+    <Translation x="0*fm" y="0*fm" z="[zposCalo]"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcal:HGCal"/>
+    <rChild name="hgcal:HGCalEE"/>
+    <Translation x="0*fm" y="0*fm" z="[zposEE]"/>
+    <rRotation name="rotations:R090"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcal:HGCal"/>
+    <rChild name="hgcal:HGCalHE"/>
+    <Translation x="0*fm" y="0*fm" z="[zposHE]"/>
+    <rRotation name="rotations:R090"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcal:HGCal"/>
+    <rChild name="hgcal:HGCalAH"/>
+    <Translation x="0*fm" y="0*fm" z="[zposAH]"/>
+    <rRotation name="rotations:000D"/>
+  </PosPart>
+</PosPartSection>
+</DDDefinition>
diff --git a/Geometry/HGCalTBCommonData/data/TB181/Oct181/hgcalBeam.xml b/Geometry/HGCalTBCommonData/data/TB181/Oct181/hgcalBeam.xml
new file mode 100644
index 0000000000000..5efcb010d0926
--- /dev/null
+++ b/Geometry/HGCalTBCommonData/data/TB181/Oct181/hgcalBeam.xml
@@ -0,0 +1,431 @@
+<?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="hgcalBeam.xml" eval="true">
+  <Constant name="upstreamDxby2" value="100.0*cm"/>
+  <Constant name="upstreamDyby2" value="100.0*cm"/>
+  <Constant name="upstreamDzby2" value="400.0*cm"/>
+  <Constant name="upstreamZ" value="-400.0*cm"/>
+  <Constant name="tol" value="0.0*mm"/>
+  <Constant name="chambDxby2" value="11.0*cm"/>
+  <Constant name="chambAlT" value="5.0*mm"/>
+  <Constant name="chambKapW" value="11.0*cm"/>
+  <Constant name="chambKapT" value="0.025*mm"/>
+  <Constant name="chambVetW" value="25.0*mm"/>
+  <Constant name="chambVetT" value="5.0*mm"/>
+  <Constant name="chambVetGap" value="12.0*cm"/>
+  <Constant name="chambVetL" value="0.5*([chambVetGap]+[chambVetW])"/>
+  <Constant name="chambVetX" value="0.5*[chambVetW]"/>
+  <Constant name="chambVetZ" value="20.0*mm"/>
+  <Constant name="chambGasGap" value="([chambVetZ]+0.5*[chambVetT]+[tol])"/>
+  <Constant name="chambGasW" value="([chambVetW]+0.5*[chambVetGap]+[tol])"/>
+  <Constant name="chambDzby2" value="([chambGasGap]+[chambAlT]+2*[tol])"/>
+  <Constant name="chambAl1L" value="0.5*([chambDxby2]+0.5*[chambKapW])"/>
+  <Constant name="chambAl1W" value="0.5*([chambDxby2]-0.5*[chambKapW])"/>
+  <Constant name="chambAl1X" value="([chambDxby2]-[chambAl1L])"/>
+  <Constant name="chambAl1Y" value="([chambDxby2]-[chambAl1W])"/>
+  <Constant name="chambAl1Z" value="([chambGasGap]+0.5*[chambAlT]+[tol])"/>
+  <Constant name="chambAl2L" value="([chambDxby2]-0.5*[chambAlT])"/>
+  <Constant name="chambAl2X" value="([chambDxby2]-[chambAl2L])"/>
+  <Constant name="chambAl2Y" value="([chambDxby2]-0.5*[chambAlT])"/>
+  <Constant name="chamb1Z" value="-507.6*cm"/>
+  <Constant name="chamb2Z" value="-400.3*cm"/>
+  <Constant name="chamb3Z" value="-200.5*cm"/>
+  <Constant name="s1Dxby2" value="7.0*cm"/>
+  <Constant name="s1Dzby2" value="5.0*mm"/>
+  <Constant name="s1Z" value="-375.4*cm"/>
+  <Constant name="s2Dxby2" value="2.0*cm"/>
+  <Constant name="s2Dzby2" value="5.0*mm"/>
+  <Constant name="s2Z" value="-360.5*cm"/>
+  <Constant name="s3Dxby2" value="1.0*cm"/>
+  <Constant name="s3Dzby2" value="5.0*mm"/>
+  <Constant name="s3Z" value="-345.6*cm"/>
+  <Constant name="s4Z" value="-240.8*cm"/>
+  <Constant name="bhDxby2" value="50.0*cm"/>
+  <Constant name="bhDyby2" value="15.0*cm"/>
+  <Constant name="bhDzby2" value="0.5*cm"/>
+  <Constant name="bhGap" value="7.5*cm"/>
+  <Constant name="bhX" value="([bhDxby2]-0.5*[bhGap])"/>
+  <Constant name="bhY" value="([bhDyby2]+0.5*[bhGap])"/>
+  <Constant name="bhZ1" value="-229.3*cm"/>
+  <Constant name="bhZ2" value="-221.3*cm"/>
+  <Constant name="ck3Rad" value="8.35*cm"/>
+  <Constant name="ck3L" value="200.0*cm"/>
+  <Constant name="ck3Z" value="-569.0*cm"/>
+  <Constant name="downstreamDxby2" value="50.0*cm"/>
+  <Constant name="downstreamDyby2" value="50.0*cm"/>
+  <Constant name="downstreamDzby2" value="370.0*cm"/>
+  <Constant name="downstreamZ" value="1980.0*cm"/>
+  <Constant name="chamb4Z" value="1620*cm"/>
+  <Constant name="chamb5Z" value="2340.0*cm"/>
+  <Constant name="mcDxby2" value="40.0*cm"/>
+  <Constant name="mcDzby2" value="20.0*mm"/>
+  <Constant name="mc1Z" value="([hgcal:zCaloFront]-18*cm-4.6*cm)"/>
+  <Constant name="mc2Z" value="([hgcal:zCaloFront]-4.6*cm)"/>
+  <Constant name="s5Dxby2" value="9.5*cm"/>
+  <Constant name="s5Dzby2" value="2.0*cm"/>
+  <Constant name="s5Z"     value="([hgcal:zCaloFront]-[s5Dzby2])"/>
+</ConstantsSection>
+
+<SolidSection label="hgcalBeam.xml">
+  <Box name="HGCalBeam" dx="[upstreamDxby2]" dy="[upstreamDyby2]" dz="[upstreamDzby2]"/>
+  <Box name="HGCalBeamWChamb" dx="[chambDxby2]" dy="[chambDxby2]" dz="[chambDzby2]"/>
+  <Box name="HGCalBeamWChambGas" dx="[chambGasW]" dy="[chambGasW]" dz="[chambGasGap]"/>
+  <Box name="HGCalBeamWChambVet" dx="[chambVetL]" dy="[chambVetW]/2" dz="[chambVetT]/2"/>
+  <Box name="HGCalBeamWChambWindow" dx="[chambKapW]/2" dy="[chambKapW]/2" dz="[chambKapT]/2"/>
+  <Box name="HGCalBeamWChambAl1" dx="[chambAl1L]" dy="[chambAl1W]" dz="[chambAlT]/2"/>
+  <Box name="HGCalBeamWChambAl2" dx="[chambAl2L]" dy="[chambAlT]/2" dz="[chambGasGap]"/>
+  <Box name="HGCalBeamS1" dx="[s1Dxby2]" dy="[s1Dxby2]" dz="[s1Dzby2]"/>
+  <Box name="HGCalBeamS2" dx="[s2Dxby2]" dy="[s2Dxby2]" dz="[s2Dzby2]"/>
+  <Box name="HGCalBeamS3" dx="[s3Dxby2]" dy="[s3Dxby2]" dz="[s3Dzby2]"/>
+  <Box name="HGCalBeamS4" dx="[s1Dxby2]" dy="[s1Dxby2]" dz="[s1Dzby2]"/>
+  <Box name="HGCalBeamS5" dx="[s5Dxby2]" dy="[s5Dxby2]" dz="[s5Dzby2]"/>
+  <Box name="HGCalBeamS6" dx="[s5Dxby2]" dy="[s5Dxby2]" dz="[s5Dzby2]"/>
+  <Box name="HGCalBeamHaloCounter" dx="[bhDxby2]" dy="[bhDyby2]" dz="[bhDzby2]"/>
+  <Tubs name="HGCalBeamCK3" rMin="0*fm" rMax="[ck3Rad]" dz="[ck3L]/2" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Box name="HGCalBeamDown" dx="[downstreamDxby2]" dy="[downstreamDyby2]" dz="[downstreamDzby2]"/>
+  <Box name="HGCalBeamMuonCounter" dx="[mcDxby2]" dy="[mcDxby2]" dz="[mcDzby2]"/>
+</SolidSection>
+
+<LogicalPartSection label="hgcalBeam.xml">
+  <LogicalPart name="HGCalBeam" category="unspecified">
+    <rSolid name="HGCalBeam"/>
+    <rMaterial name="materials:Air"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamWChamb" category="unspecified">
+    <rSolid name="HGCalBeamWChamb"/>
+    <rMaterial name="materials:Air"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamWChambGas" category="unspecified">
+    <rSolid name="HGCalBeamWChambGas"/>
+    <rMaterial name="materials:Ar 50pct plus CO_2 50pct"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamWChambVet" category="unspecified">
+    <rSolid name="HGCalBeamWChambVet"/>
+    <rMaterial name="materials:Polyethylene"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamWChambWindow" category="unspecified">
+    <rSolid name="HGCalBeamWChambWindow"/>
+    <rMaterial name="materials:Kapton"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamWChambAl1" category="unspecified">
+    <rSolid name="HGCalBeamWChambAl1"/>
+    <rMaterial name="materials:Aluminium"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamWChambAl2" category="unspecified">
+    <rSolid name="HGCalBeamWChambAl2"/>
+    <rMaterial name="materials:Aluminium"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamS1" category="unspecified">
+    <rSolid name="HGCalBeamS1"/>
+    <rMaterial name="materials:Scintillator"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamS2" category="unspecified">
+    <rSolid name="HGCalBeamS2"/>
+    <rMaterial name="materials:Scintillator"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamS3" category="unspecified">
+    <rSolid name="HGCalBeamS3"/>
+    <rMaterial name="materials:Scintillator"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamS4" category="unspecified">
+    <rSolid name="HGCalBeamS4"/>
+    <rMaterial name="materials:Scintillator"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamS5" category="unspecified">
+    <rSolid name="HGCalBeamS5"/>
+    <rMaterial name="materials:Scintillator"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamS6" category="unspecified">
+    <rSolid name="HGCalBeamS6"/>
+    <rMaterial name="materials:Scintillator"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamHaloCounter" category="unspecified">
+    <rSolid name="HGCalBeamHaloCounter"/>
+    <rMaterial name="materials:Scintillator"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamCK3" category="unspecified">
+    <rSolid name="HGCalBeamCK3"/>
+    <rMaterial name="materials:Freon-12"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamDown" category="unspecified">
+    <rSolid name="HGCalBeamDown"/>
+    <rMaterial name="materials:Air"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamMuonCounter" category="unspecified">
+    <rSolid name="HGCalBeamMuonCounter"/>
+    <rMaterial name="materials:Scintillator"/>
+  </LogicalPart>
+</LogicalPartSection>
+
+<RotationSection label="hgcalBeam.xml">
+  <Rotation name="R1" phiX="90*deg" thetaX="90*deg" phiY="180*deg" thetaY="90*deg" phiZ="0*deg" thetaZ="0*deg"/>
+</RotationSection>
+
+<PosPartSection label="hgcalBeam.xml">
+  <PosPart copyNumber="1">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambGas"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl1"/>
+    <Translation x="[chambAl1X]" y="[chambAl1Y]" z="[chambAl1Z]"/>
+  </PosPart>
+  <PosPart copyNumber="2">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl1"/>
+    <Translation x="-[chambAl1Y]" y="[chambAl1X]" z="[chambAl1Z]"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="3">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl1"/>
+    <Translation x="-[chambAl1X]" y="-[chambAl1Y]" z="[chambAl1Z]"/>
+  </PosPart>
+  <PosPart copyNumber="4">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl1"/>
+    <Translation x="[chambAl1Y]" y="-[chambAl1X]" z="[chambAl1Z]"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="5">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl1"/>
+    <Translation x="[chambAl1X]" y="[chambAl1Y]" z="-[chambAl1Z]"/>
+  </PosPart>
+  <PosPart copyNumber="6">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl1"/>
+    <Translation x="-[chambAl1Y]" y="[chambAl1X]" z="-[chambAl1Z]"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="7">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl1"/>
+    <Translation x="-[chambAl1X]" y="-[chambAl1Y]" z="-[chambAl1Z]"/>
+  </PosPart>
+  <PosPart copyNumber="8">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl1"/>
+    <Translation x="[chambAl1Y]" y="-[chambAl1X]" z="-[chambAl1Z]"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl2"/>
+    <Translation x="[chambAl2X]" y="[chambAl2Y]" z="0*fm"/>
+  </PosPart>
+  <PosPart copyNumber="2">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl2"/>
+    <Translation x="-[chambAl2Y]" y="[chambAl2X]" z="0*fm"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="3">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl2"/>
+    <Translation x="-[chambAl2X]" y="-[chambAl2Y]" z="0*fm"/>
+  </PosPart>
+  <PosPart copyNumber="4">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl2"/>
+    <Translation x="[chambAl2Y]" y="-[chambAl2X]" z="0*fm"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambWindow"/>
+    <Translation x="0*fm" y="0*fm" z="([chambDzby2]-0.5*[chambKapT])"/>
+  </PosPart>
+  <PosPart copyNumber="2">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambWindow"/>
+    <Translation x="0*fm" y="0*fm" z="-([chambDzby2]-0.5*[chambKapT])"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="[chambVetX]" y="[chambVetL]" z="[chambVetZ]"/>
+  </PosPart>
+  <PosPart copyNumber="2">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="-[chambVetL]" y="[chambVetX]" z="[chambVetZ]"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="3">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="-[chambVetX]" y="-[chambVetL]" z="[chambVetZ]"/>
+  </PosPart>
+  <PosPart copyNumber="4">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="[chambVetL]" y="-[chambVetX]" z="[chambVetZ]"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="5">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="[chambVetX]" y="[chambVetL]" z="0*fm"/>
+  </PosPart>
+  <PosPart copyNumber="6">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="-[chambVetL]" y="[chambVetX]" z="0*fm"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="7">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="-[chambVetX]" y="-[chambVetL]" z="0*fm"/>
+  </PosPart>
+  <PosPart copyNumber="8">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="[chambVetL]" y="-[chambVetX]" z="0*fm"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="9">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="[chambVetX]" y="[chambVetL]" z="-[chambVetZ]"/>
+  </PosPart>
+  <PosPart copyNumber="10">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="-[chambVetL]" y="[chambVetX]" z="-[chambVetZ]"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="11">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="-[chambVetX]" y="-[chambVetL]" z="-[chambVetZ]"/>
+  </PosPart>
+  <PosPart copyNumber="12">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="[chambVetL]" y="-[chambVetX]" z="-[chambVetZ]"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamWChamb"/>
+    <Translation x="0*fm" y="0*fm" z="([chamb1Z]-[upstreamZ]-[chambDzby2])"/>
+  </PosPart>
+  <PosPart copyNumber="2">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamWChamb"/>
+    <Translation x="0*fm" y="0*fm" z="([chamb2Z]-[upstreamZ]-[chambDzby2])"/>
+  </PosPart>
+  <PosPart copyNumber="3">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamWChamb"/>
+    <Translation x="0*fm" y="0*fm" z="([chamb3Z]-[upstreamZ]-[chambDzby2])"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamS1"/>
+    <Translation x="0*fm" y="0*fm" z="([s1Z]-[upstreamZ]-[s1Dzby2])"/>
+  </PosPart>
+  <PosPart copyNumber="2">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamS2"/>
+    <Translation x="0*fm" y="0*fm" z="([s2Z]-[upstreamZ]-[s2Dzby2])"/>
+  </PosPart>
+  <PosPart copyNumber="3">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamS3"/>
+    <Translation x="0*fm" y="0*fm" z="([s3Z]-[upstreamZ]-[s3Dzby2])"/>
+  </PosPart>
+  <PosPart copyNumber="4">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamS4"/>
+    <Translation x="0*fm" y="0*fm" z="([s4Z]-[upstreamZ]-[s1Dzby2])"/>
+  </PosPart>
+  <PosPart copyNumber="11">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamHaloCounter"/>
+    <Translation x="0*fm" y="[bhY]" z="([bhZ2]+[bhDzby2]-[upstreamZ])"/>
+  </PosPart>
+  <PosPart copyNumber="12">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamHaloCounter"/>
+    <Translation x="0*fm" y="-[bhY]" z="([bhZ2]+[bhDzby2]-[upstreamZ])"/>
+  </PosPart>
+  <PosPart copyNumber="13">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamHaloCounter"/>
+    <Translation x="-[bhY]" y="0*fm" z="([bhZ1]+[bhDzby2]-[upstreamZ])"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="14">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamHaloCounter"/>
+    <Translation x="[bhY]" y="0*fm" z="([bhZ1]+[bhDzby2]-[upstreamZ])"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="0">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamCK3"/>
+    <Translation x="0*fm" y="0*fm" z="([ck3Z]-[upstreamZ]-0.5*[ck3L])"/>
+  </PosPart>
+  <PosPart copyNumber="4">
+    <rParent name="hgcalBeam:HGCalBeamDown"/>
+    <rChild name="hgcalBeam:HGCalBeamWChamb"/>
+    <Translation x="0*fm" y="0*fm" z="([chamb4Z]-[downstreamZ]-[chambDzby2])"/>
+  </PosPart>
+  <PosPart copyNumber="5">
+    <rParent name="hgcalBeam:HGCalBeamDown"/>
+    <rChild name="hgcalBeam:HGCalBeamWChamb"/>
+    <Translation x="0*fm" y="0*fm" z="([chamb5Z]-[downstreamZ]-[chambDzby2])"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="cms:CMSE"/>
+    <rChild name="hgcalBeam:HGCalBeam"/>
+    <Translation x="0*fm" y="0*fm" z="[upstreamZ]"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="cms:CMSE"/>
+    <rChild name="hgcalBeam:HGCalBeamDown"/>
+    <Translation x="0*fm" y="0*fm" z="[downstreamZ]"/>
+  </PosPart>
+  <PosPart copyNumber="5">
+    <rParent name="cms:CMSE"/>
+    <rChild name="hgcalBeam:HGCalBeamS5"/>
+    <Translation x="0*fm" y="0*fm" z="([mc1Z])"/>
+  </PosPart>
+  <PosPart copyNumber="6">
+    <rParent name="cms:CMSE"/>
+    <rChild name="hgcalBeam:HGCalBeamS6"/>
+    <Translation x="0*fm" y="0*fm" z="([mc2Z])"/>
+  </PosPart>
+</PosPartSection>
+
+<SpecParSection label="hgcalBeam.xml" eval="true">
+  <SpecPar name="hgcalbeam">
+    <PartSelector path="//HGCalBeamS.*"/>
+    <PartSelector path="//HGCalBeamHaloCounter"/>
+    <PartSelector path="//HGCalBeamMuonCounter"/>
+    <PartSelector path="//HGCalBeamCK3"/>
+    <PartSelector path="//HGCalBeamWChambGas"/>
+    <Parameter name="SensitiveDetector" value="HcalTB06BeamDetector" eval="false"/>
+    <Parameter name="ReadOutName" value="HcalTB06BeamHits" eval="false"/>
+  </SpecPar>
+  <SpecPar name="hgcalbeamWC">
+    <PartSelector path="//HGCalBeamWChambGas"/>
+    <Parameter name="Volume" value="WireChamber" eval="false"/>
+  </SpecPar>
+  <SpecPar name="hgcProdCutsBeam">
+    <PartSelector path="//HGCalBeam"/>
+    <PartSelector path="//HGCalBeamDown"/>
+    <Parameter name="CMSCutsRegion" value="HGCalBeamRegion" eval="false"/>
+    <Parameter name="ProdCutsForElectrons" value="1.0*mm"/>
+<Parameter name="ProdCutsForProtons" value="1.0*mm"/>
+    <Parameter name="ProdCutsForPositrons" value="1.0*mm"/>
+    <Parameter name="ProdCutsForGamma"     value="1.0*mm"/>
+  </SpecPar>
+</SpecParSection>
+
+</DDDefinition>
diff --git a/Geometry/HGCalTBCommonData/data/TB181/Oct181/hgcalCons.xml b/Geometry/HGCalTBCommonData/data/TB181/Oct181/hgcalCons.xml
new file mode 100644
index 0000000000000..b6c5cc7366cb5
--- /dev/null
+++ b/Geometry/HGCalTBCommonData/data/TB181/Oct181/hgcalCons.xml
@@ -0,0 +1,401 @@
+<?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">
+
+<SpecParSection label="hgcalReco.xml" eval="true">
+  <SpecPar name="HGCalEEWafer">
+    <PartSelector path="//HGCalEEWafer.*"/>
+    <Parameter name="Volume" value="HGCalEEWafer" eval="false"/>
+    <Parameter name="WaferSize"      value="[hgcal:WaferW]"/>
+  </SpecPar>
+ <SpecPar name="HGCalHEWafer">
+    <PartSelector path="//HGCalHEWafer.*"/>
+    <Parameter name="Volume" value="HGCalHEWafer" eval="false"/>
+    <Parameter name="WaferSize"      value="[hgcal:WaferW]"/>
+  </SpecPar>
+  <SpecPar name="HGCalEECell">
+    <PartSelector path="//HGCalEECell.*"/>
+    <Parameter name="Volume" value="HGCalEECell" eval="false"/>
+    <Parameter name="CellSize"      value="[hgcalwafer:CellWF]"/>
+    <Parameter name="CellSize"      value="[hgcalwafer:CellWC]"/>
+  </SpecPar>
+ <SpecPar name="HGCalHECell">
+    <PartSelector path="//HGCalHECell.*"/>
+    <Parameter name="Volume" value="HGCalHECell" eval="false"/>
+    <Parameter name="CellSize"      value="[hgcalwafer:CellWF]"/>
+    <Parameter name="CellSize"      value="[hgcalwafer:CellWC]"/>
+  </SpecPar>
+  <SpecPar name="HGCalEESensitive">
+    <PartSelector path="//HGCalEESensitive.*"/>
+    <Parameter name="Volume" value="HGCalEESensitive" eval="false"/>
+    <Parameter name="Slope"  value="0.0"/>
+    <Parameter name="GroupingZFine"  value="1"/>
+    <Parameter name="GroupingZFine"  value="1"/>
+    <Parameter name="GroupingZFine"  value="1"/>
+    <Parameter name="GroupingZFine"  value="2"/>
+    <Parameter name="GroupingZFine"  value="2"/>
+    <Parameter name="GroupingZFine"  value="2"/>
+    <Parameter name="GroupingZFine"  value="3"/>
+    <Parameter name="GroupingZFine"  value="3"/>
+    <Parameter name="GroupingZFine"  value="3"/>
+    <Parameter name="GroupingZFine"  value="4"/>
+    <Parameter name="GroupingZFine"  value="4"/>
+    <Parameter name="GroupingZFine"  value="4"/>
+    <Parameter name="GroupingZFine"  value="5"/>
+    <Parameter name="GroupingZFine"  value="5"/>
+    <Parameter name="GroupingZFine"  value="5"/>
+    <Parameter name="GroupingZFine"  value="6"/>
+    <Parameter name="GroupingZFine"  value="6"/>
+    <Parameter name="GroupingZFine"  value="6"/>
+    <Parameter name="GroupingZFine"  value="7"/>
+    <Parameter name="GroupingZFine"  value="7"/>
+    <Parameter name="GroupingZFine"  value="7"/>
+    <Parameter name="GroupingZFine"  value="8"/>
+    <Parameter name="GroupingZFine"  value="8"/>
+    <Parameter name="GroupingZFine"  value="8"/>
+    <Parameter name="GroupingZFine"  value="9"/>
+    <Parameter name="GroupingZFine"  value="9"/>
+    <Parameter name="GroupingZFine"  value="9"/>
+    <Parameter name="GroupingZFine"  value="10"/>
+    <Parameter name="GroupingZFine"  value="10"/>
+    <Parameter name="GroupingZFine"  value="10"/>
+    <Parameter name="GroupingZFine"  value="11"/>
+    <Parameter name="GroupingZFine"  value="11"/>
+    <Parameter name="GroupingZFine"  value="11"/>
+    <Parameter name="GroupingZFine"  value="12"/>
+    <Parameter name="GroupingZFine"  value="12"/>
+    <Parameter name="GroupingZFine"  value="12"/>
+    <Parameter name="GroupingZFine"  value="13"/>
+    <Parameter name="GroupingZFine"  value="13"/>
+    <Parameter name="GroupingZFine"  value="13"/>
+    <Parameter name="GroupingZFine"  value="14"/>
+    <Parameter name="GroupingZFine"  value="14"/>
+    <Parameter name="GroupingZFine"  value="14"/>
+    <Parameter name="GroupingZFine"  value="15"/>
+    <Parameter name="GroupingZFine"  value="15"/>
+    <Parameter name="GroupingZFine"  value="15"/>
+    <Parameter name="GroupingZFine"  value="16"/>
+    <Parameter name="GroupingZFine"  value="16"/>
+    <Parameter name="GroupingZFine"  value="16"/>
+    <Parameter name="GroupingZFine"  value="17"/>
+    <Parameter name="GroupingZFine"  value="17"/>
+    <Parameter name="GroupingZFine"  value="17"/>
+    <Parameter name="GroupingZFine"  value="18"/>
+    <Parameter name="GroupingZFine"  value="18"/>
+    <Parameter name="GroupingZFine"  value="18"/>
+    <Parameter name="GroupingZFine"  value="19"/>
+    <Parameter name="GroupingZFine"  value="19"/>
+    <Parameter name="GroupingZFine"  value="19"/>
+    <Parameter name="GroupingZFine"  value="20"/>
+    <Parameter name="GroupingZFine"  value="20"/>
+    <Parameter name="GroupingZFine"  value="20"/>
+    <Parameter name="GroupingZFine"  value="21"/>
+    <Parameter name="GroupingZFine"  value="21"/>
+    <Parameter name="GroupingZFine"  value="21"/>
+    <Parameter name="GroupingZFine"  value="22"/>
+    <Parameter name="GroupingZFine"  value="22"/>
+    <Parameter name="GroupingZFine"  value="22"/>
+    <Parameter name="GroupingZFine"  value="23"/>
+    <Parameter name="GroupingZFine"  value="23"/>
+    <Parameter name="GroupingZFine"  value="23"/>
+    <Parameter name="GroupingZFine"  value="24"/>
+    <Parameter name="GroupingZFine"  value="24"/>
+    <Parameter name="GroupingZFine"  value="24"/>
+    <Parameter name="GroupingZFine"  value="25"/>
+    <Parameter name="GroupingZFine"  value="25"/>
+    <Parameter name="GroupingZFine"  value="25"/>
+    <Parameter name="GroupingZFine"  value="26"/>
+    <Parameter name="GroupingZFine"  value="26"/>
+    <Parameter name="GroupingZFine"  value="26"/>
+    <Parameter name="GroupingZFine"  value="-1"/>
+    <Parameter name="GroupingZFine"  value="27"/>
+    <Parameter name="GroupingZFine"  value="27"/>
+    <Parameter name="GroupingZFine"  value="-1"/>
+    <Parameter name="GroupingZFine"  value="28"/>
+    <Parameter name="GroupingZFine"  value="28"/>
+    <Parameter name="GroupingZMid"  value="1"/>
+    <Parameter name="GroupingZMid"  value="1"/>
+    <Parameter name="GroupingZMid"  value="1"/>
+    <Parameter name="GroupingZMid"  value="2"/>
+    <Parameter name="GroupingZMid"  value="2"/>
+    <Parameter name="GroupingZMid"  value="2"/>
+    <Parameter name="GroupingZMid"  value="3"/>
+    <Parameter name="GroupingZMid"  value="3"/>
+    <Parameter name="GroupingZMid"  value="3"/>
+    <Parameter name="GroupingZMid"  value="4"/>
+    <Parameter name="GroupingZMid"  value="4"/>
+    <Parameter name="GroupingZMid"  value="4"/>
+    <Parameter name="GroupingZMid"  value="5"/>
+    <Parameter name="GroupingZMid"  value="5"/>
+    <Parameter name="GroupingZMid"  value="5"/>
+    <Parameter name="GroupingZMid"  value="6"/>
+    <Parameter name="GroupingZMid"  value="6"/>
+    <Parameter name="GroupingZMid"  value="6"/>
+    <Parameter name="GroupingZMid"  value="7"/>
+    <Parameter name="GroupingZMid"  value="7"/>
+    <Parameter name="GroupingZMid"  value="7"/>
+    <Parameter name="GroupingZMid"  value="8"/>
+    <Parameter name="GroupingZMid"  value="8"/>
+    <Parameter name="GroupingZMid"  value="8"/>
+    <Parameter name="GroupingZMid"  value="9"/>
+    <Parameter name="GroupingZMid"  value="9"/>
+    <Parameter name="GroupingZMid"  value="9"/>
+    <Parameter name="GroupingZMid"  value="10"/>
+    <Parameter name="GroupingZMid"  value="10"/>
+    <Parameter name="GroupingZMid"  value="10"/>
+    <Parameter name="GroupingZMid"  value="11"/>
+    <Parameter name="GroupingZMid"  value="11"/>
+    <Parameter name="GroupingZMid"  value="11"/>
+    <Parameter name="GroupingZMid"  value="12"/>
+    <Parameter name="GroupingZMid"  value="12"/>
+    <Parameter name="GroupingZMid"  value="12"/>
+    <Parameter name="GroupingZMid"  value="13"/>
+    <Parameter name="GroupingZMid"  value="13"/>
+    <Parameter name="GroupingZMid"  value="13"/>
+    <Parameter name="GroupingZMid"  value="14"/>
+    <Parameter name="GroupingZMid"  value="14"/>
+    <Parameter name="GroupingZMid"  value="14"/>
+    <Parameter name="GroupingZMid"  value="15"/>
+    <Parameter name="GroupingZMid"  value="15"/>
+    <Parameter name="GroupingZMid"  value="15"/>
+    <Parameter name="GroupingZMid"  value="16"/>
+    <Parameter name="GroupingZMid"  value="16"/>
+    <Parameter name="GroupingZMid"  value="16"/>
+    <Parameter name="GroupingZMid"  value="17"/>
+    <Parameter name="GroupingZMid"  value="17"/>
+    <Parameter name="GroupingZMid"  value="17"/>
+    <Parameter name="GroupingZMid"  value="18"/>
+    <Parameter name="GroupingZMid"  value="18"/>
+    <Parameter name="GroupingZMid"  value="18"/>
+    <Parameter name="GroupingZMid"  value="19"/>
+    <Parameter name="GroupingZMid"  value="19"/>
+    <Parameter name="GroupingZMid"  value="19"/>
+    <Parameter name="GroupingZMid"  value="20"/>
+    <Parameter name="GroupingZMid"  value="20"/>
+    <Parameter name="GroupingZMid"  value="20"/>
+    <Parameter name="GroupingZMid"  value="21"/>
+    <Parameter name="GroupingZMid"  value="21"/>
+    <Parameter name="GroupingZMid"  value="21"/>
+    <Parameter name="GroupingZMid"  value="22"/>
+    <Parameter name="GroupingZMid"  value="22"/>
+    <Parameter name="GroupingZMid"  value="22"/>
+    <Parameter name="GroupingZMid"  value="23"/>
+    <Parameter name="GroupingZMid"  value="23"/>
+    <Parameter name="GroupingZMid"  value="23"/>
+    <Parameter name="GroupingZMid"  value="24"/>
+    <Parameter name="GroupingZMid"  value="24"/>
+    <Parameter name="GroupingZMid"  value="24"/>
+    <Parameter name="GroupingZMid"  value="25"/>
+    <Parameter name="GroupingZMid"  value="25"/>
+    <Parameter name="GroupingZMid"  value="25"/>
+    <Parameter name="GroupingZMid"  value="26"/>
+    <Parameter name="GroupingZMid"  value="26"/>
+    <Parameter name="GroupingZMid"  value="26"/>
+    <Parameter name="GroupingZMid"  value="-1"/>
+    <Parameter name="GroupingZMid"  value="27"/>
+    <Parameter name="GroupingZMid"  value="27"/>
+    <Parameter name="GroupingZMid"  value="-1"/>
+    <Parameter name="GroupingZMid"  value="28"/>
+    <Parameter name="GroupingZMid"  value="28"/>
+    <Parameter name="GroupingZOut"  value="1"/>
+    <Parameter name="GroupingZOut"  value="1"/>
+    <Parameter name="GroupingZOut"  value="1"/>
+    <Parameter name="GroupingZOut"  value="2"/>
+    <Parameter name="GroupingZOut"  value="2"/>
+    <Parameter name="GroupingZOut"  value="2"/>
+    <Parameter name="GroupingZOut"  value="3"/>
+    <Parameter name="GroupingZOut"  value="3"/>
+    <Parameter name="GroupingZOut"  value="3"/>
+    <Parameter name="GroupingZOut"  value="4"/>
+    <Parameter name="GroupingZOut"  value="4"/>
+    <Parameter name="GroupingZOut"  value="4"/>
+    <Parameter name="GroupingZOut"  value="5"/>
+    <Parameter name="GroupingZOut"  value="5"/>
+    <Parameter name="GroupingZOut"  value="5"/>
+    <Parameter name="GroupingZOut"  value="6"/>
+    <Parameter name="GroupingZOut"  value="6"/>
+    <Parameter name="GroupingZOut"  value="6"/>
+    <Parameter name="GroupingZOut"  value="7"/>
+    <Parameter name="GroupingZOut"  value="7"/>
+    <Parameter name="GroupingZOut"  value="7"/>
+    <Parameter name="GroupingZOut"  value="8"/>
+    <Parameter name="GroupingZOut"  value="8"/>
+    <Parameter name="GroupingZOut"  value="8"/>
+    <Parameter name="GroupingZOut"  value="9"/>
+    <Parameter name="GroupingZOut"  value="9"/>
+    <Parameter name="GroupingZOut"  value="9"/>
+    <Parameter name="GroupingZOut"  value="10"/>
+    <Parameter name="GroupingZOut"  value="10"/>
+    <Parameter name="GroupingZOut"  value="10"/>
+    <Parameter name="GroupingZOut"  value="11"/>
+    <Parameter name="GroupingZOut"  value="11"/>
+    <Parameter name="GroupingZOut"  value="11"/>
+    <Parameter name="GroupingZOut"  value="12"/>
+    <Parameter name="GroupingZOut"  value="12"/>
+    <Parameter name="GroupingZOut"  value="12"/>
+    <Parameter name="GroupingZOut"  value="13"/>
+    <Parameter name="GroupingZOut"  value="13"/>
+    <Parameter name="GroupingZOut"  value="13"/>
+    <Parameter name="GroupingZOut"  value="14"/>
+    <Parameter name="GroupingZOut"  value="14"/>
+    <Parameter name="GroupingZOut"  value="14"/>
+    <Parameter name="GroupingZOut"  value="15"/>
+    <Parameter name="GroupingZOut"  value="15"/>
+    <Parameter name="GroupingZOut"  value="15"/>
+    <Parameter name="GroupingZOut"  value="16"/>
+    <Parameter name="GroupingZOut"  value="16"/>
+    <Parameter name="GroupingZOut"  value="16"/>
+    <Parameter name="GroupingZOut"  value="17"/>
+    <Parameter name="GroupingZOut"  value="17"/>
+    <Parameter name="GroupingZOut"  value="17"/>
+    <Parameter name="GroupingZOut"  value="18"/>
+    <Parameter name="GroupingZOut"  value="18"/>
+    <Parameter name="GroupingZOut"  value="18"/>
+    <Parameter name="GroupingZOut"  value="19"/>
+    <Parameter name="GroupingZOut"  value="19"/>
+    <Parameter name="GroupingZOut"  value="19"/>
+    <Parameter name="GroupingZOut"  value="20"/>
+    <Parameter name="GroupingZOut"  value="20"/>
+    <Parameter name="GroupingZOut"  value="20"/>
+    <Parameter name="GroupingZOut"  value="21"/>
+    <Parameter name="GroupingZOut"  value="21"/>
+    <Parameter name="GroupingZOut"  value="21"/>
+    <Parameter name="GroupingZOut"  value="22"/>
+    <Parameter name="GroupingZOut"  value="22"/>
+    <Parameter name="GroupingZOut"  value="22"/>
+    <Parameter name="GroupingZOut"  value="23"/>
+    <Parameter name="GroupingZOut"  value="23"/>
+    <Parameter name="GroupingZOut"  value="23"/>
+    <Parameter name="GroupingZOut"  value="24"/>
+    <Parameter name="GroupingZOut"  value="24"/>
+    <Parameter name="GroupingZOut"  value="24"/>
+    <Parameter name="GroupingZOut"  value="25"/>
+    <Parameter name="GroupingZOut"  value="25"/>
+    <Parameter name="GroupingZOut"  value="25"/>
+    <Parameter name="GroupingZOut"  value="26"/>
+    <Parameter name="GroupingZOut"  value="26"/>
+    <Parameter name="GroupingZOut"  value="26"/>
+    <Parameter name="GroupingZOut"  value="-1"/>
+    <Parameter name="GroupingZOut"  value="27"/>
+    <Parameter name="GroupingZOut"  value="27"/>
+    <Parameter name="GroupingZOut"  value="-1"/>
+    <Parameter name="GroupingZOut"  value="28"/>
+    <Parameter name="GroupingZOut"  value="28"/>
+    <Parameter name="LayerOffset"   value="0"/>
+  </SpecPar>
+  <SpecPar name="HGCalHESiliconSensitive">
+    <PartSelector path="//HGCalHESiliconSensitive.*"/>
+    <Parameter name="Volume" value="HGCalHESiliconSensitive" eval="false"/>
+    <Parameter name="Slope"  value="0.0"/>
+    <Parameter name="GroupingZFine"  value="1"/>
+    <Parameter name="GroupingZFine"  value="1"/>
+    <Parameter name="GroupingZFine"  value="1"/>
+    <Parameter name="GroupingZFine"  value="2"/>
+    <Parameter name="GroupingZFine"  value="2"/>
+    <Parameter name="GroupingZFine"  value="2"/>
+    <Parameter name="GroupingZFine"  value="3"/>
+    <Parameter name="GroupingZFine"  value="3"/>
+    <Parameter name="GroupingZFine"  value="3"/>
+    <Parameter name="GroupingZFine"  value="4"/>
+    <Parameter name="GroupingZFine"  value="4"/>
+    <Parameter name="GroupingZFine"  value="4"/>
+    <Parameter name="GroupingZFine"  value="5"/>
+    <Parameter name="GroupingZFine"  value="5"/>
+    <Parameter name="GroupingZFine"  value="5"/>
+    <Parameter name="GroupingZFine"  value="6"/>
+    <Parameter name="GroupingZFine"  value="6"/>
+    <Parameter name="GroupingZFine"  value="6"/>
+    <Parameter name="GroupingZFine"  value="7"/>
+    <Parameter name="GroupingZFine"  value="7"/>
+    <Parameter name="GroupingZFine"  value="7"/>
+    <Parameter name="GroupingZFine"  value="8"/>
+    <Parameter name="GroupingZFine"  value="8"/>
+    <Parameter name="GroupingZFine"  value="8"/>
+    <Parameter name="GroupingZFine"  value="9"/>
+    <Parameter name="GroupingZFine"  value="9"/>
+    <Parameter name="GroupingZFine"  value="9"/>
+    <Parameter name="GroupingZFine"  value="10"/>
+    <Parameter name="GroupingZFine"  value="10"/>
+    <Parameter name="GroupingZFine"  value="10"/>
+    <Parameter name="GroupingZFine"  value="11"/>
+    <Parameter name="GroupingZFine"  value="11"/>
+    <Parameter name="GroupingZFine"  value="11"/>
+    <Parameter name="GroupingZFine"  value="12"/>
+    <Parameter name="GroupingZFine"  value="12"/>
+    <Parameter name="GroupingZFine"  value="12"/>
+    <Parameter name="GroupingZMid"   value="1"/>
+    <Parameter name="GroupingZMid"   value="1"/>
+    <Parameter name="GroupingZMid"   value="1"/>
+    <Parameter name="GroupingZMid"   value="2"/>
+    <Parameter name="GroupingZMid"   value="2"/>
+    <Parameter name="GroupingZMid"   value="2"/>
+    <Parameter name="GroupingZMid"   value="3"/>
+    <Parameter name="GroupingZMid"   value="3"/>
+    <Parameter name="GroupingZMid"   value="3"/>
+    <Parameter name="GroupingZMid"   value="4"/>
+    <Parameter name="GroupingZMid"   value="4"/>
+    <Parameter name="GroupingZMid"   value="4"/>
+    <Parameter name="GroupingZMid"   value="5"/>
+    <Parameter name="GroupingZMid"   value="5"/>
+    <Parameter name="GroupingZMid"   value="5"/>
+    <Parameter name="GroupingZMid"   value="6"/>
+    <Parameter name="GroupingZMid"   value="6"/>
+    <Parameter name="GroupingZMid"   value="6"/>
+    <Parameter name="GroupingZMid"   value="7"/>
+    <Parameter name="GroupingZMid"   value="7"/>
+    <Parameter name="GroupingZMid"   value="7"/>
+    <Parameter name="GroupingZMid"   value="8"/>
+    <Parameter name="GroupingZMid"   value="8"/>
+    <Parameter name="GroupingZMid"   value="8"/>
+    <Parameter name="GroupingZMid"   value="9"/>
+    <Parameter name="GroupingZMid"   value="9"/>
+    <Parameter name="GroupingZMid"   value="9"/>
+    <Parameter name="GroupingZMid"   value="10"/>
+    <Parameter name="GroupingZMid"   value="10"/>
+    <Parameter name="GroupingZMid"   value="10"/>
+    <Parameter name="GroupingZMid"   value="11"/>
+    <Parameter name="GroupingZMid"   value="11"/>
+    <Parameter name="GroupingZMid"   value="11"/>
+    <Parameter name="GroupingZMid"   value="12"/>
+    <Parameter name="GroupingZMid"   value="12"/>
+    <Parameter name="GroupingZMid"   value="12"/>
+    <Parameter name="GroupingZOut"   value="1"/>
+    <Parameter name="GroupingZOut"   value="1"/>
+    <Parameter name="GroupingZOut"   value="1"/>
+    <Parameter name="GroupingZOut"   value="2"/>
+    <Parameter name="GroupingZOut"   value="2"/>
+    <Parameter name="GroupingZOut"   value="2"/>
+    <Parameter name="GroupingZOut"   value="3"/>
+    <Parameter name="GroupingZOut"   value="3"/>
+    <Parameter name="GroupingZOut"   value="3"/>
+    <Parameter name="GroupingZOut"   value="4"/>
+    <Parameter name="GroupingZOut"   value="4"/>
+    <Parameter name="GroupingZOut"   value="4"/>
+    <Parameter name="GroupingZOut"   value="5"/>
+    <Parameter name="GroupingZOut"   value="5"/>
+    <Parameter name="GroupingZOut"   value="5"/>
+    <Parameter name="GroupingZOut"   value="6"/>
+    <Parameter name="GroupingZOut"   value="6"/>
+    <Parameter name="GroupingZOut"   value="6"/>
+    <Parameter name="GroupingZOut"   value="7"/>
+    <Parameter name="GroupingZOut"   value="7"/>
+    <Parameter name="GroupingZOut"   value="7"/>
+    <Parameter name="GroupingZOut"   value="8"/>
+    <Parameter name="GroupingZOut"   value="8"/>
+    <Parameter name="GroupingZOut"   value="8"/>
+    <Parameter name="GroupingZOut"   value="9"/>
+    <Parameter name="GroupingZOut"   value="9"/>
+    <Parameter name="GroupingZOut"   value="9"/>
+    <Parameter name="GroupingZOut"   value="10"/>
+    <Parameter name="GroupingZOut"   value="10"/>
+    <Parameter name="GroupingZOut"   value="10"/>
+    <Parameter name="GroupingZOut"   value="11"/>
+    <Parameter name="GroupingZOut"   value="11"/>
+    <Parameter name="GroupingZOut"   value="11"/>
+    <Parameter name="GroupingZOut"   value="12"/>
+    <Parameter name="GroupingZOut"   value="12"/>
+    <Parameter name="GroupingZOut"   value="12"/>
+    <Parameter name="LayerOffset"    value="28"/>
+  </SpecPar>
+</SpecParSection>
+
+</DDDefinition>
diff --git a/Geometry/HGCalTBCommonData/data/TB181/Oct181/hgcalEE.xml b/Geometry/HGCalTBCommonData/data/TB181/Oct181/hgcalEE.xml
new file mode 100644
index 0000000000000..96a57e0f7db16
--- /dev/null
+++ b/Geometry/HGCalTBCommonData/data/TB181/Oct181/hgcalEE.xml
@@ -0,0 +1,151 @@
+<?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="hgcalEE.xml" eval="true">
+  <Constant name="rMinFine"   value="0.0*fm"/>
+  <Constant name="rMaxFine"   value="0.0*cm"/>
+  <Constant name="rMaxMiddle" value="120.0*cm"/>
+  <Constant name="rMaxCoarse" value="2000.0*cm"/>
+  <Constant name="rMin"       value="0.0*fm"/>
+  <Constant name="rMax"       value="[hgcal:rmaxEE]"/>
+  <Constant name="rMaxB"      value="[hgcal:rmaxEEF]"/>
+  <Constant name="absorbW"    value="0.5*[hgcal:WaferW]"/>
+  <Constant name="absorbH"    value="[hgcal:WaferW]*[hgcal:tan30deg]"/>
+</ConstantsSection>
+
+<PosPartSection label="hgcalEE.xml">
+  <Algorithm name="hgcal:DDHGCalTBModuleX">
+    <rParent name="hgcal:HGCalEE"/>
+    <String name="GeneralMaterial" value="materials:Air"/>
+    <Vector name="WaferName" type="string" nEntries="2">
+      hgcalwafer:HGCalEEWaferFine, hgcalwafer:HGCalEEWaferCoarse</Vector>
+    <Vector name="CoverName" type="string" nEntries="11">
+      hgcal:HGCalEESensitive,        hgcal:HGCalEEPCB,            
+      hgcal:HGCalEEKapton,           hgcal:HGCalEEAbsorber, 
+      hgcal:HGCalEECuAbsorber,       hgcal:HGCalEEAbsorber48To63, 
+      hgcal:HGCalEEAbsorber52To70,   hgcal:HGCalEEAbsorber59To62, 
+      hgcal:HGCalEEAbsorber68To74,   hgcal:HGCalEECuKapton,
+      hgcal:HGCalEECuPCB</Vector>
+    <Vector name="MaterialNames" type="string" nEntries="29">
+      materials:Air,       materials:Air,    materials:Air, 
+      materials:Air,       materials:Air,    materials:Air,
+      materials:Air,       materials:Air,    materials:StainlessSteel, 
+      materials:Lead,      materials:Copper, materials:Air, 
+      materials:Aluminium, materials:Air,    materials:Air,   
+      materials:Air,       materials:Air,    materials:Air,
+      materials:Air,       materials:Air,    materials:Air,
+      materials:Air,       materials:Air,    materials:Air,
+      materials:Iron,      materials:Air,    materials:Air,
+      materials:Air,       materials:Aluminium</Vector>
+    <Vector name="VolumeNames" type="string" nEntries="29">
+      EEPCB,             EEKapton,          EECuWShield, 
+      EECuShield,        EECuWShield48To63, EECuWShield52To70,
+      EECuWShield59To62, EECuWShield68To74, EEFeAbsorber, 
+      EEPbAbsorber,      EECuHeatShield,    EESensitive, 
+      EEAlcase,          EEgap1,            EEgap2,      
+      EEgap3,            EEgap4,            EEgap5,      
+      EEgap6,            EEgap7,            EEgap8,      
+      EEgap9,            EEgap10,           EEgap11,      
+      EEFHAbs,           EECuKapton,        EECuPCB,
+      EEgap12,           EEMCPAl</Vector>
+    <Vector name="Thickness" type="numeric" nEntries="29">
+      [hgcal:thPCB],         [hgcal:thKapton],      [hgcal:thAbsEE], 
+      [hgcal:thAbsCuEE],     [hgcal:thAbsEE48To63], [hgcal:thAbsEE52To70],
+      [hgcal:thAbsEE59To62], [hgcal:thAbsEE68To74], 0.3*mm,        
+      4.9*mm,                6.0*mm,                [hgcal:thSilicon],
+      2.1*mm,                3.095*mm,              3.145*mm, 
+      3.7*mm,                4.7*mm,                5.5*mm,
+      6.7*mm,                7.7*mm,                8.7*mm,
+      9.5*mm,                10.09*mm,              119.7*mm,
+      40.0*mm,               [hgcal:thCuKapton],    [hgcal:thCuPCB],
+      44.0*mm,               5.0*mm</Vector>
+    <Vector name="BlockThick" type="numeric" nEntries="15"> 
+      144.15*mm, 29.05*mm,  29.05*mm, 
+      30.05*mm,  30.05*mm,  30.05*mm, 
+      28.05*mm,  28.05*mm,  28.05*mm, 
+      28.05*mm,  32.25*mm,  35.05*mm, 
+      30.295*mm, 30.835*mm, 86.10*mm
+    </Vector>
+    <Numeric name="InOut"   value="1"/>
+    <Vector name="LayerFrontIn" type="numeric" nEntries="15"> 
+       0, 23, 45, 67, 89,111,133,155,177,199,221,245,269,293,317</Vector>
+    <Vector name="LayerBackIn" type="numeric" nEntries="15"> 
+      22, 44, 66, 88,110,132,154,176,198,220,244,268,292,316,319</Vector>
+    <Vector name="LayerType" type="numeric" nEntries="320"> 
+      12, 23, 8, 9, 8, 16, 0, 26, 11, 11, 11, 25, 1, 2, 10, 2, 1, 25, 11, 11, 11, 26, 0,
+      19, 8, 9, 8, 15, 0, 26, 11, 11, 11, 25, 1, 2, 10, 2, 1, 25, 11, 11, 11, 26, 0,
+      19, 8, 9, 8, 15, 0, 26, 11, 11, 11, 25, 1, 2, 10, 2, 1, 25, 11, 11, 11, 26, 0,
+      20, 8, 9, 8, 15, 0, 26, 11, 11, 11, 25, 1, 2, 10, 2, 1, 25, 11, 11, 11, 26, 0,
+      20, 8, 9, 8, 15, 0, 26, 11, 11, 11, 25, 1, 2, 10, 2, 1, 25, 11, 11, 11, 26, 0,
+      20, 8, 9, 8, 15, 0, 26, 11, 11, 11, 25, 1, 2, 10, 2, 1, 25, 11, 11, 11, 26, 0,
+      18, 8, 9, 8, 15, 0, 26, 11, 11, 11, 25, 1, 2, 10, 2, 1, 25, 11, 11, 11, 26, 0,
+      18, 8, 9, 8, 15, 0, 26, 11, 11, 11, 25, 1, 2, 10, 2, 1, 25, 11, 11, 11, 26, 0,
+      18, 8, 9, 8, 15, 0, 26, 11, 11, 11, 25, 1, 2, 10, 2, 1, 25, 11, 11, 11, 26, 0,
+      18, 8, 9, 8, 15, 0, 26, 11, 11, 11, 25, 1, 2, 10, 2, 1, 25, 11, 11, 11, 26, 0,
+      18, 8, 9, 8, 17, 0, 26, 11, 11, 11, 25, 1, 3, 2, 10, 2, 3, 1, 25, 11, 11, 11, 26, 0,
+      21, 8, 9, 8, 17, 0, 26, 11, 11, 11, 25, 1, 3, 2, 10, 2, 3, 1, 25, 11, 11, 11, 26, 0,
+      21, 8, 9, 8, 14, 0, 26, 11, 11, 11, 25, 1, 5, 5, 10, 5, 5, 1, 25, 11, 11, 11, 26, 0,
+      22, 8, 9, 8, 13, 0, 26, 11, 11, 11, 25, 1, 5, 5, 10, 5, 5, 1, 25, 11, 11, 11, 26, 0,
+      24, 27, 12
+    </Vector>
+    <Vector name="LayerSense" type="numeric" nEntries="320">
+      0, 0, 0, 0, 0, 0, 2, 11, 1, 1, 1, 10, 3, 4, 0, 4, 3, 10, 1, 1, 1, 11, 2,
+      0, 0, 0, 0, 0, 2, 11, 1, 1, 1, 10, 3, 4, 0, 4, 3, 10, 1, 1, 1, 11, 2,
+      0, 0, 0, 0, 0, 2, 11, 1, 1, 1, 10, 3, 4, 0, 4, 3, 10, 1, 1, 1, 11, 2,
+      0, 0, 0, 0, 0, 2, 11, 1, 1, 1, 10, 3, 4, 0, 4, 3, 10, 1, 1, 1, 11, 2,
+      0, 0, 0, 0, 0, 2, 11, 1, 1, 1, 10, 3, 4, 0, 4, 3, 10, 1, 1, 1, 11, 2,
+      0, 0, 0, 0, 0, 2, 11, 1, 1, 1, 10, 3, 4, 0, 4, 3, 10, 1, 1, 1, 11, 2,
+      0, 0, 0, 0, 0, 2, 11, 1, 1, 1, 10, 3, 4, 0, 4, 3, 10, 1, 1, 1, 11, 2,
+      0, 0, 0, 0, 0, 2, 11, 1, 1, 1, 10, 3, 4, 0, 4, 3, 10, 1, 1, 1, 11, 2,
+      0, 0, 0, 0, 0, 2, 11, 1, 1, 1, 10, 3, 4, 0, 4, 3, 10, 1, 1, 1, 11, 2,
+      0, 0, 0, 0, 0, 2, 11, 1, 1, 1, 10, 3, 4, 0, 4, 3, 10, 1, 1, 1, 11, 2,
+      0, 0, 0, 0, 0, 2, 11, 1, 1, 1, 10, 3, 5, 4, 0, 4, 5, 3, 10, 1, 1, 1, 11, 2,
+      0, 0, 0, 0, 0, 2, 11, 1, 1, 1, 10, 3, 5, 4, 0, 4, 5, 3, 10, 1, 1, 1, 11, 2,
+      0, 0, 0, 0, 0, 2, 11, 1, 1, 1, 10, 3, 7, 7, 0, 7, 7, 3, 10, 1, 1, 1, 11, 2,
+      0, 0, 0, 0, 0, 2, 11, 1, 1, 1, 10, 3, 7, 7, 0, 7, 7, 3, 10, 1, 1, 1, 11, 2,
+      0, 0, 0
+    </Vector>
+    <Vector name="MaxModule" nEntries="320">
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0
+    </Vector>
+    <Numeric name="zMinBlock"   value="[hgcal:zminEE]"/>
+    <Numeric name="rMaxFine"    value="[rMaxFine]"/>
+    <Numeric name="waferW"      value="[hgcal:WaferW]"/>
+    <Numeric name="waferGap"    value="0.0*fm"/>
+    <Numeric name="absorberW"   value="[hgcalEE:absorbW]"/>
+    <Numeric name="absorberH"   value="[hgcalEE:absorbH]"/>
+    <Numeric name="rMax"        value="[rMax]"/>
+    <Numeric name="rMaxB"       value="[rMaxB]"/>
+  </Algorithm>
+</PosPartSection> 
+
+<SpecParSection label="hgcalEE.xml" eval="true">
+  <SpecPar name="HGCalEE">
+    <PartSelector path="//HGCalEESensitive.*"/>    
+    <Parameter name="Volume" value="HGCalEESensitive" eval="false"/>
+    <Parameter name="GeometryMode" value="HGCalGeometryMode::Hexagon" eval="false"/>
+    <Parameter name="RadiusBound"  value="[rMinFine]"/>
+    <Parameter name="RadiusBound"  value="[rMaxFine]"/>
+    <Parameter name="RadiusBound"  value="[rMaxMiddle]"/>
+    <Parameter name="RadiusBound"  value="[rMaxCoarse]"/>
+    <Parameter name="RadiusLimits" value="[rMin]"/>
+    <Parameter name="RadiusLimits" value="[rMax]"/>
+    <Parameter name="LevelTop"     value="99"/>
+  </SpecPar>
+</SpecParSection>
+
+</DDDefinition>
diff --git a/Geometry/HGCalTBCommonData/data/TB181/Oct181/hgcalHE.xml b/Geometry/HGCalTBCommonData/data/TB181/Oct181/hgcalHE.xml
new file mode 100644
index 0000000000000..44ee4ea80f323
--- /dev/null
+++ b/Geometry/HGCalTBCommonData/data/TB181/Oct181/hgcalHE.xml
@@ -0,0 +1,216 @@
+<?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="hgcalHE.xml" eval="true">
+  <Constant name="rMinFine"   value="0.0*fm"/>
+  <Constant name="rMaxFine"   value="0.0*fm"/>
+  <Constant name="rMaxMiddle" value="0.0*fm"/>
+  <Constant name="rMaxCoarse" value="2000.0*cm"/>
+  <Constant name="rMin"       value="[hgcal:rminHE]"/>
+  <Constant name="rMax"       value="[hgcal:rmaxHE]"/>
+  <Constant name="rMaxB"      value="[hgcal:rmaxHEF]"/>
+  <Constant name="absorbW"    value="1.5*[hgcal:WaferW]"/>
+  <Constant name="absorbH"    value="1.5*[hgcal:WaferW]"/>
+</ConstantsSection>
+
+<PosPartSection label="hgcalHE.xml">
+  <Algorithm name="hgcal:DDHGCalTBModuleX">
+    <rParent name="hgcal:HGCalHE"/>
+    <String name="GeneralMaterial" value="materials:Air"/>
+    <Vector name="WaferName" type="string" nEntries="2">
+      hgcalwafer:HGCalHEWaferFine, hgcalwafer:HGCalHEWaferCoarse</Vector>
+    <Vector name="CoverName" type="string" nEntries="9">
+      hgcal:HGCalHESiliconSensitive, hgcal:HGCalHEPCB,
+      hgcal:HGCalHEKapton,           hgcal:HGCalHEAbsorber,
+      hgcal:HGCalHECuAbsorber,       hgcal:HGCalHEPCBAbsorber,
+      hgcal:HGCalHECuKapton,         hgcal:HGCalHECuPCB,
+      hgcal:HGCalHEAirAbsorber</Vector>
+    <Vector name="MaterialNames" type="string" nEntries="64">
+      materials:Air,    materials:Air,    materials:Air,
+      materials:Air,    materials:Air,    materials:Iron, 
+      materials:Copper, materials:Air,    materials:Iron,
+      materials:Air,    materials:Air,    materials:Air,
+      materials:Air,    materials:Air,    materials:Air,
+      materials:Air,    materials:Air,    materials:Air,
+      materials:Air,    materials:Air,    materials:Air,
+      materials:Air,    materials:Air,    materials:Air,
+      materials:Air,    materials:Air,    materials:Air,
+      materials:Air,    materials:Air,    materials:Air,
+      materials:Air,    materials:Air,
+      materials:Air,    materials:Air,    materials:Air,
+      materials:Air,    materials:Air,    materials:Iron, 
+      materials:Copper, materials:Air,    materials:Iron,
+      materials:Air,    materials:Air,    materials:Air,
+      materials:Air,    materials:Air,    materials:Air,
+      materials:Air,    materials:Air,    materials:Air,
+      materials:Air,    materials:Air,    materials:Air,
+      materials:Air,    materials:Air,    materials:Air,
+      materials:Air,    materials:Air,    materials:Air,
+      materials:Air,    materials:Air,    materials:Air,
+      materials:Air,    materials:Air</Vector>
+    <Vector name="VolumeNames" type="string" nEntries="64">
+      HEPCB,          HEKapton,           HECuWShield, 
+      HECuShield,     HEPCBShield,        HEFeAbsorber,
+      HECuHeatShield, HESiliconSensitive, HEFeBox, 
+      HEAirGap1,      HEAirGap2,          HEAirGap3, 
+      HEAirGap4,      HEAirGap5,          HEAirGap6, 
+      HEAirGap7,      HEAirGap8,          HEAirGap9,
+      HEAirGap10,     HEAirGap11,         HEAirGap12,
+      HEAirGap13,     HEAirGap14,         HEAirGap15,
+      HEAirGap16,     HEAirGap17,         HEAirGap18,
+      HECuKapton,     HECuPCB,            HEAirGap19,
+      HEAirGap20,     HEAirGap21,
+      HEPCB,          HEKapton,           HECuWShield, 
+      HECuShield,     HEPCBShield,        HEFeAbsorber,
+      HECuHeatShield, HESiliconSensitive, HEFeBox, 
+      HEAirGap1,      HEAirGap2,          HEAirGap3, 
+      HEAirGap4,      HEAirGap5,          HEAirGap6, 
+      HEAirGap7,      HEAirGap8,          HEAirGap9,
+      HEAirGap10,     HEAirGap11,         HEAirGap12,
+      HEAirGap13,     HEAirGap14,         HEAirGap15,
+      HEAirGap16,     HEAirGap17,         HEAirGap18,
+      HECuKapton,     HECuPCB,            HEAirGap19,
+      HEAirGap20,     HEAirGap21</Vector>
+    <Vector name="Thickness" type="numeric" nEntries="64">
+      [hgcal:thPCB],      [hgcal:thKapton],   [hgcal:thAbsHE], 
+      [hgcal:thAbsCuHE],  [hgcal:thAbsPCBHE], 40.0*mm,
+      6.0*mm,             [hgcal:thSilicon],  9.0*mm, 
+      10.7*mm,            12.8*mm,            13.8*mm, 
+      14.8*mm,            16.8*mm,            17.0*mm, 
+      18.0*mm,            3.0*mm,             4.0*mm, 
+      5.0*mm,             6.0*mm,             7.0*mm, 
+      8.0*mm,             9.0*mm,             10.0*mm, 
+      36.0*mm,            52.0*mm,            29.0*mm,
+      [hgcal:thCuKapton], [hgcal:thCuPCB],    8.8*mm,
+      9.8*mm,             [hgcal:thAbsCuHE],
+      [hgcal:thPCB],      [hgcal:thKapton],   [hgcal:thAbsHE], 
+      [hgcal:thAbsCuHE],  [hgcal:thAbsPCBHE], 40.0*mm,
+      6.0*mm,             [hgcal:thSilicon],  9.0*mm, 
+      10.7*mm,            12.8*mm,            13.8*mm, 
+      14.8*mm,            16.8*mm,            17.0*mm, 
+      18.0*mm,            3.0*mm,             4.0*mm, 
+      5.0*mm,             6.0*mm,             7.0*mm, 
+      8.0*mm,             9.0*mm,             10.0*mm, 
+      36.0*mm,            52.0*mm,            29.0*mm,
+      [hgcal:thCuKapton], [hgcal:thCuPCB],    8.8*mm,
+      9.8*mm,             [hgcal:thAbsCuHE]</Vector>
+    <Vector name="BlockThick" type="numeric" nEntries="12">
+      28.075*mm,  67.075*mm,  67.075*mm, 
+      68.075*mm,  66.975*mm,  67.075*mm, 
+      169.075*mm, 74.075*mm,  74.075*mm, 
+      77.075*mm,  74.075*mm,  111.075*mm
+      </Vector>
+    <Numeric name="InOut"   value="2"/>
+    <Vector name="LayerFrontIn" type="numeric" nEntries="12"> 
+       0, 12, 25, 38, 51, 62, 77, 94,107,120,132,144</Vector>
+    <Vector name="LayerBackIn" type="numeric" nEntries="12"> 
+      11, 24, 37, 50, 61, 76, 93,106,119,131,143,157</Vector>
+    <Vector name="LayerFrontOut" type="numeric" nEntries="12"> 
+     158,170,183,196,209,220,235,252,265,278,290,302</Vector>
+    <Vector name="LayerBackOut" type="numeric" nEntries="12"> 
+     169,182,195,208,219,234,251,264,277,289,301,315</Vector>
+    <Vector name="LayerType" type="numeric" nEntries="316"> 
+      8,  29,  0, 28,  7,  7,  7, 27,  1,  3,  3,  6,
+      21,  5, 29,  0, 28,  7,  7,  7, 27,  1,  3,  3,  6,
+      16,  5, 11,  0, 28,  7,  7,  7, 27,  1,  3,  3,  6,
+      18,  5, 10,  0, 28,  7,  7,  7, 27,  1,  3,  3,  6,
+      20,  5, 30,  0, 28,  7,  7,  7,  4,  3,  6, 
+      19,  5,  9,  0, 28,  7,  7,  7, 27,  1, 27,  1,  3,  3,  6,
+      17,  8, 24,  5, 25,  8, 29,  0, 28,  7,  7,  7, 27,  1,  3,  3,  6, 
+      20,  5, 13,  0, 28,  7,  7,  7, 27,  1,  3,  3,  6,
+      22,  5, 12,  0, 28,  7,  7,  7, 27,  1,  2,  3,  6,
+      23,  5, 15,  0, 28,  7,  7,  7, 27,  1,  2,  6,
+      21,  5, 14,  0, 28,  7,  7,  7, 27,  1,  3,  6,
+      20,  5, 14,  0, 28,  7,  7,  7, 27,  1,  3,  6, 26,  8,
+      40, 61, 32, 60, 39, 39, 39, 59, 33, 35, 63, 38,
+      53, 37, 61, 32, 60, 39, 39, 39, 59, 33, 35, 63, 38,
+      48, 37, 43, 32, 60, 39, 39, 39, 59, 33, 35, 63, 38,
+      50, 37, 42, 32, 60, 39, 39, 39, 59, 33, 35, 63, 38,
+      52, 37, 62, 32, 60, 39, 39, 39, 36, 63, 38, 
+      51, 37, 41, 32, 60, 39, 39, 39, 59, 33, 59, 33, 35, 63, 38,
+      49, 40, 56, 37, 57, 40, 61, 32, 60, 39, 39, 39, 59, 33, 35, 63, 38, 
+      52, 37, 45, 32, 60, 39, 39, 39, 59, 33, 35, 63, 38,
+      54, 37, 44, 32, 60, 39, 39, 39, 59, 33, 34, 63, 38,
+      55, 37, 47, 32, 60, 39, 39, 39, 59, 33, 34, 38,
+      53, 37, 46, 32, 60, 39, 39, 39, 59, 33, 35, 38,
+      52, 37, 46, 32, 60, 39, 39, 39, 59, 33, 35, 38, 58, 40
+    </Vector>
+    <Vector name="LayerSense" type="numeric" nEntries="316">
+      0, 0, 2, 8, 1, 1, 1, 7, 3, 5, 5, 0,
+      0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 5, 5, 0,
+      0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 5, 5, 0,
+      0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 5, 5, 0,
+      0, 0, 0, 2, 8, 1, 1, 1, 6, 5, 0,
+      0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 7, 3, 5, 5, 0,
+      0, 0, 0, 0, 0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 5, 5, 0,
+      0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 5, 5, 0,
+      0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 4, 5, 0,
+      0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 4, 0,
+      0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 5, 0,
+      0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 5, 0, 0, 0,
+      0, 0, 2, 8, 1, 1, 1, 7, 3, 5, 9, 0,
+      0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 5, 9, 0,
+      0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 5, 9, 0,
+      0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 5, 9, 0,
+      0, 0, 0, 2, 8, 1, 1, 1, 6, 9, 0,
+      0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 7, 3, 5, 9, 0,
+      0, 0, 0, 0, 0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 5, 9, 0,
+      0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 5, 9, 0,
+      0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 4, 9, 0,
+      0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 4, 0,
+      0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 5, 0,
+      0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 5, 0, 0, 0
+    </Vector>
+    <Vector name="MaxModule" nEntries="316">
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0,
+      0, 0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0,
+      0, 0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0,
+      0, 0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0,
+      0, 0, 0, 2, 2, 2, 2, 2, 2, 2, 0,
+      0, 0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0,
+      0, 0, 0, 0, 0, 0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0,
+      0, 0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0,
+      0, 0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+    </Vector>
+    <Numeric name="zMinBlock"   value="[hgcal:zminHE]"/>
+    <Numeric name="rMaxFine"    value="[rMaxFine]"/>
+    <Numeric name="waferW"      value="[hgcal:WaferW]"/>
+    <Numeric name="waferGap"    value="1.0*mm"/>
+    <Numeric name="absorberW"   value="[hgcalHE:absorbW]"/>
+    <Numeric name="absorberH"   value="[hgcalHE:absorbH]"/>
+    <Numeric name="rMax"        value="[rMax]"/>
+    <Numeric name="rMaxB"       value="[rMaxB]"/>
+  </Algorithm>
+</PosPartSection> 
+
+<SpecParSection label="hgcalHE.xml" eval="true">
+  <SpecPar name="HGCalHE">
+    <PartSelector path="//HGCalHESiliconSensitive.*"/>
+    <Parameter name="Volume" value="HGCalHESiliconSensitive" eval="false"/>
+    <Parameter name="GeometryMode" value="HGCalGeometryMode::Hexagon" eval="false"/>
+    <Parameter name="RadiusBound"  value="[rMinFine]"/>
+    <Parameter name="RadiusBound"  value="[rMaxFine]"/>
+    <Parameter name="RadiusBound"  value="[rMaxMiddle]"/>
+    <Parameter name="RadiusBound"  value="[rMaxCoarse]"/>
+    <Parameter name="RadiusLimits" value="[rMin]"/>
+    <Parameter name="RadiusLimits" value="[rMax]"/>
+    <Parameter name="LevelTop"     value="99"/>
+  </SpecPar>
+</SpecParSection>
+
+</DDDefinition>
diff --git a/Geometry/HGCalTBCommonData/data/TB181/Oct181/hgcalsense.xml b/Geometry/HGCalTBCommonData/data/TB181/Oct181/hgcalsense.xml
new file mode 100644
index 0000000000000..81888d5e3a8cb
--- /dev/null
+++ b/Geometry/HGCalTBCommonData/data/TB181/Oct181/hgcalsense.xml
@@ -0,0 +1,16 @@
+<?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">
+
+<SpecParSection label="hgcalsense.xml" eval="true">
+  <SpecPar name="hgcee">
+    <PartSelector path="//HGCalEECell.*"/>
+    <Parameter name="SensitiveDetector" value="HGCSensitiveDetector" eval="false"/>
+    <Parameter name="ReadOutName" value="HGCHitsEE" eval="false"/>
+  </SpecPar>
+  <SpecPar name="hgcfh">
+    <PartSelector path="//.*HGCalHECell.*"/> 
+    <Parameter name="SensitiveDetector" value="HGCSensitiveDetector" eval="false"/>
+    <Parameter name="ReadOutName" value="HGCHitsHEfront" eval="false"/>
+  </SpecPar>
+</SpecParSection>
+</DDDefinition>
diff --git a/Geometry/HGCalTBCommonData/data/TB181/Oct182/ahcal.xml b/Geometry/HGCalTBCommonData/data/TB181/Oct182/ahcal.xml
new file mode 100644
index 0000000000000..834e1256ae54a
--- /dev/null
+++ b/Geometry/HGCalTBCommonData/data/TB181/Oct182/ahcal.xml
@@ -0,0 +1,214 @@
+<?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="ahcal.xml" eval="true">
+  <Constant name="absorberThick" value="17.2*mm"/>
+  <Constant name="radiatorThick" value="17.2*mm"/>
+  <Constant name="airgapThick"   value="1.285*mm"/>
+  <Constant name="cassetteThick" value="0.5*mm"/>
+  <Constant name="cableThick"    value="1.5*mm"/>
+  <Constant name="pcbThick"      value="0.7*mm"/>
+  <Constant name="foilThick"     value="0.115*mm"/>
+  <Constant name="scintThick"    value="3.0*mm"/>
+  <Constant name="passiveHeight" value="72.0*cm"/>
+  <Constant name="passiveWidth"  value="72.0*cm"/>
+  <Constant name="activeHeight"  value="72.0*cm"/>
+  <Constant name="activeWidth"   value="72.0*cm"/>
+  <Constant name="tileGap"       value="30.0*mm"/>
+  <Constant name="tileHeight"    value="30*mm"/>
+  <Constant name="tileWidth"     value="30*mm"/>
+  <Constant name="tileEdge"      value="0.1*mm"/>
+</ConstantsSection>
+
+<MaterialSection label="ahcal.xml">
+  <CompositeMaterial name="Steel235" density="7.87*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.9843">
+      <rMaterial name="materials:Iron"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.0017">
+      <rMaterial name="materials:Carbon"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.0140">
+      <rMaterial name="materials:Manganese"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+  <CompositeMaterial name="PCB" density="1.70*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.180774">
+      <rMaterial name="materials:Silicon"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.405633">
+      <rMaterial name="materials:Oxygen"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.278042">
+      <rMaterial name="materials:Carbon"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.0684428">
+      <rMaterial name="materials:Hydrogen"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.0671091">
+      <rMaterial name="materials:Bromine"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+  <CompositeMaterial name="Polystyrene" density="1.060*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.077418">
+      <rMaterial name="materials:Hydrogen"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.922582">
+      <rMaterial name="materials:Carbon"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+  <CompositeMaterial name="PVC" density="1.35*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.048384">
+      <rMaterial name="materials:Hydrogen"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.384378">
+      <rMaterial name="materials:Carbon"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.567238">
+      <rMaterial name="materials:Chlorine"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+  <CompositeMaterial name="Polystyrole" density="1.065*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.077421">
+      <rMaterial name="materials:Hydrogen"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.922579">
+      <rMaterial name="materials:Carbon"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+  <CompositeMaterial name="CFM" density="0.120*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.009">
+      <rMaterial name="materials:Air"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.872">
+      <rMaterial name="ahcal:PVC"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.119">
+      <rMaterial name="ahcal:Polystyrole"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+</MaterialSection>
+
+
+<SolidSection label="ahcal.xml">
+  <Box name="AHcalTileSensitive" dx="[tileWidth]/2" dy="[tileHeight]/2"
+       dz="[scintThick]/2"/>
+</SolidSection>
+
+<LogicalPartSection label="ahcal.xml">
+  <LogicalPart name="AHcalTileSensitive" category="unspecified">
+    <rSolid name="AHcalTileSensitive"/>
+    <rMaterial name="ahcal:Polystyrene"/>
+  </LogicalPart>
+</LogicalPartSection>
+
+<PosPartSection label="ahcal.xml">
+  <Algorithm name="hgcal:DDAHcalModuleAlgo">
+    <rParent name="hgcal:HGCalAH"/>
+    <String name="TileName" value="ahcal:AHcalTileSensitive"/>
+    <Vector name="MaterialNames" type="string" nEntries="10">
+      ahcal:Steel235, materials:Air, ahcal:Steel235, ahcal:CFM, ahcal:PCB, 
+      ahcal:Polystyrole, ahcal:Polystyrene, ahcal:Steel235, ahcal:Steel235, 
+      materials:Air</Vector>
+    <Vector name="VolumeNames" type="string" nEntries="10">
+      AHcalRadiator, AHcalAirGa1p, AHcalCassette, AHcalCable, AHcalPCB,
+      AHcalFoil, AHcalActive, AHcalAbsorber, AHcalAbsorberLastCover,
+      AHcalAirGap2</Vector>
+    <Vector name="Thickness" type="numeric" nEntries="10">
+      [ahcal:radiatorThick], [ahcal:airgapThick], [ahcal:cassetteThick], 
+      [ahcal:cableThick], [ahcal:pcbThick], [ahcal:foilThick], 
+      [ahcal:scintThick], [ahcal:absorberThick], 5.0*mm,
+      9.0*mm</Vector>
+    <Vector name="Layers" type="numeric" nEntries="22"> 
+      20, 20, 20, 20, 20, 
+      20, 20, 20, 20, 20, 
+      20, 20, 20, 20, 20, 
+      20, 20, 20, 20, 4, 
+      12, 3
+    </Vector>
+    <Vector name="LayerThick" type="numeric" nEntries="22"> 
+      52.4*mm, 52.4*mm, 52.4*mm, 52.4*mm, 52.4*mm, 
+      52.4*mm, 52.4*mm, 52.4*mm, 52.4*mm, 52.4*mm, 
+      52.4*mm, 52.4*mm, 52.4*mm, 52.4*mm, 52.4*mm, 
+      52.4*mm, 52.4*mm, 52.4*mm, 52.4*mm, 52.4*mm, 
+      44.685*mm, 43.4*mm
+      </Vector>
+    <Vector name="LayerType" type="numeric" nEntries="399"> 
+      7, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1,
+      0, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1,
+      0, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1,
+      0, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1,
+      0, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1,
+      0, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1, 
+      0, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1, 
+      0, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1, 
+      0, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1, 
+      0, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1, 
+      0, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1, 
+      0, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1, 
+      0, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1, 
+      0, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1, 
+      0, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1, 
+      0, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1, 
+      0, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1, 
+      0, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1, 
+      0, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1, 
+      0, 9, 0, 9, 
+      0, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 
+      0, 9, 0
+    </Vector>
+    <Vector name="LayerSense" type="numeric" nEntries="399">
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
+      0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 
+      0, 0, 0
+    </Vector>
+    <Vector name="Widths" type="numeric" nEntries="2">
+      [ahcal:passiveWidth], [ahcal:activeWidth] </Vector>
+    <Vector name="Heights" type="numeric" nEntries="2">
+      [ahcal:passiveHeight], [ahcal:activeHeight] </Vector>
+    <Vector name="TileN" type="numeric" nEntries="2">
+      24, 24 </Vector>
+    <Vector name="TileStep" type="numeric" nEntries="2">
+      [ahcal:tileGap], [ahcal:tileGap] </Vector>
+    <Numeric name="zMinBlock"   value="[hgcal:zminAH]"/>
+    <String name="RotNameSpace" value="hgcalmodule"/>
+  </Algorithm>
+</PosPartSection> 
+
+<SpecParSection label="ahcal.xml" eval="true">
+  <SpecPar name="AHcal">
+    <PartSelector path="//AHcalTileSensitive.*"/>
+    <Parameter name="Volume" value="AHcalTileSensitive" eval="false"/>
+    <Parameter name="SensitiveDetector" value="AHcalSensitiveDetector" eval="false"/>
+    <Parameter name="ReadOutName" value="HcalHits" eval="false"/>
+  </SpecPar>
+  <SpecPar name="hgcProdCutsAHcal">
+    <PartSelector path="//HGCalAH"/>
+    <Parameter name="CMSCutsRegion" value="HGCalAHcalRegion" eval="false"/>
+    <Parameter name="ProdCutsForElectrons" value="1.0*mm"/>
+<Parameter name="ProdCutsForProtons" value="1.0*mm"/>
+    <Parameter name="ProdCutsForPositrons" value="1.0*mm"/>
+    <Parameter name="ProdCutsForGamma"     value="1.0*mm"/>
+  </SpecPar>
+</SpecParSection>
+
+</DDDefinition>
diff --git a/Geometry/HGCalTBCommonData/data/TB181/Oct182/hgcal.xml b/Geometry/HGCalTBCommonData/data/TB181/Oct182/hgcal.xml
new file mode 100644
index 0000000000000..8c2f1f683aaf6
--- /dev/null
+++ b/Geometry/HGCalTBCommonData/data/TB181/Oct182/hgcal.xml
@@ -0,0 +1,259 @@
+<?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="rmin"          value="0.0*fm"/>
+  <Constant name="rmax"          value="52.0*cm"/>
+  <Constant name="zCaloFront"    value="[cms:zCaloFront]"/>
+  <Constant name="rminEE"        value="0.0*fm"/>
+  <Constant name="rmaxEE"        value="8.0*cm"/>
+  <Constant name="rmaxEEF"       value="9.5*cm"/>
+  <Constant name="zminEE"        value="0.0*fm"/>
+  <Constant name="zmaxEE"        value="63.0*cm"/>
+  <Constant name="rminHE"        value="0.0*fm"/>
+  <Constant name="rmaxHE"        value="19.5*cm"/>
+  <Constant name="rmaxHEF"       value="26.5*cm"/>
+  <Constant name="zminHE"        value="0.0*fm"/>
+  <Constant name="zmaxHE"        value="94.5*cm"/>
+  <Constant name="rminAH"        value="0.0*fm"/>
+  <Constant name="rmaxAH"        value="[rmax]"/>
+  <Constant name="zminAH"        value="0.0*fm"/>
+  <Constant name="zmaxAH"        value="114*cm"/>
+  <Constant name="zgapEEFH"      value="3.5*cm"/>
+  <Constant name="zgapFHBH"      value="36.5*cm"/>
+  <Constant name="zCalor"        value="([zmaxEE]+[zgapEEFH]+[zmaxHE]+[zgapFHBH]+
+					[zmaxAH])/2.0"/>
+  <Constant name="zposCalo"      value="([zCaloFront]+[zCalor])"/>
+  <Constant name="zposEE"        value="-[zCalor]"/>
+  <Constant name="zposHE"        value="[zposEE]+[zmaxEE]+[zgapEEFH]"/>
+  <Constant name="zposAH"        value="[zposHE]+[zmaxHE]+[zgapFHBH]"/>
+  <Constant name="thSilicon"     value="0.1*mm"/>
+  <Constant name="thPCB"         value="1.3*mm"/>
+  <Constant name="thKapton"      value="0.075*mm"/>
+  <Constant name="thCuKapton"    value="0.025*mm"/>
+  <Constant name="thCuPCB"       value="0.175*mm"/>
+  <Constant name="thAbsEE"       value="1.2*mm"/>
+  <Constant name="thAbsEE48To63" value="0.55*mm"/>
+  <Constant name="thAbsEE52To70" value="0.60*mm"/>
+  <Constant name="thAbsEE59To62" value="0.61*mm"/>
+  <Constant name="thAbsEE68To74" value="0.71*mm"/>
+  <Constant name="thAbsCuEE"     value="1.2*mm"/>
+  <Constant name="thAbsHE"       value="1.2*mm"/>
+  <Constant name="thAbsCuHE"     value="1.2*mm"/>
+  <Constant name="thAbsPCBHE"    value="1.2*mm"/>
+  <Constant name="WaferW"        value="123.7*mm"/>
+  <Constant name="tan30deg"      value="tan(30.0*deg)"/>
+</ConstantsSection>
+
+<MaterialSection label="hgcal.xml">
+  <CompositeMaterial name="WCu" density="14.979*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.75">
+      <rMaterial name="materials:Tungsten"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.25">
+      <rMaterial name="materials:Copper"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+</MaterialSection>
+
+<SolidSection label="hgcal.xml">
+  <Tubs name="HGCal" rMin="[rmin]" rMax="[rmax]" dz="[zCalor]" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Polycone name="HGCalEE" startPhi="0*deg" deltaPhi="360*deg">
+    <ZSection z="[zminEE]" rMin="[rminEE]" rMax="[rmaxEEF]"/>
+    <ZSection z="[zmaxEE]" rMin="[rminEE]" rMax="[rmaxEEF]"/>
+  </Polycone>
+  <Polycone name="HGCalHE" startPhi="0*deg" deltaPhi="360*deg">
+    <ZSection z="[zminHE]" rMin="[rminHE]" rMax="[rmaxHEF]"/>
+    <ZSection z="[zmaxHE]" rMin="[rminHE]" rMax="[rmaxHEF]"/>
+  </Polycone>
+  <Polycone name="HGCalAH" startPhi="0*deg" deltaPhi="360*deg">
+    <ZSection z="[zminAH]" rMin="[rminAH]" rMax="[rmaxAH]"/>
+    <ZSection z="[zmaxAH]" rMin="[rminAH]" rMax="[rmaxAH]"/>
+  </Polycone>
+  <Polyhedra name="HGCalEESensitive" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thSilicon]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thSilicon]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+  <Polyhedra name="HGCalHESiliconSensitive" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thSilicon]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thSilicon]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+  <Polyhedra name="HGCalPCB" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thPCB]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thPCB]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+  <Polyhedra name="HGCalKapton" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thKapton]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thKapton]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+  <Polyhedra name="HGCalCuKapton" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thCuKapton]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thCuKapton]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+  <Polyhedra name="HGCalCuPCB" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thCuPCB]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thCuPCB]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+  <Polyhedra name="HGCalEEAbs" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thAbsEE]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thAbsEE]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+  <Polyhedra name="HGCalEEAbs48To63" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thAbsEE48To63]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thAbsEE48To63]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+  <Polyhedra name="HGCalEEAbs52To70" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thAbsEE52To70]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thAbsEE52To70]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+  <Polyhedra name="HGCalEEAbs59To62" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thAbsEE59To62]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thAbsEE59To62]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+  <Polyhedra name="HGCalEEAbs68To74" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thAbsEE68To74]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thAbsEE68To74]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+  <Polyhedra name="HGCalEECuAbs" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thAbsCuEE]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thAbsCuEE]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+  <Polyhedra name="HGCalHEAbs" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thAbsHE]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thAbsHE]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+  <Polyhedra name="HGCalHECuAbs" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thAbsCuHE]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thAbsCuHE]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+  <Polyhedra name="HGCalHEPCBAbs" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thAbsPCBHE]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thAbsPCBHE]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+</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>
+  <LogicalPart name="HGCalAH" category="unspecified">
+    <rSolid name="HGCalAH"/>
+    <rMaterial name="materials:Air"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalEESensitive" category="unspecified">
+    <rSolid name="HGCalEESensitive"/>
+    <rMaterial name="materials:Air"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalHESiliconSensitive" category="unspecified">
+    <rSolid name="HGCalHESiliconSensitive"/>
+    <rMaterial name="materials:Air"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalEEPCB" category="unspecified">
+    <rSolid name="HGCalPCB"/>
+    <rMaterial name="materials:G10"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalHEPCB" category="unspecified">
+    <rSolid name="HGCalPCB"/>
+    <rMaterial name="materials:G10"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalEEKapton" category="unspecified">
+    <rSolid name="HGCalKapton"/>
+    <rMaterial name="materials:Kapton"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalEECuKapton" category="unspecified">
+    <rSolid name="HGCalCuKapton"/>
+    <rMaterial name="materials:Copper"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalEECuPCB" category="unspecified">
+    <rSolid name="HGCalCuPCB"/>
+    <rMaterial name="materials:Copper"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalHEKapton" category="unspecified">
+    <rSolid name="HGCalKapton"/>
+    <rMaterial name="materials:Kapton"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalHECuKapton" category="unspecified">
+    <rSolid name="HGCalCuKapton"/>
+    <rMaterial name="materials:Copper"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalHECuPCB" category="unspecified">
+    <rSolid name="HGCalCuPCB"/>
+    <rMaterial name="materials:Copper"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalEEAbsorber" category="unspecified">
+    <rSolid name="HGCalEEAbs"/>
+    <rMaterial name="hgcal:WCu"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalEEAbsorber48To63" category="unspecified">
+    <rSolid name="HGCalEEAbs48To63"/>
+    <rMaterial name="hgcal:WCu"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalEEAbsorber52To70" category="unspecified">
+    <rSolid name="HGCalEEAbs52To70"/>
+    <rMaterial name="hgcal:WCu"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalEEAbsorber59To62" category="unspecified">
+    <rSolid name="HGCalEEAbs59To62"/>
+    <rMaterial name="hgcal:WCu"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalEEAbsorber68To74" category="unspecified">
+    <rSolid name="HGCalEEAbs68To74"/>
+    <rMaterial name="hgcal:WCu"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalEECuAbsorber" category="unspecified">
+    <rSolid name="HGCalEECuAbs"/>
+    <rMaterial name="materials:Copper"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalHEAbsorber" category="unspecified">
+    <rSolid name="HGCalHEAbs"/>
+    <rMaterial name="hgcal:WCu"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalHECuAbsorber" category="unspecified">
+    <rSolid name="HGCalHECuAbs"/>
+    <rMaterial name="materials:Copper"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalHEPCBAbsorber" category="unspecified">
+    <rSolid name="HGCalHEPCBAbs"/>
+    <rMaterial name="materials:G10"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalHEAirAbsorber" category="unspecified">
+    <rSolid name="HGCalHEPCBAbs"/>
+    <rMaterial name="materials:Air"/>
+  </LogicalPart>
+</LogicalPartSection>
+
+<PosPartSection label="hgcal.xml">
+  <PosPart copyNumber="1">
+    <rParent name="cms:CMSE"/>
+    <rChild name="hgcal:HGCal"/>
+    <Translation x="0*fm" y="0*fm" z="[zposCalo]"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcal:HGCal"/>
+    <rChild name="hgcal:HGCalEE"/>
+    <Translation x="0*fm" y="0*fm" z="[zposEE]"/>
+    <rRotation name="rotations:R090"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcal:HGCal"/>
+    <rChild name="hgcal:HGCalHE"/>
+    <Translation x="0*fm" y="0*fm" z="[zposHE]"/>
+    <rRotation name="rotations:R090"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcal:HGCal"/>
+    <rChild name="hgcal:HGCalAH"/>
+    <Translation x="0*fm" y="0*fm" z="[zposAH]"/>
+    <rRotation name="rotations:000D"/>
+  </PosPart>
+</PosPartSection>
+</DDDefinition>
diff --git a/Geometry/HGCalTBCommonData/data/TB181/Oct182/hgcalBeam.xml b/Geometry/HGCalTBCommonData/data/TB181/Oct182/hgcalBeam.xml
new file mode 100644
index 0000000000000..5efcb010d0926
--- /dev/null
+++ b/Geometry/HGCalTBCommonData/data/TB181/Oct182/hgcalBeam.xml
@@ -0,0 +1,431 @@
+<?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="hgcalBeam.xml" eval="true">
+  <Constant name="upstreamDxby2" value="100.0*cm"/>
+  <Constant name="upstreamDyby2" value="100.0*cm"/>
+  <Constant name="upstreamDzby2" value="400.0*cm"/>
+  <Constant name="upstreamZ" value="-400.0*cm"/>
+  <Constant name="tol" value="0.0*mm"/>
+  <Constant name="chambDxby2" value="11.0*cm"/>
+  <Constant name="chambAlT" value="5.0*mm"/>
+  <Constant name="chambKapW" value="11.0*cm"/>
+  <Constant name="chambKapT" value="0.025*mm"/>
+  <Constant name="chambVetW" value="25.0*mm"/>
+  <Constant name="chambVetT" value="5.0*mm"/>
+  <Constant name="chambVetGap" value="12.0*cm"/>
+  <Constant name="chambVetL" value="0.5*([chambVetGap]+[chambVetW])"/>
+  <Constant name="chambVetX" value="0.5*[chambVetW]"/>
+  <Constant name="chambVetZ" value="20.0*mm"/>
+  <Constant name="chambGasGap" value="([chambVetZ]+0.5*[chambVetT]+[tol])"/>
+  <Constant name="chambGasW" value="([chambVetW]+0.5*[chambVetGap]+[tol])"/>
+  <Constant name="chambDzby2" value="([chambGasGap]+[chambAlT]+2*[tol])"/>
+  <Constant name="chambAl1L" value="0.5*([chambDxby2]+0.5*[chambKapW])"/>
+  <Constant name="chambAl1W" value="0.5*([chambDxby2]-0.5*[chambKapW])"/>
+  <Constant name="chambAl1X" value="([chambDxby2]-[chambAl1L])"/>
+  <Constant name="chambAl1Y" value="([chambDxby2]-[chambAl1W])"/>
+  <Constant name="chambAl1Z" value="([chambGasGap]+0.5*[chambAlT]+[tol])"/>
+  <Constant name="chambAl2L" value="([chambDxby2]-0.5*[chambAlT])"/>
+  <Constant name="chambAl2X" value="([chambDxby2]-[chambAl2L])"/>
+  <Constant name="chambAl2Y" value="([chambDxby2]-0.5*[chambAlT])"/>
+  <Constant name="chamb1Z" value="-507.6*cm"/>
+  <Constant name="chamb2Z" value="-400.3*cm"/>
+  <Constant name="chamb3Z" value="-200.5*cm"/>
+  <Constant name="s1Dxby2" value="7.0*cm"/>
+  <Constant name="s1Dzby2" value="5.0*mm"/>
+  <Constant name="s1Z" value="-375.4*cm"/>
+  <Constant name="s2Dxby2" value="2.0*cm"/>
+  <Constant name="s2Dzby2" value="5.0*mm"/>
+  <Constant name="s2Z" value="-360.5*cm"/>
+  <Constant name="s3Dxby2" value="1.0*cm"/>
+  <Constant name="s3Dzby2" value="5.0*mm"/>
+  <Constant name="s3Z" value="-345.6*cm"/>
+  <Constant name="s4Z" value="-240.8*cm"/>
+  <Constant name="bhDxby2" value="50.0*cm"/>
+  <Constant name="bhDyby2" value="15.0*cm"/>
+  <Constant name="bhDzby2" value="0.5*cm"/>
+  <Constant name="bhGap" value="7.5*cm"/>
+  <Constant name="bhX" value="([bhDxby2]-0.5*[bhGap])"/>
+  <Constant name="bhY" value="([bhDyby2]+0.5*[bhGap])"/>
+  <Constant name="bhZ1" value="-229.3*cm"/>
+  <Constant name="bhZ2" value="-221.3*cm"/>
+  <Constant name="ck3Rad" value="8.35*cm"/>
+  <Constant name="ck3L" value="200.0*cm"/>
+  <Constant name="ck3Z" value="-569.0*cm"/>
+  <Constant name="downstreamDxby2" value="50.0*cm"/>
+  <Constant name="downstreamDyby2" value="50.0*cm"/>
+  <Constant name="downstreamDzby2" value="370.0*cm"/>
+  <Constant name="downstreamZ" value="1980.0*cm"/>
+  <Constant name="chamb4Z" value="1620*cm"/>
+  <Constant name="chamb5Z" value="2340.0*cm"/>
+  <Constant name="mcDxby2" value="40.0*cm"/>
+  <Constant name="mcDzby2" value="20.0*mm"/>
+  <Constant name="mc1Z" value="([hgcal:zCaloFront]-18*cm-4.6*cm)"/>
+  <Constant name="mc2Z" value="([hgcal:zCaloFront]-4.6*cm)"/>
+  <Constant name="s5Dxby2" value="9.5*cm"/>
+  <Constant name="s5Dzby2" value="2.0*cm"/>
+  <Constant name="s5Z"     value="([hgcal:zCaloFront]-[s5Dzby2])"/>
+</ConstantsSection>
+
+<SolidSection label="hgcalBeam.xml">
+  <Box name="HGCalBeam" dx="[upstreamDxby2]" dy="[upstreamDyby2]" dz="[upstreamDzby2]"/>
+  <Box name="HGCalBeamWChamb" dx="[chambDxby2]" dy="[chambDxby2]" dz="[chambDzby2]"/>
+  <Box name="HGCalBeamWChambGas" dx="[chambGasW]" dy="[chambGasW]" dz="[chambGasGap]"/>
+  <Box name="HGCalBeamWChambVet" dx="[chambVetL]" dy="[chambVetW]/2" dz="[chambVetT]/2"/>
+  <Box name="HGCalBeamWChambWindow" dx="[chambKapW]/2" dy="[chambKapW]/2" dz="[chambKapT]/2"/>
+  <Box name="HGCalBeamWChambAl1" dx="[chambAl1L]" dy="[chambAl1W]" dz="[chambAlT]/2"/>
+  <Box name="HGCalBeamWChambAl2" dx="[chambAl2L]" dy="[chambAlT]/2" dz="[chambGasGap]"/>
+  <Box name="HGCalBeamS1" dx="[s1Dxby2]" dy="[s1Dxby2]" dz="[s1Dzby2]"/>
+  <Box name="HGCalBeamS2" dx="[s2Dxby2]" dy="[s2Dxby2]" dz="[s2Dzby2]"/>
+  <Box name="HGCalBeamS3" dx="[s3Dxby2]" dy="[s3Dxby2]" dz="[s3Dzby2]"/>
+  <Box name="HGCalBeamS4" dx="[s1Dxby2]" dy="[s1Dxby2]" dz="[s1Dzby2]"/>
+  <Box name="HGCalBeamS5" dx="[s5Dxby2]" dy="[s5Dxby2]" dz="[s5Dzby2]"/>
+  <Box name="HGCalBeamS6" dx="[s5Dxby2]" dy="[s5Dxby2]" dz="[s5Dzby2]"/>
+  <Box name="HGCalBeamHaloCounter" dx="[bhDxby2]" dy="[bhDyby2]" dz="[bhDzby2]"/>
+  <Tubs name="HGCalBeamCK3" rMin="0*fm" rMax="[ck3Rad]" dz="[ck3L]/2" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Box name="HGCalBeamDown" dx="[downstreamDxby2]" dy="[downstreamDyby2]" dz="[downstreamDzby2]"/>
+  <Box name="HGCalBeamMuonCounter" dx="[mcDxby2]" dy="[mcDxby2]" dz="[mcDzby2]"/>
+</SolidSection>
+
+<LogicalPartSection label="hgcalBeam.xml">
+  <LogicalPart name="HGCalBeam" category="unspecified">
+    <rSolid name="HGCalBeam"/>
+    <rMaterial name="materials:Air"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamWChamb" category="unspecified">
+    <rSolid name="HGCalBeamWChamb"/>
+    <rMaterial name="materials:Air"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamWChambGas" category="unspecified">
+    <rSolid name="HGCalBeamWChambGas"/>
+    <rMaterial name="materials:Ar 50pct plus CO_2 50pct"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamWChambVet" category="unspecified">
+    <rSolid name="HGCalBeamWChambVet"/>
+    <rMaterial name="materials:Polyethylene"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamWChambWindow" category="unspecified">
+    <rSolid name="HGCalBeamWChambWindow"/>
+    <rMaterial name="materials:Kapton"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamWChambAl1" category="unspecified">
+    <rSolid name="HGCalBeamWChambAl1"/>
+    <rMaterial name="materials:Aluminium"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamWChambAl2" category="unspecified">
+    <rSolid name="HGCalBeamWChambAl2"/>
+    <rMaterial name="materials:Aluminium"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamS1" category="unspecified">
+    <rSolid name="HGCalBeamS1"/>
+    <rMaterial name="materials:Scintillator"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamS2" category="unspecified">
+    <rSolid name="HGCalBeamS2"/>
+    <rMaterial name="materials:Scintillator"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamS3" category="unspecified">
+    <rSolid name="HGCalBeamS3"/>
+    <rMaterial name="materials:Scintillator"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamS4" category="unspecified">
+    <rSolid name="HGCalBeamS4"/>
+    <rMaterial name="materials:Scintillator"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamS5" category="unspecified">
+    <rSolid name="HGCalBeamS5"/>
+    <rMaterial name="materials:Scintillator"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamS6" category="unspecified">
+    <rSolid name="HGCalBeamS6"/>
+    <rMaterial name="materials:Scintillator"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamHaloCounter" category="unspecified">
+    <rSolid name="HGCalBeamHaloCounter"/>
+    <rMaterial name="materials:Scintillator"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamCK3" category="unspecified">
+    <rSolid name="HGCalBeamCK3"/>
+    <rMaterial name="materials:Freon-12"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamDown" category="unspecified">
+    <rSolid name="HGCalBeamDown"/>
+    <rMaterial name="materials:Air"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamMuonCounter" category="unspecified">
+    <rSolid name="HGCalBeamMuonCounter"/>
+    <rMaterial name="materials:Scintillator"/>
+  </LogicalPart>
+</LogicalPartSection>
+
+<RotationSection label="hgcalBeam.xml">
+  <Rotation name="R1" phiX="90*deg" thetaX="90*deg" phiY="180*deg" thetaY="90*deg" phiZ="0*deg" thetaZ="0*deg"/>
+</RotationSection>
+
+<PosPartSection label="hgcalBeam.xml">
+  <PosPart copyNumber="1">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambGas"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl1"/>
+    <Translation x="[chambAl1X]" y="[chambAl1Y]" z="[chambAl1Z]"/>
+  </PosPart>
+  <PosPart copyNumber="2">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl1"/>
+    <Translation x="-[chambAl1Y]" y="[chambAl1X]" z="[chambAl1Z]"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="3">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl1"/>
+    <Translation x="-[chambAl1X]" y="-[chambAl1Y]" z="[chambAl1Z]"/>
+  </PosPart>
+  <PosPart copyNumber="4">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl1"/>
+    <Translation x="[chambAl1Y]" y="-[chambAl1X]" z="[chambAl1Z]"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="5">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl1"/>
+    <Translation x="[chambAl1X]" y="[chambAl1Y]" z="-[chambAl1Z]"/>
+  </PosPart>
+  <PosPart copyNumber="6">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl1"/>
+    <Translation x="-[chambAl1Y]" y="[chambAl1X]" z="-[chambAl1Z]"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="7">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl1"/>
+    <Translation x="-[chambAl1X]" y="-[chambAl1Y]" z="-[chambAl1Z]"/>
+  </PosPart>
+  <PosPart copyNumber="8">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl1"/>
+    <Translation x="[chambAl1Y]" y="-[chambAl1X]" z="-[chambAl1Z]"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl2"/>
+    <Translation x="[chambAl2X]" y="[chambAl2Y]" z="0*fm"/>
+  </PosPart>
+  <PosPart copyNumber="2">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl2"/>
+    <Translation x="-[chambAl2Y]" y="[chambAl2X]" z="0*fm"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="3">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl2"/>
+    <Translation x="-[chambAl2X]" y="-[chambAl2Y]" z="0*fm"/>
+  </PosPart>
+  <PosPart copyNumber="4">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl2"/>
+    <Translation x="[chambAl2Y]" y="-[chambAl2X]" z="0*fm"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambWindow"/>
+    <Translation x="0*fm" y="0*fm" z="([chambDzby2]-0.5*[chambKapT])"/>
+  </PosPart>
+  <PosPart copyNumber="2">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambWindow"/>
+    <Translation x="0*fm" y="0*fm" z="-([chambDzby2]-0.5*[chambKapT])"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="[chambVetX]" y="[chambVetL]" z="[chambVetZ]"/>
+  </PosPart>
+  <PosPart copyNumber="2">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="-[chambVetL]" y="[chambVetX]" z="[chambVetZ]"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="3">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="-[chambVetX]" y="-[chambVetL]" z="[chambVetZ]"/>
+  </PosPart>
+  <PosPart copyNumber="4">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="[chambVetL]" y="-[chambVetX]" z="[chambVetZ]"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="5">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="[chambVetX]" y="[chambVetL]" z="0*fm"/>
+  </PosPart>
+  <PosPart copyNumber="6">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="-[chambVetL]" y="[chambVetX]" z="0*fm"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="7">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="-[chambVetX]" y="-[chambVetL]" z="0*fm"/>
+  </PosPart>
+  <PosPart copyNumber="8">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="[chambVetL]" y="-[chambVetX]" z="0*fm"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="9">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="[chambVetX]" y="[chambVetL]" z="-[chambVetZ]"/>
+  </PosPart>
+  <PosPart copyNumber="10">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="-[chambVetL]" y="[chambVetX]" z="-[chambVetZ]"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="11">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="-[chambVetX]" y="-[chambVetL]" z="-[chambVetZ]"/>
+  </PosPart>
+  <PosPart copyNumber="12">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="[chambVetL]" y="-[chambVetX]" z="-[chambVetZ]"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamWChamb"/>
+    <Translation x="0*fm" y="0*fm" z="([chamb1Z]-[upstreamZ]-[chambDzby2])"/>
+  </PosPart>
+  <PosPart copyNumber="2">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamWChamb"/>
+    <Translation x="0*fm" y="0*fm" z="([chamb2Z]-[upstreamZ]-[chambDzby2])"/>
+  </PosPart>
+  <PosPart copyNumber="3">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamWChamb"/>
+    <Translation x="0*fm" y="0*fm" z="([chamb3Z]-[upstreamZ]-[chambDzby2])"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamS1"/>
+    <Translation x="0*fm" y="0*fm" z="([s1Z]-[upstreamZ]-[s1Dzby2])"/>
+  </PosPart>
+  <PosPart copyNumber="2">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamS2"/>
+    <Translation x="0*fm" y="0*fm" z="([s2Z]-[upstreamZ]-[s2Dzby2])"/>
+  </PosPart>
+  <PosPart copyNumber="3">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamS3"/>
+    <Translation x="0*fm" y="0*fm" z="([s3Z]-[upstreamZ]-[s3Dzby2])"/>
+  </PosPart>
+  <PosPart copyNumber="4">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamS4"/>
+    <Translation x="0*fm" y="0*fm" z="([s4Z]-[upstreamZ]-[s1Dzby2])"/>
+  </PosPart>
+  <PosPart copyNumber="11">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamHaloCounter"/>
+    <Translation x="0*fm" y="[bhY]" z="([bhZ2]+[bhDzby2]-[upstreamZ])"/>
+  </PosPart>
+  <PosPart copyNumber="12">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamHaloCounter"/>
+    <Translation x="0*fm" y="-[bhY]" z="([bhZ2]+[bhDzby2]-[upstreamZ])"/>
+  </PosPart>
+  <PosPart copyNumber="13">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamHaloCounter"/>
+    <Translation x="-[bhY]" y="0*fm" z="([bhZ1]+[bhDzby2]-[upstreamZ])"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="14">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamHaloCounter"/>
+    <Translation x="[bhY]" y="0*fm" z="([bhZ1]+[bhDzby2]-[upstreamZ])"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="0">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamCK3"/>
+    <Translation x="0*fm" y="0*fm" z="([ck3Z]-[upstreamZ]-0.5*[ck3L])"/>
+  </PosPart>
+  <PosPart copyNumber="4">
+    <rParent name="hgcalBeam:HGCalBeamDown"/>
+    <rChild name="hgcalBeam:HGCalBeamWChamb"/>
+    <Translation x="0*fm" y="0*fm" z="([chamb4Z]-[downstreamZ]-[chambDzby2])"/>
+  </PosPart>
+  <PosPart copyNumber="5">
+    <rParent name="hgcalBeam:HGCalBeamDown"/>
+    <rChild name="hgcalBeam:HGCalBeamWChamb"/>
+    <Translation x="0*fm" y="0*fm" z="([chamb5Z]-[downstreamZ]-[chambDzby2])"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="cms:CMSE"/>
+    <rChild name="hgcalBeam:HGCalBeam"/>
+    <Translation x="0*fm" y="0*fm" z="[upstreamZ]"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="cms:CMSE"/>
+    <rChild name="hgcalBeam:HGCalBeamDown"/>
+    <Translation x="0*fm" y="0*fm" z="[downstreamZ]"/>
+  </PosPart>
+  <PosPart copyNumber="5">
+    <rParent name="cms:CMSE"/>
+    <rChild name="hgcalBeam:HGCalBeamS5"/>
+    <Translation x="0*fm" y="0*fm" z="([mc1Z])"/>
+  </PosPart>
+  <PosPart copyNumber="6">
+    <rParent name="cms:CMSE"/>
+    <rChild name="hgcalBeam:HGCalBeamS6"/>
+    <Translation x="0*fm" y="0*fm" z="([mc2Z])"/>
+  </PosPart>
+</PosPartSection>
+
+<SpecParSection label="hgcalBeam.xml" eval="true">
+  <SpecPar name="hgcalbeam">
+    <PartSelector path="//HGCalBeamS.*"/>
+    <PartSelector path="//HGCalBeamHaloCounter"/>
+    <PartSelector path="//HGCalBeamMuonCounter"/>
+    <PartSelector path="//HGCalBeamCK3"/>
+    <PartSelector path="//HGCalBeamWChambGas"/>
+    <Parameter name="SensitiveDetector" value="HcalTB06BeamDetector" eval="false"/>
+    <Parameter name="ReadOutName" value="HcalTB06BeamHits" eval="false"/>
+  </SpecPar>
+  <SpecPar name="hgcalbeamWC">
+    <PartSelector path="//HGCalBeamWChambGas"/>
+    <Parameter name="Volume" value="WireChamber" eval="false"/>
+  </SpecPar>
+  <SpecPar name="hgcProdCutsBeam">
+    <PartSelector path="//HGCalBeam"/>
+    <PartSelector path="//HGCalBeamDown"/>
+    <Parameter name="CMSCutsRegion" value="HGCalBeamRegion" eval="false"/>
+    <Parameter name="ProdCutsForElectrons" value="1.0*mm"/>
+<Parameter name="ProdCutsForProtons" value="1.0*mm"/>
+    <Parameter name="ProdCutsForPositrons" value="1.0*mm"/>
+    <Parameter name="ProdCutsForGamma"     value="1.0*mm"/>
+  </SpecPar>
+</SpecParSection>
+
+</DDDefinition>
diff --git a/Geometry/HGCalTBCommonData/data/TB181/Oct182/hgcalEE.xml b/Geometry/HGCalTBCommonData/data/TB181/Oct182/hgcalEE.xml
new file mode 100644
index 0000000000000..43c0a20b0cefb
--- /dev/null
+++ b/Geometry/HGCalTBCommonData/data/TB181/Oct182/hgcalEE.xml
@@ -0,0 +1,151 @@
+<?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="hgcalEE.xml" eval="true">
+  <Constant name="rMinFine"   value="0.0*fm"/>
+  <Constant name="rMaxFine"   value="0.0*cm"/>
+  <Constant name="rMaxMiddle" value="120.0*cm"/>
+  <Constant name="rMaxCoarse" value="2000.0*cm"/>
+  <Constant name="rMin"       value="0.0*fm"/>
+  <Constant name="rMax"       value="[hgcal:rmaxEE]"/>
+  <Constant name="rMaxB"      value="[hgcal:rmaxEEF]"/>
+  <Constant name="absorbW"    value="0.5*[hgcal:WaferW]"/>
+  <Constant name="absorbH"    value="[hgcal:WaferW]*[hgcal:tan30deg]"/>
+</ConstantsSection>
+
+<PosPartSection label="hgcalEE.xml">
+  <Algorithm name="hgcal:DDHGCalTBModuleX">
+    <rParent name="hgcal:HGCalEE"/>
+    <String name="GeneralMaterial" value="materials:Air"/>
+    <Vector name="WaferName" type="string" nEntries="2">
+      hgcalwafer:HGCalEEWaferFine, hgcalwafer:HGCalEEWaferCoarse</Vector>
+    <Vector name="CoverName" type="string" nEntries="11">
+      hgcal:HGCalEESensitive,      hgcal:HGCalEEPCB,
+      hgcal:HGCalEEKapton,           hgcal:HGCalEEAbsorber,
+      hgcal:HGCalEECuAbsorber,       hgcal:HGCalEEAbsorber48To63,
+      hgcal:HGCalEEAbsorber52To70,   hgcal:HGCalEEAbsorber59To62,
+      hgcal:HGCalEEAbsorber68To74,   hgcal:HGCalEECuKapton,
+      hgcal:HGCalEECuPCB</Vector>
+    <Vector name="MaterialNames" type="string" nEntries="29">
+      materials:Air,       materials:Air,    materials:Air, 
+      materials:Air,       materials:Air,    materials:Air,
+      materials:Air,       materials:Air,    materials:StainlessSteel, 
+      materials:Lead,      materials:Copper, materials:Air, 
+      materials:Aluminium, materials:Air,    materials:Air,   
+      materials:Air,       materials:Air,    materials:Air,
+      materials:Air,       materials:Air,    materials:Air,
+      materials:Air,       materials:Air,    materials:Air,
+      materials:Iron,      materials:Air,    materials:Air,
+      materials:Air,       materials:Aluminium</Vector>
+    <Vector name="VolumeNames" type="string" nEntries="29">
+      EEPCB,             EEKapton,          EECuWShield, 
+      EECuShield,        EECuWShield48To63, EECuWShield52To70,
+      EECuWShield59To62, EECuWShield68To74, EEFeAbsorber, 
+      EEPbAbsorber,      EECuHeatShield,    EESensitive, 
+      EEAlcase,          EEgap1,            EEgap2,      
+      EEgap3,            EEgap4,            EEgap5,      
+      EEgap6,            EEgap7,            EEgap8,      
+      EEgap9,            EEgap10,           EEgap11,      
+      EEFHAbs,           EECuKapton,        EECuPCB,
+      EEgap12,           EEMCPAl</Vector>
+    <Vector name="Thickness" type="numeric" nEntries="29">
+      [hgcal:thPCB],         [hgcal:thKapton],      [hgcal:thAbsEE], 
+      [hgcal:thAbsCuEE],     [hgcal:thAbsEE48To63], [hgcal:thAbsEE52To70],
+      [hgcal:thAbsEE59To62], [hgcal:thAbsEE68To74], 0.3*mm,        
+      4.9*mm,                6.0*mm,                [hgcal:thSilicon],   
+      2.1*mm,                3.095*mm,              3.145*mm, 
+      3.7*mm,                4.7*mm,                5.5*mm,
+      6.7*mm,                7.7*mm,                8.7*mm,
+      9.5*mm,                10.09*mm,              119.7*mm,
+      40.0*mm,               [hgcal:thCuKapton],    [hgcal:thCuPCB],
+      84.0*mm,               5.0*mm</Vector>
+    <Numeric name="InOut"   value="1"/>
+    <Vector name="LayerFrontIn" type="numeric" nEntries="15"> 
+       0, 23, 45, 67, 89,111,133,155,177,199,221,245,269,293,317</Vector>
+    <Vector name="LayerBackIn" type="numeric" nEntries="15"> 
+      22, 44, 66, 88,110,132,154,176,198,220,244,268,292,316,318</Vector>
+    <Vector name="BlockThick" type="numeric" nEntries="15"> 
+      144.15*mm, 29.05*mm,  29.05*mm, 
+      30.05*mm,  30.05*mm,  30.05*mm, 
+      28.05*mm,  28.05*mm,  28.05*mm, 
+      28.05*mm,  32.25*mm,  35.05*mm, 
+      30.295*mm, 30.835*mm, 86.1*mm
+    </Vector>
+    <Vector name="LayerType" type="numeric" nEntries="319"> 
+      12, 23, 8,  9, 8, 16,  0, 26, 11, 11, 11, 25,  1,  2, 10,  2,  1, 25, 11, 11, 11, 26, 0,
+      19,  8,  9, 8, 15, 0, 26, 11, 11, 11, 25,  1,  2, 10,  2,  1, 25, 11, 11, 11, 26,  0,
+      19,  8,  9, 8, 15, 0, 26, 11, 11, 11, 25,  1,  2, 10,  2,  1, 25, 11, 11, 11, 26,  0,
+      20,  8,  9, 8, 15, 0, 26, 11, 11, 11, 25,  1,  2, 10,  2,  1, 25, 11, 11, 11, 26,  0,
+      20,  8,  9, 8, 15, 0, 26, 11, 11, 11, 25,  1,  2, 10,  2,  1, 25, 11, 11, 11, 26,  0,
+      20,  8,  9, 8, 15, 0, 26, 11, 11, 11, 25,  1,  2, 10,  2,  1, 25, 11, 11, 11, 26,  0,
+      18,  8,  9, 8, 15, 0, 26, 11, 11, 11, 25,  1,  2, 10,  2,  1, 25, 11, 11, 11, 26,  0,
+      18,  8,  9, 8, 15, 0, 26, 11, 11, 11, 25,  1,  2, 10,  2,  1, 25, 11, 11, 11, 26,  0,
+      18,  8,  9, 8, 15, 0, 26, 11, 11, 11, 25,  1,  2, 10,  2,  1, 25, 11, 11, 11, 26,  0,
+      18,  8,  9, 8, 15, 0, 26, 11, 11, 11, 25,  1,  2, 10,  2,  1, 25, 11, 11, 11, 26,  0,
+      18,  8,  9, 8, 17, 0, 26, 11, 11, 11, 25,  1,  3,  2, 10,  2,  3,  1, 25, 11, 11, 11, 26, 0,
+      21,  8,  9, 8, 17, 0, 26, 11, 11, 11, 25,  1,  3,  2, 10,  2,  3,  1, 25, 11, 11, 11, 26, 0,
+      21,  8,  9, 8, 14, 0, 26, 11, 11, 11, 25,  1,  5,  5, 10,  5,  5,  1, 25, 11, 11, 11, 26, 0,
+      22,  8,  9, 8, 13, 0, 26, 11, 11, 11, 25,  1,  5,  5, 10,  5,  5,  1, 25, 11, 11, 11, 26, 0,
+      27, 12
+    </Vector>
+    <Vector name="MaxModule" nEntries="319">
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0
+    </Vector>
+    <Vector name="LayerSense" type="numeric" nEntries="319">
+      0, 0, 0, 0, 0, 0, 2, 11, 1, 1, 1,10, 3, 4, 0, 4, 3,10, 1, 1, 1,11, 2,
+      0, 0, 0, 0, 0, 2, 11, 1, 1, 1,10, 3, 4, 0, 4, 3,10, 1, 1, 1,11, 2,
+      0, 0, 0, 0, 0, 2, 11, 1, 1, 1,10, 3, 4, 0, 4, 3,10, 1, 1, 1,11, 2,
+      0, 0, 0, 0, 0, 2, 11, 1, 1, 1,10, 3, 4, 0, 4, 3,10, 1, 1, 1,11, 2,
+      0, 0, 0, 0, 0, 2, 11, 1, 1, 1,10, 3, 4, 0, 4, 3,10, 1, 1, 1,11, 2,
+      0, 0, 0, 0, 0, 2, 11, 1, 1, 1,10, 3, 4, 0, 4, 3,10, 1, 1, 1,11, 2,
+      0, 0, 0, 0, 0, 2, 11, 1, 1, 1,10, 3, 4, 0, 4, 3,10, 1, 1, 1,11, 2,
+      0, 0, 0, 0, 0, 2, 11, 1, 1, 1,10, 3, 4, 0, 4, 3,10, 1, 1, 1,11, 2,
+      0, 0, 0, 0, 0, 2, 11, 1, 1, 1,10, 3, 4, 0, 4, 3,10, 1, 1, 1,11, 2,
+      0, 0, 0, 0, 0, 2, 11, 1, 1, 1,10, 3, 4, 0, 4, 3,10, 1, 1, 1,11, 2,
+      0, 0, 0, 0, 0, 2, 11, 1, 1, 1,10, 3, 5, 4, 0, 4, 5, 3,10, 1, 1, 1,11, 2,
+      0, 0, 0, 0, 0, 2, 11, 1, 1, 1,10, 3, 5, 4, 0, 4, 5, 3,10, 1, 1, 1,11, 2,
+      0, 0, 0, 0, 0, 2, 11, 1, 1, 1,10, 3, 7, 7, 0, 7, 7, 3,10, 1, 1, 1,11, 2,
+      0, 0, 0, 0, 0, 2, 11, 1, 1, 1,10, 3, 7, 7, 0, 7, 7, 3,10, 1, 1, 1,11, 2,
+      0, 0
+    </Vector>
+    <Numeric name="zMinBlock"   value="[hgcal:zminEE]"/>
+    <Numeric name="rMaxFine"    value="[rMaxFine]"/>
+    <Numeric name="waferW"      value="[hgcal:WaferW]"/>
+    <Numeric name="waferGap"    value="0.0*fm"/>
+    <Numeric name="absorberW"   value="[hgcalEE:absorbW]"/>
+    <Numeric name="absorberH"   value="[hgcalEE:absorbH]"/>
+    <Numeric name="rMax"        value="[rMax]"/>
+    <Numeric name="rMaxB"       value="[rMaxB]"/>
+  </Algorithm>
+</PosPartSection> 
+
+<SpecParSection label="hgcalEE.xml" eval="true">
+  <SpecPar name="HGCalEE">
+    <PartSelector path="//HGCalEESensitive.*"/>    
+    <Parameter name="Volume" value="HGCalEESensitive" eval="false"/>
+    <Parameter name="GeometryMode" value="HGCalGeometryMode::Hexagon" eval="false"/>
+    <Parameter name="RadiusBound"  value="[rMinFine]"/>
+    <Parameter name="RadiusBound"  value="[rMaxFine]"/>
+    <Parameter name="RadiusBound"  value="[rMaxMiddle]"/>
+    <Parameter name="RadiusBound"  value="[rMaxCoarse]"/>
+    <Parameter name="RadiusLimits" value="[rMin]"/>
+    <Parameter name="RadiusLimits" value="[rMax]"/>
+    <Parameter name="LevelTop"     value="99"/>
+  </SpecPar>
+</SpecParSection>
+
+</DDDefinition>
diff --git a/Geometry/HGCalTBCommonData/data/TB181/Oct182/hgcalHE.xml b/Geometry/HGCalTBCommonData/data/TB181/Oct182/hgcalHE.xml
new file mode 100644
index 0000000000000..acd15fa35e6c5
--- /dev/null
+++ b/Geometry/HGCalTBCommonData/data/TB181/Oct182/hgcalHE.xml
@@ -0,0 +1,207 @@
+<?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="hgcalHE.xml" eval="true">
+  <Constant name="rMinFine"   value="0.0*fm"/>
+  <Constant name="rMaxFine"   value="0.0*fm"/>
+  <Constant name="rMaxMiddle" value="0.0*fm"/>
+  <Constant name="rMaxCoarse" value="2000.0*cm"/>
+  <Constant name="rMin"       value="[hgcal:rminHE]"/>
+  <Constant name="rMax"       value="[hgcal:rmaxHE]"/>
+  <Constant name="rMaxB"      value="[hgcal:rmaxHEF]"/>
+  <Constant name="absorbW"    value="1.5*[hgcal:WaferW]"/>
+  <Constant name="absorbH"    value="1.5*[hgcal:WaferW]"/>
+</ConstantsSection>
+
+<PosPartSection label="hgcalHE.xml">
+  <Algorithm name="hgcal:DDHGCalTBModuleX">
+    <rParent name="hgcal:HGCalHE"/>
+    <String name="GeneralMaterial" value="materials:Air"/>
+    <Vector name="WaferName" type="string" nEntries="2">
+      hgcalwafer:HGCalHEWaferFine, hgcalwafer:HGCalHEWaferCoarse</Vector>
+    <Vector name="CoverName" type="string" nEntries="9">
+      hgcal:HGCalHESiliconSensitive, hgcal:HGCalHEPCB,
+      hgcal:HGCalHEKapton,           hgcal:HGCalHEAbsorber,
+      hgcal:HGCalHECuAbsorber,       hgcal:HGCalHEPCBAbsorber,
+      hgcal:HGCalHECuKapton,         hgcal:HGCalHECuPCB,
+      hgcal:HGCalHEAirAbsorber</Vector>
+    <Vector name="MaterialNames" type="string" nEntries="60">
+      materials:Air,    materials:Air,    materials:Air,
+      materials:Air,    materials:Air,    materials:Iron, 
+      materials:Copper, materials:Air,    materials:Iron,
+      materials:Air,    materials:Air,    materials:Air,
+      materials:Air,    materials:Air,    materials:Air,
+      materials:Air,    materials:Air,    materials:Air,
+      materials:Air,    materials:Air,    materials:Air,
+      materials:Air,    materials:Air,    materials:Air,
+      materials:Air,    materials:Air,    materials:Air,
+      materials:Air,    materials:Air,    materials:Air,
+      materials:Air,    materials:Air,    materials:Air,
+      materials:Air,    materials:Air,    materials:Iron, 
+      materials:Copper, materials:Air,    materials:Iron,
+      materials:Air,    materials:Air,    materials:Air,
+      materials:Air,    materials:Air,    materials:Air,
+      materials:Air,    materials:Air,    materials:Air,
+      materials:Air,    materials:Air,    materials:Air,
+      materials:Air,    materials:Air,    materials:Air,
+      materials:Air,    materials:Air,    materials:Air,
+      materials:Air,    materials:Air,    materials:Air
+    </Vector>
+    <Vector name="VolumeNames" type="string" nEntries="60">
+      HEPCB,          HEKapton,           HECuWShield, 
+      HECuShield,     HEPCBShield,        HEFeAbsorber,
+      HECuHeatShield, HESiliconSensitive, HEFeBox, 
+      HEAirGap1,      HEAirGap2,          HEAirGap3, 
+      HEAirGap4,      HEAirGap5,          HEAirGap6, 
+      HEAirGap7,      HEAirGap8,          HEAirGap9,
+      HEAirGap10,     HEAirGap11,         HEAirGap12,
+      HEAirGap13,     HEAirGap14,         HEAirGap15,
+      HEAirGap16,     HECuKapton,         HECuPCB,
+      HEAirGap17,     HEAirGap18,         HEAirGap19,
+      HEPCB,          HEKapton,           HECuWShield, 
+      HECuShield,     HEPCBShield,        HEFeAbsorber,
+      HECuHeatShield, HESiliconSensitive, HEFeBox, 
+      HEAirGap1,      HEAirGap2,          HEAirGap3, 
+      HEAirGap4,      HEAirGap5,          HEAirGap6, 
+      HEAirGap7,      HEAirGap8,          HEAirGap9,
+      HEAirGap10,     HEAirGap11,         HEAirGap12,
+      HEAirGap13,     HEAirGap14,         HEAirGap15,
+      HEAirGap16,     HECuKapton,         HECuPCB,
+      HEAirGap17,     HEAirGap18,         HEAirGap19
+    </Vector>
+    <Vector name="Thickness" type="numeric" nEntries="60">
+      [hgcal:thPCB],     [hgcal:thKapton],   [hgcal:thAbsHE], 
+      [hgcal:thAbsCuHE], [hgcal:thAbsPCBHE], 40.0*mm,
+      6.0*mm,            [hgcal:thSilicon],  9.0*mm, 
+      10.7*mm,           11.7*mm,            3.0*mm, 
+      13.8*mm,           16.0*mm,            5.0*mm, 
+      6.0*mm,            7.0*mm,             8.0*mm, 
+      9.0*mm,            10.0*mm,            20.0*mm,
+      45.0*mm,           47.0*mm,            100.0*mm,
+      124.0*mm,          [hgcal:thCuKapton], [hgcal:thCuPCB],
+      8.8*mm,            9.8*mm,             [hgcal:thAbsCuHE],
+      [hgcal:thPCB],     [hgcal:thKapton],   [hgcal:thAbsHE], 
+      [hgcal:thAbsCuHE], [hgcal:thAbsPCBHE], 40.0*mm,
+      6.0*mm,            [hgcal:thSilicon],  9.0*mm, 
+      10.7*mm,           11.7*mm,            3.0*mm, 
+      13.8*mm,           16.0*mm,            5.0*mm, 
+      6.0*mm,            7.0*mm,             8.0*mm, 
+      9.0*mm,            10.0*mm,            20.0*mm,
+      45.0*mm,           47.0*mm,            100.0*mm,
+      124.0*mm,          [hgcal:thCuKapton], [hgcal:thCuPCB],
+      8.8*mm,            9.8*mm,             [hgcal:thAbsCuHE]
+    </Vector>
+    <Vector name="BlockThick" type="numeric" nEntries="11"> 
+      34.075*mm, 133.075*mm, 73.075*mm, 
+      68.975*mm, 69.075*mm,  174.075*mm, 
+      65.075*mm, 72.075*mm,  66.975*mm, 
+      70.975*mm, 97.075*mm
+    </Vector>
+    <Numeric name="InOut"   value="2"/>
+    <Vector name="LayerFrontIn" type="numeric" nEntries="11"> 
+       0, 11, 21, 34, 45, 60, 77, 90,103,116,129</Vector>
+    <Vector name="LayerBackIn" type="numeric" nEntries="11"> 
+      10, 20, 33, 44, 59, 76, 89,102,115,128,143</Vector>
+    <Vector name="LayerFrontOut" type="numeric" nEntries="11"> 
+     144,155,165,178,189,204,221,234,247,260,273</Vector>
+    <Vector name="LayerBackOut" type="numeric" nEntries="11"> 
+     154,164,177,188,203,220,233,246,259,272,287</Vector>
+    <Vector name="LayerType" type="numeric" nEntries="288"> 
+      8,  13,  0, 26,  7,  7,  7, 25,  1,  2,  6,
+      24,  0, 26,  7,  7,  7, 25,  1,  3,  6,
+      18,  5, 12,  0, 26,  7,  7,  7, 25,  1,  3, 3,  6,
+      19,  5, 27,  0, 26,  7,  7,  7,  4,  3,  6,
+      16,  5, 10,  0, 26,  7,  7,  7, 25,  1, 25,  1,  3,  3,  6,
+      14,  8, 22,  5, 21,  8, 27,  0, 26,  7,  7,  7, 25,  1,  3,  3,  6,
+      15,  5, 27,  0, 26,  7,  7,  7, 25,  1,  3,  3,  6, 
+      17,  5, 12,  0, 26,  7,  7,  7, 25,  1,  2,  3,  6, 
+      15,  5,  9,  0, 26,  7,  7,  7, 25,  1,  3,  3,  6,
+      18,  5, 10,  0, 26,  7,  7,  7, 25,  1,  3,  3,  6,
+      17,  5, 28,  0, 26,  7,  7,  7, 25,  1,  3,  3,  6, 20,  8,
+      38, 43, 30, 56, 37, 37, 37, 55, 31, 59, 36,
+      54, 30, 56, 37, 37, 37, 55, 31, 59, 36,
+      48, 35, 42, 30, 56, 37, 37, 37, 55, 31, 33, 59, 36,
+      49, 35, 57, 30, 56, 37, 37, 37, 34, 59, 36,
+      46, 35, 40, 30, 56, 37, 37, 37, 55, 31, 55, 31, 33, 59, 36,
+      44, 38, 52, 35, 51, 38, 57, 30, 56, 37, 37, 37, 55, 31, 33, 59, 36,
+      45, 35, 57, 30, 56, 37, 37, 37, 55, 31, 33, 59, 36, 
+      47, 35, 42, 30, 56, 37, 37, 37, 55, 31, 32, 59, 36, 
+      45, 35, 39, 30, 56, 37, 37, 37, 55, 31, 33, 59, 36,
+      48, 35, 40, 30, 56, 37, 37, 37, 55, 31, 33, 59, 36,
+      47, 35, 58, 30, 56, 37, 37, 37, 55, 31, 33, 59, 36, 50, 38
+    </Vector>
+    <Vector name="LayerSense" type="numeric" nEntries="288">
+      0, 0, 2, 8, 1, 1, 1, 7, 3, 4, 0,
+      0, 2, 8, 1, 1, 1, 7, 3, 5, 0,
+      0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 5, 5, 0,
+      0, 0, 0, 2, 8, 1, 1, 1, 6, 5, 0,
+      0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 7, 3, 5, 5, 0,
+      0, 0, 0, 0, 0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 5, 5, 0,
+      0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 5, 5, 0,
+      0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 4, 5, 0,
+      0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 5, 5, 0,
+      0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 5, 5, 0,
+      0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 5, 5, 0, 0, 0,
+      0, 0, 2, 8, 1, 1, 1, 7, 3, 9, 0,
+      0, 2, 8, 1, 1, 1, 7, 3, 9, 0,
+      0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 5, 9, 0,
+      0, 0, 0, 2, 8, 1, 1, 1, 6, 9, 0,
+      0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 7, 3, 5, 9, 0,
+      0, 0, 0, 0, 0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 5, 9, 0,
+      0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 5, 9, 0,
+      0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 4, 9, 0,
+      0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 5, 9, 0,
+      0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 5, 9, 0,
+      0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 5, 9, 0, 0, 0
+    </Vector>
+    <Vector name="MaxModule" type="numeric" nEntries="288">
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0,
+      0, 0, 0, 2, 2, 2, 2, 2, 2, 2, 0,
+      0, 0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0,
+      0, 0, 0, 0, 0, 0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0,
+      0, 0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0,
+      0, 0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0,
+      0, 0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0,
+      0, 0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0,
+      0, 0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0
+    </Vector>
+    <Numeric name="zMinBlock"   value="[hgcal:zminHE]"/>
+    <Numeric name="rMaxFine"    value="[rMaxFine]"/>
+    <Numeric name="waferW"      value="[hgcal:WaferW]"/>
+    <Numeric name="waferGap"    value="1.0*mm"/>
+    <Numeric name="absorberW"   value="[hgcalHE:absorbW]"/>
+    <Numeric name="absorberH"   value="[hgcalHE:absorbH]"/>
+    <Numeric name="rMax"        value="[rMax]"/>
+    <Numeric name="rMaxB"       value="[rMaxB]"/>
+  </Algorithm>
+</PosPartSection> 
+
+<SpecParSection label="hgcalHE.xml" eval="true">
+  <SpecPar name="HGCalHE">
+    <PartSelector path="//HGCalHESiliconSensitive.*"/>
+    <Parameter name="Volume" value="HGCalHESiliconSensitive" eval="false"/>
+    <Parameter name="GeometryMode" value="HGCalGeometryMode::Hexagon" eval="false"/>
+    <Parameter name="RadiusBound"  value="[rMinFine]"/>
+    <Parameter name="RadiusBound"  value="[rMaxFine]"/>
+    <Parameter name="RadiusBound"  value="[rMaxMiddle]"/>
+    <Parameter name="RadiusBound"  value="[rMaxCoarse]"/>
+    <Parameter name="RadiusLimits" value="[rMin]"/>
+    <Parameter name="RadiusLimits" value="[rMax]"/>
+    <Parameter name="LevelTop"     value="99"/>
+  </SpecPar>
+</SpecParSection>
+
+</DDDefinition>
diff --git a/Geometry/HGCalTBCommonData/data/TB181/Oct183/ahcal.xml b/Geometry/HGCalTBCommonData/data/TB181/Oct183/ahcal.xml
new file mode 100644
index 0000000000000..834e1256ae54a
--- /dev/null
+++ b/Geometry/HGCalTBCommonData/data/TB181/Oct183/ahcal.xml
@@ -0,0 +1,214 @@
+<?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="ahcal.xml" eval="true">
+  <Constant name="absorberThick" value="17.2*mm"/>
+  <Constant name="radiatorThick" value="17.2*mm"/>
+  <Constant name="airgapThick"   value="1.285*mm"/>
+  <Constant name="cassetteThick" value="0.5*mm"/>
+  <Constant name="cableThick"    value="1.5*mm"/>
+  <Constant name="pcbThick"      value="0.7*mm"/>
+  <Constant name="foilThick"     value="0.115*mm"/>
+  <Constant name="scintThick"    value="3.0*mm"/>
+  <Constant name="passiveHeight" value="72.0*cm"/>
+  <Constant name="passiveWidth"  value="72.0*cm"/>
+  <Constant name="activeHeight"  value="72.0*cm"/>
+  <Constant name="activeWidth"   value="72.0*cm"/>
+  <Constant name="tileGap"       value="30.0*mm"/>
+  <Constant name="tileHeight"    value="30*mm"/>
+  <Constant name="tileWidth"     value="30*mm"/>
+  <Constant name="tileEdge"      value="0.1*mm"/>
+</ConstantsSection>
+
+<MaterialSection label="ahcal.xml">
+  <CompositeMaterial name="Steel235" density="7.87*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.9843">
+      <rMaterial name="materials:Iron"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.0017">
+      <rMaterial name="materials:Carbon"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.0140">
+      <rMaterial name="materials:Manganese"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+  <CompositeMaterial name="PCB" density="1.70*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.180774">
+      <rMaterial name="materials:Silicon"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.405633">
+      <rMaterial name="materials:Oxygen"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.278042">
+      <rMaterial name="materials:Carbon"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.0684428">
+      <rMaterial name="materials:Hydrogen"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.0671091">
+      <rMaterial name="materials:Bromine"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+  <CompositeMaterial name="Polystyrene" density="1.060*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.077418">
+      <rMaterial name="materials:Hydrogen"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.922582">
+      <rMaterial name="materials:Carbon"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+  <CompositeMaterial name="PVC" density="1.35*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.048384">
+      <rMaterial name="materials:Hydrogen"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.384378">
+      <rMaterial name="materials:Carbon"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.567238">
+      <rMaterial name="materials:Chlorine"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+  <CompositeMaterial name="Polystyrole" density="1.065*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.077421">
+      <rMaterial name="materials:Hydrogen"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.922579">
+      <rMaterial name="materials:Carbon"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+  <CompositeMaterial name="CFM" density="0.120*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.009">
+      <rMaterial name="materials:Air"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.872">
+      <rMaterial name="ahcal:PVC"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.119">
+      <rMaterial name="ahcal:Polystyrole"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+</MaterialSection>
+
+
+<SolidSection label="ahcal.xml">
+  <Box name="AHcalTileSensitive" dx="[tileWidth]/2" dy="[tileHeight]/2"
+       dz="[scintThick]/2"/>
+</SolidSection>
+
+<LogicalPartSection label="ahcal.xml">
+  <LogicalPart name="AHcalTileSensitive" category="unspecified">
+    <rSolid name="AHcalTileSensitive"/>
+    <rMaterial name="ahcal:Polystyrene"/>
+  </LogicalPart>
+</LogicalPartSection>
+
+<PosPartSection label="ahcal.xml">
+  <Algorithm name="hgcal:DDAHcalModuleAlgo">
+    <rParent name="hgcal:HGCalAH"/>
+    <String name="TileName" value="ahcal:AHcalTileSensitive"/>
+    <Vector name="MaterialNames" type="string" nEntries="10">
+      ahcal:Steel235, materials:Air, ahcal:Steel235, ahcal:CFM, ahcal:PCB, 
+      ahcal:Polystyrole, ahcal:Polystyrene, ahcal:Steel235, ahcal:Steel235, 
+      materials:Air</Vector>
+    <Vector name="VolumeNames" type="string" nEntries="10">
+      AHcalRadiator, AHcalAirGa1p, AHcalCassette, AHcalCable, AHcalPCB,
+      AHcalFoil, AHcalActive, AHcalAbsorber, AHcalAbsorberLastCover,
+      AHcalAirGap2</Vector>
+    <Vector name="Thickness" type="numeric" nEntries="10">
+      [ahcal:radiatorThick], [ahcal:airgapThick], [ahcal:cassetteThick], 
+      [ahcal:cableThick], [ahcal:pcbThick], [ahcal:foilThick], 
+      [ahcal:scintThick], [ahcal:absorberThick], 5.0*mm,
+      9.0*mm</Vector>
+    <Vector name="Layers" type="numeric" nEntries="22"> 
+      20, 20, 20, 20, 20, 
+      20, 20, 20, 20, 20, 
+      20, 20, 20, 20, 20, 
+      20, 20, 20, 20, 4, 
+      12, 3
+    </Vector>
+    <Vector name="LayerThick" type="numeric" nEntries="22"> 
+      52.4*mm, 52.4*mm, 52.4*mm, 52.4*mm, 52.4*mm, 
+      52.4*mm, 52.4*mm, 52.4*mm, 52.4*mm, 52.4*mm, 
+      52.4*mm, 52.4*mm, 52.4*mm, 52.4*mm, 52.4*mm, 
+      52.4*mm, 52.4*mm, 52.4*mm, 52.4*mm, 52.4*mm, 
+      44.685*mm, 43.4*mm
+      </Vector>
+    <Vector name="LayerType" type="numeric" nEntries="399"> 
+      7, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1,
+      0, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1,
+      0, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1,
+      0, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1,
+      0, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1,
+      0, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1, 
+      0, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1, 
+      0, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1, 
+      0, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1, 
+      0, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1, 
+      0, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1, 
+      0, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1, 
+      0, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1, 
+      0, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1, 
+      0, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1, 
+      0, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1, 
+      0, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1, 
+      0, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1, 
+      0, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1, 
+      0, 9, 0, 9, 
+      0, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 
+      0, 9, 0
+    </Vector>
+    <Vector name="LayerSense" type="numeric" nEntries="399">
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
+      0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 
+      0, 0, 0
+    </Vector>
+    <Vector name="Widths" type="numeric" nEntries="2">
+      [ahcal:passiveWidth], [ahcal:activeWidth] </Vector>
+    <Vector name="Heights" type="numeric" nEntries="2">
+      [ahcal:passiveHeight], [ahcal:activeHeight] </Vector>
+    <Vector name="TileN" type="numeric" nEntries="2">
+      24, 24 </Vector>
+    <Vector name="TileStep" type="numeric" nEntries="2">
+      [ahcal:tileGap], [ahcal:tileGap] </Vector>
+    <Numeric name="zMinBlock"   value="[hgcal:zminAH]"/>
+    <String name="RotNameSpace" value="hgcalmodule"/>
+  </Algorithm>
+</PosPartSection> 
+
+<SpecParSection label="ahcal.xml" eval="true">
+  <SpecPar name="AHcal">
+    <PartSelector path="//AHcalTileSensitive.*"/>
+    <Parameter name="Volume" value="AHcalTileSensitive" eval="false"/>
+    <Parameter name="SensitiveDetector" value="AHcalSensitiveDetector" eval="false"/>
+    <Parameter name="ReadOutName" value="HcalHits" eval="false"/>
+  </SpecPar>
+  <SpecPar name="hgcProdCutsAHcal">
+    <PartSelector path="//HGCalAH"/>
+    <Parameter name="CMSCutsRegion" value="HGCalAHcalRegion" eval="false"/>
+    <Parameter name="ProdCutsForElectrons" value="1.0*mm"/>
+<Parameter name="ProdCutsForProtons" value="1.0*mm"/>
+    <Parameter name="ProdCutsForPositrons" value="1.0*mm"/>
+    <Parameter name="ProdCutsForGamma"     value="1.0*mm"/>
+  </SpecPar>
+</SpecParSection>
+
+</DDDefinition>
diff --git a/Geometry/HGCalTBCommonData/data/TB181/Oct183/hgcal.xml b/Geometry/HGCalTBCommonData/data/TB181/Oct183/hgcal.xml
new file mode 100644
index 0000000000000..485d896092fb1
--- /dev/null
+++ b/Geometry/HGCalTBCommonData/data/TB181/Oct183/hgcal.xml
@@ -0,0 +1,259 @@
+<?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="rmin"          value="0.0*fm"/>
+  <Constant name="rmax"          value="52.0*cm"/>
+  <Constant name="zCaloFront"    value="[cms:zCaloFront]"/>
+  <Constant name="rminEE"        value="0.0*fm"/>
+  <Constant name="rmaxEE"        value="8.0*cm"/>
+  <Constant name="rmaxEEF"       value="9.5*cm"/>
+  <Constant name="zminEE"        value="0.0*fm"/>
+  <Constant name="zmaxEE"        value="66.2*cm"/>
+  <Constant name="rminHE"        value="0.0*fm"/>
+  <Constant name="rmaxHE"        value="19.5*cm"/>
+  <Constant name="rmaxHEF"       value="26.5*cm"/>
+  <Constant name="zminHE"        value="0.0*fm"/>
+  <Constant name="zmaxHE"        value="103.2*cm"/>
+  <Constant name="rminAH"        value="0.0*fm"/>
+  <Constant name="rmaxAH"        value="[rmax]"/>
+  <Constant name="zminAH"        value="0.0*fm"/>
+  <Constant name="zmaxAH"        value="114*cm"/>
+  <Constant name="zgapEEFH"      value="3.5*cm"/>
+  <Constant name="zgapFHBH"      value="3.0*cm"/>
+  <Constant name="zCalor"        value="([zmaxEE]+[zgapEEFH]+[zmaxHE]+[zgapFHBH]+
+					[zmaxAH])/2.0"/>
+  <Constant name="zposCalo"      value="([zCaloFront]+[zCalor])"/>
+  <Constant name="zposEE"        value="-[zCalor]"/>
+  <Constant name="zposHE"        value="[zposEE]+[zmaxEE]+[zgapEEFH]"/>
+  <Constant name="zposAH"        value="[zposHE]+[zmaxHE]+[zgapFHBH]"/>
+  <Constant name="thSilicon"     value="0.1*mm"/>
+  <Constant name="thPCB"         value="1.3*mm"/>
+  <Constant name="thKapton"      value="0.075*mm"/>
+  <Constant name="thCuKapton"    value="0.025*mm"/>
+  <Constant name="thCuPCB"       value="0.175*mm"/>
+  <Constant name="thAbsEE"       value="1.2*mm"/>
+  <Constant name="thAbsEE48To63" value="0.55*mm"/>
+  <Constant name="thAbsEE52To70" value="0.61*mm"/>
+  <Constant name="thAbsEE59To62" value="0.60*mm"/>
+  <Constant name="thAbsEE68To74" value="0.71*mm"/>
+  <Constant name="thAbsCuEE"     value="1.2*mm"/>
+  <Constant name="thAbsHE"       value="1.2*mm"/>
+  <Constant name="thAbsCuHE"     value="1.2*mm"/>
+  <Constant name="thAbsPCBHE"    value="1.2*mm"/>
+  <Constant name="WaferW"        value="123.7*mm"/>
+  <Constant name="tan30deg"      value="tan(30.0*deg)"/>
+</ConstantsSection>
+
+<MaterialSection label="hgcal.xml">
+  <CompositeMaterial name="WCu" density="14.979*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.75">
+      <rMaterial name="materials:Tungsten"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.25">
+      <rMaterial name="materials:Copper"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+</MaterialSection>
+
+<SolidSection label="hgcal.xml">
+  <Tubs name="HGCal" rMin="[rmin]" rMax="[rmax]" dz="[zCalor]" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Polycone name="HGCalEE" startPhi="0*deg" deltaPhi="360*deg">
+    <ZSection z="[zminEE]" rMin="[rminEE]" rMax="[rmaxEEF]"/>
+    <ZSection z="[zmaxEE]" rMin="[rminEE]" rMax="[rmaxEEF]"/>
+  </Polycone>
+  <Polycone name="HGCalHE" startPhi="0*deg" deltaPhi="360*deg">
+    <ZSection z="[zminHE]" rMin="[rminHE]" rMax="[rmaxHEF]"/>
+    <ZSection z="[zmaxHE]" rMin="[rminHE]" rMax="[rmaxHEF]"/>
+  </Polycone>
+  <Polycone name="HGCalAH" startPhi="0*deg" deltaPhi="360*deg">
+    <ZSection z="[zminAH]" rMin="[rminAH]" rMax="[rmaxAH]"/>
+    <ZSection z="[zmaxAH]" rMin="[rminAH]" rMax="[rmaxAH]"/>
+  </Polycone>
+  <Polyhedra name="HGCalEESensitive" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thSilicon]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thSilicon]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+  <Polyhedra name="HGCalHESiliconSensitive" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thSilicon]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thSilicon]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+  <Polyhedra name="HGCalPCB" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thPCB]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thPCB]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+  <Polyhedra name="HGCalKapton" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thKapton]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thKapton]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+  <Polyhedra name="HGCalCuKapton" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thCuKapton]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thCuKapton]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+  <Polyhedra name="HGCalCuPCB" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thCuPCB]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thCuPCB]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+  <Polyhedra name="HGCalEEAbs" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thAbsEE]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thAbsEE]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+  <Polyhedra name="HGCalEEAbs48To63" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thAbsEE48To63]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thAbsEE48To63]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+  <Polyhedra name="HGCalEEAbs52To70" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thAbsEE52To70]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thAbsEE52To70]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+  <Polyhedra name="HGCalEEAbs59To62" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thAbsEE59To62]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thAbsEE59To62]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+  <Polyhedra name="HGCalEEAbs68To74" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thAbsEE68To74]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thAbsEE68To74]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+  <Polyhedra name="HGCalEECuAbs" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thAbsCuEE]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thAbsCuEE]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+  <Polyhedra name="HGCalHEAbs" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thAbsHE]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thAbsHE]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+  <Polyhedra name="HGCalHECuAbs" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thAbsCuHE]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thAbsCuHE]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+  <Polyhedra name="HGCalHEPCBAbs" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thAbsPCBHE]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thAbsPCBHE]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+</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>
+  <LogicalPart name="HGCalAH" category="unspecified">
+    <rSolid name="HGCalAH"/>
+    <rMaterial name="materials:Air"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalEESensitive" category="unspecified">
+    <rSolid name="HGCalEESensitive"/>
+    <rMaterial name="materials:Air"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalHESiliconSensitive" category="unspecified">
+    <rSolid name="HGCalHESiliconSensitive"/>
+    <rMaterial name="materials:Air"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalEEPCB" category="unspecified">
+    <rSolid name="HGCalPCB"/>
+    <rMaterial name="materials:G10"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalHEPCB" category="unspecified">
+    <rSolid name="HGCalPCB"/>
+    <rMaterial name="materials:G10"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalEEKapton" category="unspecified">
+    <rSolid name="HGCalKapton"/>
+    <rMaterial name="materials:Kapton"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalEECuKapton" category="unspecified">
+    <rSolid name="HGCalCuKapton"/>
+    <rMaterial name="materials:Copper"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalEECuPCB" category="unspecified">
+    <rSolid name="HGCalCuPCB"/>
+    <rMaterial name="materials:Copper"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalHEKapton" category="unspecified">
+    <rSolid name="HGCalKapton"/>
+    <rMaterial name="materials:Kapton"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalHECuKapton" category="unspecified">
+    <rSolid name="HGCalCuKapton"/>
+    <rMaterial name="materials:Copper"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalHECuPCB" category="unspecified">
+    <rSolid name="HGCalCuPCB"/>
+    <rMaterial name="materials:Copper"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalEEAbsorber" category="unspecified">
+    <rSolid name="HGCalEEAbs"/>
+    <rMaterial name="hgcal:WCu"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalEEAbsorber48To63" category="unspecified">
+    <rSolid name="HGCalEEAbs48To63"/>
+    <rMaterial name="hgcal:WCu"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalEEAbsorber52To70" category="unspecified">
+    <rSolid name="HGCalEEAbs52To70"/>
+    <rMaterial name="hgcal:WCu"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalEEAbsorber59To62" category="unspecified">
+    <rSolid name="HGCalEEAbs59To62"/>
+    <rMaterial name="hgcal:WCu"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalEEAbsorber68To74" category="unspecified">
+    <rSolid name="HGCalEEAbs68To74"/>
+    <rMaterial name="hgcal:WCu"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalEECuAbsorber" category="unspecified">
+    <rSolid name="HGCalEECuAbs"/>
+    <rMaterial name="materials:Copper"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalHEAbsorber" category="unspecified">
+    <rSolid name="HGCalHEAbs"/>
+    <rMaterial name="hgcal:WCu"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalHECuAbsorber" category="unspecified">
+    <rSolid name="HGCalHECuAbs"/>
+    <rMaterial name="materials:Copper"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalHEPCBAbsorber" category="unspecified">
+    <rSolid name="HGCalHEPCBAbs"/>
+    <rMaterial name="materials:G10"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalHEAirAbsorber" category="unspecified">
+    <rSolid name="HGCalHEPCBAbs"/>
+    <rMaterial name="materials:Air"/>
+  </LogicalPart>
+</LogicalPartSection>
+
+<PosPartSection label="hgcal.xml">
+  <PosPart copyNumber="1">
+    <rParent name="cms:CMSE"/>
+    <rChild name="hgcal:HGCal"/>
+    <Translation x="0*fm" y="0*fm" z="[zposCalo]"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcal:HGCal"/>
+    <rChild name="hgcal:HGCalEE"/>
+    <Translation x="0*fm" y="0*fm" z="[zposEE]"/>
+    <rRotation name="rotations:R090"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcal:HGCal"/>
+    <rChild name="hgcal:HGCalHE"/>
+    <Translation x="0*fm" y="0*fm" z="[zposHE]"/>
+    <rRotation name="rotations:R090"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcal:HGCal"/>
+    <rChild name="hgcal:HGCalAH"/>
+    <Translation x="0*fm" y="0*fm" z="[zposAH]"/>
+    <rRotation name="rotations:000D"/>
+  </PosPart>
+</PosPartSection>
+</DDDefinition>
diff --git a/Geometry/HGCalTBCommonData/data/TB181/Oct183/hgcalBeam.xml b/Geometry/HGCalTBCommonData/data/TB181/Oct183/hgcalBeam.xml
new file mode 100644
index 0000000000000..cfc7105ca6e74
--- /dev/null
+++ b/Geometry/HGCalTBCommonData/data/TB181/Oct183/hgcalBeam.xml
@@ -0,0 +1,431 @@
+<?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="hgcalBeam.xml" eval="true">
+  <Constant name="upstreamDxby2" value="100.0*cm"/>
+  <Constant name="upstreamDyby2" value="100.0*cm"/>
+  <Constant name="upstreamDzby2" value="400.0*cm"/>
+  <Constant name="upstreamZ" value="-400.0*cm"/>
+  <Constant name="tol" value="0.0*mm"/>
+  <Constant name="chambDxby2" value="11.0*cm"/>
+  <Constant name="chambAlT" value="5.0*mm"/>
+  <Constant name="chambKapW" value="11.0*cm"/>
+  <Constant name="chambKapT" value="0.025*mm"/>
+  <Constant name="chambVetW" value="25.0*mm"/>
+  <Constant name="chambVetT" value="5.0*mm"/>
+  <Constant name="chambVetGap" value="12.0*cm"/>
+  <Constant name="chambVetL" value="0.5*([chambVetGap]+[chambVetW])"/>
+  <Constant name="chambVetX" value="0.5*[chambVetW]"/>
+  <Constant name="chambVetZ" value="20.0*mm"/>
+  <Constant name="chambGasGap" value="([chambVetZ]+0.5*[chambVetT]+[tol])"/>
+  <Constant name="chambGasW" value="([chambVetW]+0.5*[chambVetGap]+[tol])"/>
+  <Constant name="chambDzby2" value="([chambGasGap]+[chambAlT]+2*[tol])"/>
+  <Constant name="chambAl1L" value="0.5*([chambDxby2]+0.5*[chambKapW])"/>
+  <Constant name="chambAl1W" value="0.5*([chambDxby2]-0.5*[chambKapW])"/>
+  <Constant name="chambAl1X" value="([chambDxby2]-[chambAl1L])"/>
+  <Constant name="chambAl1Y" value="([chambDxby2]-[chambAl1W])"/>
+  <Constant name="chambAl1Z" value="([chambGasGap]+0.5*[chambAlT]+[tol])"/>
+  <Constant name="chambAl2L" value="([chambDxby2]-0.5*[chambAlT])"/>
+  <Constant name="chambAl2X" value="([chambDxby2]-[chambAl2L])"/>
+  <Constant name="chambAl2Y" value="([chambDxby2]-0.5*[chambAlT])"/>
+  <Constant name="chamb1Z" value="-507.6*cm"/>
+  <Constant name="chamb2Z" value="-400.3*cm"/>
+  <Constant name="chamb3Z" value="-200.5*cm"/>
+  <Constant name="s1Dxby2" value="7.0*cm"/>
+  <Constant name="s1Dzby2" value="5.0*mm"/>
+  <Constant name="s1Z" value="-375.4*cm"/>
+  <Constant name="s2Dxby2" value="2.0*cm"/>
+  <Constant name="s2Dzby2" value="5.0*mm"/>
+  <Constant name="s2Z" value="-360.5*cm"/>
+  <Constant name="s3Dxby2" value="1.0*cm"/>
+  <Constant name="s3Dzby2" value="5.0*mm"/>
+  <Constant name="s3Z" value="-345.6*cm"/>
+  <Constant name="s4Z" value="-240.8*cm"/>
+  <Constant name="bhDxby2" value="50.0*cm"/>
+  <Constant name="bhDyby2" value="15.0*cm"/>
+  <Constant name="bhDzby2" value="0.5*cm"/>
+  <Constant name="bhGap" value="7.5*cm"/>
+  <Constant name="bhX" value="([bhDxby2]-0.5*[bhGap])"/>
+  <Constant name="bhY" value="([bhDyby2]+0.5*[bhGap])"/>
+  <Constant name="bhZ1" value="-229.3*cm"/>
+  <Constant name="bhZ2" value="-221.3*cm"/>
+  <Constant name="ck3Rad" value="8.35*cm"/>
+  <Constant name="ck3L" value="200.0*cm"/>
+  <Constant name="ck3Z" value="-569.0*cm"/>
+  <Constant name="downstreamDxby2" value="50.0*cm"/>
+  <Constant name="downstreamDyby2" value="50.0*cm"/>
+  <Constant name="downstreamDzby2" value="100.0*cm"/>
+  <Constant name="downstreamZ" value="900.0*cm"/>
+  <Constant name="chamb4Z" value="840.8*cm"/>
+  <Constant name="chamb5Z" value="966.8*cm"/>
+  <Constant name="mcDxby2" value="40.0*cm"/>
+  <Constant name="mcDzby2" value="20.0*mm"/>
+  <Constant name="mc1Z" value="892.8*cm"/>
+  <Constant name="mc2Z" value="984.8*cm"/>
+  <Constant name="s5Dxby2" value="9.5*cm"/>
+  <Constant name="s5Dzby2" value="2.0*cm"/>
+  <Constant name="s5Z"     value="([hgcal:zCaloFront]-[s5Dzby2])"/>
+</ConstantsSection>
+
+<SolidSection label="hgcalBeam.xml">
+  <Box name="HGCalBeam" dx="[upstreamDxby2]" dy="[upstreamDyby2]" dz="[upstreamDzby2]"/>
+  <Box name="HGCalBeamWChamb" dx="[chambDxby2]" dy="[chambDxby2]" dz="[chambDzby2]"/>
+  <Box name="HGCalBeamWChambGas" dx="[chambGasW]" dy="[chambGasW]" dz="[chambGasGap]"/>
+  <Box name="HGCalBeamWChambVet" dx="[chambVetL]" dy="[chambVetW]/2" dz="[chambVetT]/2"/>
+  <Box name="HGCalBeamWChambWindow" dx="[chambKapW]/2" dy="[chambKapW]/2" dz="[chambKapT]/2"/>
+  <Box name="HGCalBeamWChambAl1" dx="[chambAl1L]" dy="[chambAl1W]" dz="[chambAlT]/2"/>
+  <Box name="HGCalBeamWChambAl2" dx="[chambAl2L]" dy="[chambAlT]/2" dz="[chambGasGap]"/>
+  <Box name="HGCalBeamS1" dx="[s1Dxby2]" dy="[s1Dxby2]" dz="[s1Dzby2]"/>
+  <Box name="HGCalBeamS2" dx="[s2Dxby2]" dy="[s2Dxby2]" dz="[s2Dzby2]"/>
+  <Box name="HGCalBeamS3" dx="[s3Dxby2]" dy="[s3Dxby2]" dz="[s3Dzby2]"/>
+  <Box name="HGCalBeamS4" dx="[s1Dxby2]" dy="[s1Dxby2]" dz="[s1Dzby2]"/>
+  <Box name="HGCalBeamS5" dx="[s5Dxby2]" dy="[s5Dxby2]" dz="[s5Dzby2]"/>
+  <Box name="HGCalBeamHaloCounter" dx="[bhDxby2]" dy="[bhDyby2]" dz="[bhDzby2]"/>
+  <Tubs name="HGCalBeamCK3" rMin="0*fm" rMax="[ck3Rad]" dz="[ck3L]/2" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Box name="HGCalBeamDown" dx="[downstreamDxby2]" dy="[downstreamDyby2]" dz="[downstreamDzby2]"/>
+  <Box name="HGCalBeamMuonCounter" dx="[mcDxby2]" dy="[mcDxby2]" dz="[mcDzby2]"/>
+</SolidSection>
+
+<LogicalPartSection label="hgcalBeam.xml">
+  <LogicalPart name="HGCalBeam" category="unspecified">
+    <rSolid name="HGCalBeam"/>
+    <rMaterial name="materials:Air"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamWChamb" category="unspecified">
+    <rSolid name="HGCalBeamWChamb"/>
+    <rMaterial name="materials:Air"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamWChambGas" category="unspecified">
+    <rSolid name="HGCalBeamWChambGas"/>
+    <rMaterial name="materials:Ar 50pct plus CO_2 50pct"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamWChambVet" category="unspecified">
+    <rSolid name="HGCalBeamWChambVet"/>
+    <rMaterial name="materials:Polyethylene"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamWChambWindow" category="unspecified">
+    <rSolid name="HGCalBeamWChambWindow"/>
+    <rMaterial name="materials:Kapton"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamWChambAl1" category="unspecified">
+    <rSolid name="HGCalBeamWChambAl1"/>
+    <rMaterial name="materials:Aluminium"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamWChambAl2" category="unspecified">
+    <rSolid name="HGCalBeamWChambAl2"/>
+    <rMaterial name="materials:Aluminium"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamS1" category="unspecified">
+    <rSolid name="HGCalBeamS1"/>
+    <rMaterial name="materials:Scintillator"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamS2" category="unspecified">
+    <rSolid name="HGCalBeamS2"/>
+    <rMaterial name="materials:Scintillator"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamS3" category="unspecified">
+    <rSolid name="HGCalBeamS3"/>
+    <rMaterial name="materials:Scintillator"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamS4" category="unspecified">
+    <rSolid name="HGCalBeamS4"/>
+    <rMaterial name="materials:Scintillator"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamS5" category="unspecified">
+    <rSolid name="HGCalBeamS5"/>
+    <rMaterial name="materials:Scintillator"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamHaloCounter" category="unspecified">
+    <rSolid name="HGCalBeamHaloCounter"/>
+    <rMaterial name="materials:Scintillator"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamCK3" category="unspecified">
+    <rSolid name="HGCalBeamCK3"/>
+    <rMaterial name="materials:Freon-12"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamDown" category="unspecified">
+    <rSolid name="HGCalBeamDown"/>
+    <rMaterial name="materials:Air"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamMuonCounter" category="unspecified">
+    <rSolid name="HGCalBeamMuonCounter"/>
+    <rMaterial name="materials:Scintillator"/>
+  </LogicalPart>
+</LogicalPartSection>
+
+<RotationSection label="hgcalBeam.xml">
+  <Rotation name="R1" phiX="90*deg" thetaX="90*deg" phiY="180*deg" thetaY="90*deg" phiZ="0*deg" thetaZ="0*deg"/>
+</RotationSection>
+
+<PosPartSection label="hgcalBeam.xml">
+  <PosPart copyNumber="1">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambGas"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl1"/>
+    <Translation x="[chambAl1X]" y="[chambAl1Y]" z="[chambAl1Z]"/>
+  </PosPart>
+  <PosPart copyNumber="2">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl1"/>
+    <Translation x="-[chambAl1Y]" y="[chambAl1X]" z="[chambAl1Z]"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="3">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl1"/>
+    <Translation x="-[chambAl1X]" y="-[chambAl1Y]" z="[chambAl1Z]"/>
+  </PosPart>
+  <PosPart copyNumber="4">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl1"/>
+    <Translation x="[chambAl1Y]" y="-[chambAl1X]" z="[chambAl1Z]"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="5">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl1"/>
+    <Translation x="[chambAl1X]" y="[chambAl1Y]" z="-[chambAl1Z]"/>
+  </PosPart>
+  <PosPart copyNumber="6">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl1"/>
+    <Translation x="-[chambAl1Y]" y="[chambAl1X]" z="-[chambAl1Z]"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="7">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl1"/>
+    <Translation x="-[chambAl1X]" y="-[chambAl1Y]" z="-[chambAl1Z]"/>
+  </PosPart>
+  <PosPart copyNumber="8">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl1"/>
+    <Translation x="[chambAl1Y]" y="-[chambAl1X]" z="-[chambAl1Z]"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl2"/>
+    <Translation x="[chambAl2X]" y="[chambAl2Y]" z="0*fm"/>
+  </PosPart>
+  <PosPart copyNumber="2">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl2"/>
+    <Translation x="-[chambAl2Y]" y="[chambAl2X]" z="0*fm"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="3">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl2"/>
+    <Translation x="-[chambAl2X]" y="-[chambAl2Y]" z="0*fm"/>
+  </PosPart>
+  <PosPart copyNumber="4">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl2"/>
+    <Translation x="[chambAl2Y]" y="-[chambAl2X]" z="0*fm"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambWindow"/>
+    <Translation x="0*fm" y="0*fm" z="([chambDzby2]-0.5*[chambKapT])"/>
+  </PosPart>
+  <PosPart copyNumber="2">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambWindow"/>
+    <Translation x="0*fm" y="0*fm" z="-([chambDzby2]-0.5*[chambKapT])"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="[chambVetX]" y="[chambVetL]" z="[chambVetZ]"/>
+  </PosPart>
+  <PosPart copyNumber="2">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="-[chambVetL]" y="[chambVetX]" z="[chambVetZ]"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="3">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="-[chambVetX]" y="-[chambVetL]" z="[chambVetZ]"/>
+  </PosPart>
+  <PosPart copyNumber="4">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="[chambVetL]" y="-[chambVetX]" z="[chambVetZ]"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="5">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="[chambVetX]" y="[chambVetL]" z="0*fm"/>
+  </PosPart>
+  <PosPart copyNumber="6">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="-[chambVetL]" y="[chambVetX]" z="0*fm"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="7">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="-[chambVetX]" y="-[chambVetL]" z="0*fm"/>
+  </PosPart>
+  <PosPart copyNumber="8">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="[chambVetL]" y="-[chambVetX]" z="0*fm"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="9">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="[chambVetX]" y="[chambVetL]" z="-[chambVetZ]"/>
+  </PosPart>
+  <PosPart copyNumber="10">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="-[chambVetL]" y="[chambVetX]" z="-[chambVetZ]"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="11">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="-[chambVetX]" y="-[chambVetL]" z="-[chambVetZ]"/>
+  </PosPart>
+  <PosPart copyNumber="12">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="[chambVetL]" y="-[chambVetX]" z="-[chambVetZ]"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamWChamb"/>
+    <Translation x="0*fm" y="0*fm" z="([chamb1Z]-[upstreamZ]-[chambDzby2])"/>
+  </PosPart>
+  <PosPart copyNumber="2">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamWChamb"/>
+    <Translation x="0*fm" y="0*fm" z="([chamb2Z]-[upstreamZ]-[chambDzby2])"/>
+  </PosPart>
+  <PosPart copyNumber="3">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamWChamb"/>
+    <Translation x="0*fm" y="0*fm" z="([chamb3Z]-[upstreamZ]-[chambDzby2])"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamS1"/>
+    <Translation x="0*fm" y="0*fm" z="([s1Z]-[upstreamZ]-[s1Dzby2])"/>
+  </PosPart>
+  <PosPart copyNumber="2">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamS2"/>
+    <Translation x="0*fm" y="0*fm" z="([s2Z]-[upstreamZ]-[s2Dzby2])"/>
+  </PosPart>
+  <PosPart copyNumber="3">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamS3"/>
+    <Translation x="0*fm" y="0*fm" z="([s3Z]-[upstreamZ]-[s3Dzby2])"/>
+  </PosPart>
+  <PosPart copyNumber="4">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamS4"/>
+    <Translation x="0*fm" y="0*fm" z="([s4Z]-[upstreamZ]-[s1Dzby2])"/>
+  </PosPart>
+  <PosPart copyNumber="11">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamHaloCounter"/>
+    <Translation x="0*fm" y="[bhY]" z="([bhZ2]+[bhDzby2]-[upstreamZ])"/>
+  </PosPart>
+  <PosPart copyNumber="12">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamHaloCounter"/>
+    <Translation x="0*fm" y="-[bhY]" z="([bhZ2]+[bhDzby2]-[upstreamZ])"/>
+  </PosPart>
+  <PosPart copyNumber="13">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamHaloCounter"/>
+    <Translation x="-[bhY]" y="0*fm" z="([bhZ1]+[bhDzby2]-[upstreamZ])"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="14">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamHaloCounter"/>
+    <Translation x="[bhY]" y="0*fm" z="([bhZ1]+[bhDzby2]-[upstreamZ])"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="0">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamCK3"/>
+    <Translation x="0*fm" y="0*fm" z="([ck3Z]-[upstreamZ]-0.5*[ck3L])"/>
+  </PosPart>
+  <PosPart copyNumber="4">
+    <rParent name="hgcalBeam:HGCalBeamDown"/>
+    <rChild name="hgcalBeam:HGCalBeamWChamb"/>
+    <Translation x="0*fm" y="0*fm" z="([chamb4Z]-[downstreamZ]-[chambDzby2])"/>
+  </PosPart>
+  <PosPart copyNumber="5">
+    <rParent name="hgcalBeam:HGCalBeamDown"/>
+    <rChild name="hgcalBeam:HGCalBeamWChamb"/>
+    <Translation x="0*fm" y="0*fm" z="([chamb5Z]-[downstreamZ]-[chambDzby2])"/>
+  </PosPart>
+  <PosPart copyNumber="7">
+    <rParent name="hgcalBeam:HGCalBeamDown"/>
+    <rChild name="hgcalBeam:HGCalBeamMuonCounter"/>
+    <Translation x="0*fm" y="0*fm" z="([mc1Z]-[downstreamZ]-[mcDzby2])"/>
+  </PosPart>
+  <PosPart copyNumber="8">
+    <rParent name="hgcalBeam:HGCalBeamDown"/>
+    <rChild name="hgcalBeam:HGCalBeamMuonCounter"/>
+    <Translation x="0*fm" y="0*fm" z="([mc2Z]-[downstreamZ]-[mcDzby2])"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="cms:CMSE"/>
+    <rChild name="hgcalBeam:HGCalBeam"/>
+    <Translation x="0*fm" y="0*fm" z="[upstreamZ]"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="cms:CMSE"/>
+    <rChild name="hgcalBeam:HGCalBeamDown"/>
+    <Translation x="0*fm" y="0*fm" z="[downstreamZ]"/>
+  </PosPart>
+  <PosPart copyNumber="5">
+    <rParent name="cms:CMSE"/>
+    <rChild name="hgcalBeam:HGCalBeamS5"/>
+    <Translation x="0*fm" y="0*fm" z="[s5Z]"/>
+  </PosPart>
+</PosPartSection>
+
+<SpecParSection label="hgcalBeam.xml" eval="true">
+  <SpecPar name="hgcalbeam">
+    <PartSelector path="//HGCalBeamS.*"/>
+    <PartSelector path="//HGCalBeamHaloCounter"/>
+    <PartSelector path="//HGCalBeamMuonCounter"/>
+    <PartSelector path="//HGCalBeamCK3"/>
+    <PartSelector path="//HGCalBeamWChambGas"/>
+    <Parameter name="SensitiveDetector" value="HcalTB06BeamDetector" eval="false"/>
+    <Parameter name="ReadOutName" value="HcalTB06BeamHits" eval="false"/>
+  </SpecPar>
+  <SpecPar name="hgcalbeamWC">
+    <PartSelector path="//HGCalBeamWChambGas"/>
+    <Parameter name="Volume" value="WireChamber" eval="false"/>
+  </SpecPar>
+  <SpecPar name="hgcProdCutsBeam">
+    <PartSelector path="//HGCalBeam"/>
+    <PartSelector path="//HGCalBeamDown"/>
+    <Parameter name="CMSCutsRegion" value="HGCalBeamRegion" eval="false"/>
+    <Parameter name="ProdCutsForElectrons" value="1.0*mm"/>
+<Parameter name="ProdCutsForProtons" value="1.0*mm"/>
+    <Parameter name="ProdCutsForPositrons" value="1.0*mm"/>
+    <Parameter name="ProdCutsForGamma"     value="1.0*mm"/>
+  </SpecPar>
+</SpecParSection>
+
+</DDDefinition>
diff --git a/Geometry/HGCalTBCommonData/data/TB181/Oct183/hgcalEE.xml b/Geometry/HGCalTBCommonData/data/TB181/Oct183/hgcalEE.xml
new file mode 100644
index 0000000000000..1d037254e70e3
--- /dev/null
+++ b/Geometry/HGCalTBCommonData/data/TB181/Oct183/hgcalEE.xml
@@ -0,0 +1,145 @@
+<?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="hgcalEE.xml" eval="true">
+  <Constant name="rMinFine"   value="0.0*fm"/>
+  <Constant name="rMaxFine"   value="0.0*cm"/>
+  <Constant name="rMaxMiddle" value="120.0*cm"/>
+  <Constant name="rMaxCoarse" value="2000.0*cm"/>
+  <Constant name="rMin"       value="0.0*fm"/>
+  <Constant name="rMax"       value="[hgcal:rmaxEE]"/>
+  <Constant name="rMaxB"      value="[hgcal:rmaxEEF]"/>
+  <Constant name="absorbW"    value="0.5*[hgcal:WaferW]"/>
+  <Constant name="absorbH"    value="[hgcal:WaferW]*[hgcal:tan30deg]"/>
+</ConstantsSection>
+
+<PosPartSection label="hgcalEE.xml">
+  <Algorithm name="hgcal:DDHGCalTBModuleX">
+    <rParent name="hgcal:HGCalEE"/>
+    <String name="GeneralMaterial" value="materials:Air"/>
+    <Vector name="WaferName" type="string" nEntries="2">
+      hgcalwafer:HGCalEEWaferFine, hgcalwafer:HGCalEEWaferCoarse</Vector>
+    <Vector name="CoverName" type="string" nEntries="11">
+      hgcal:HGCalEESensitive,        hgcal:HGCalEEPCB,
+      hgcal:HGCalEEKapton,           hgcal:HGCalEEAbsorber,
+      hgcal:HGCalEECuAbsorber,       hgcal:HGCalEEAbsorber48To63,
+      hgcal:HGCalEEAbsorber52To70,   hgcal:HGCalEEAbsorber59To62, 
+      hgcal:HGCalEEAbsorber68To74,   hgcal:HGCalEECuKapton, 
+      hgcal:HGCalEECuPCB</Vector>
+    <Vector name="MaterialNames" type="string" nEntries="43">
+      materials:Air,       materials:Air,       materials:Air, 
+      materials:Air,       materials:Air,       materials:Air,
+      materials:Air,       materials:Air,       materials:StainlessSteel, 
+      materials:Lead,      materials:Copper,    materials:Air, 
+      materials:Aluminium, materials:Air,       materials:Air,   
+      materials:Air,       materials:Air,       materials:Air,
+      materials:Air,       materials:Air,       materials:Air,
+      materials:Air,       materials:Air,       materials:Air,
+      materials:Air,       materials:Air,       materials:Air,
+      materials:Air,       materials:Air,       materials:Air,
+      materials:Air,       materials:Air,       materials:Air,
+      materials:Air,       materials:Air,       materials:Air,
+      materials:Iron,      materials:Tungsten,  materials:Tungsten, 
+      materials:Air,       materials:Air,       materials:Air,
+      materials:Aluminium</Vector>
+    <Vector name="VolumeNames" type="string" nEntries="43">
+      EEPCB,             EEKapton,          EECuWShield, 
+      EECuShield,        EECuWShield48To63, EECuWShield52To70,
+      EECuWShield59To62, EECuWShield68To74, EEFeAbsorber, 
+      EEPbAbsorber,      EECuHeatShield,    EESensitive, 
+      EEAlcase,          EEgap1,            EEgap2,      
+      EEgap3,            EEgap4,            EEgap5,      
+      EEgap6,            EEgap7,            EEgap8,      
+      EEgap9,            EEgap10,           EEgap11,      
+      EEgap12,           EEgap13,           EEgap14,      
+      EEgap15,           EEgap16,           EEgap17,      
+      EEgap18,           EEgap19,           EEgap20,      
+      EEgap21,           EEgap22,           EEgap23,      
+      EEFHAbs,           EETungsten2,       EETunsten2p8,
+      EECuKapton,        EECuPCB,           EEgap24,
+      EEMCPAl</Vector>
+    <Vector name="Thickness" type="numeric" nEntries="43">
+      [hgcal:thPCB],         [hgcal:thKapton],      [hgcal:thAbsEE], 
+      [hgcal:thAbsCuEE],     [hgcal:thAbsEE48To63], [hgcal:thAbsEE52To70],
+      [hgcal:thAbsEE59To62], [hgcal:thAbsEE68To74], 0.3*mm,        
+      4.9*mm,                6.0*mm,                [hgcal:thSilicon],   
+      2.1*mm,                1.6*mm,                1.9*mm, 
+      2.2*mm,                2.6*mm,                2.7*mm,
+      2.8*mm,                3.2*mm,                3.6*mm, 
+      3.7*mm,                3.8*mm,                4.09*mm, 
+      4.3*mm,                4.69*mm,               5.0*mm, 
+      5.5*mm,                6.5*mm,                6.9*mm, 
+      7.4*mm,                7.8*mm,                8.99*mm, 
+      9.0*mm,                12.0*mm,               184.0*mm, 
+      40.0*mm,               2.0*mm,                2.8*mm, 
+      [hgcal:thCuKapton],    [hgcal:thCuPCB],       6.8*mm,
+      5.0*mm</Vector>
+    <Vector name="Layers" type="numeric" nEntries="8"> 
+      22, 17, 17, 17, 17, 17, 28, 35</Vector>
+    <Numeric name="InOut"   value="1"/>
+    <Vector name="LayerFrontIn" type="numeric" nEntries="8"> 
+       0, 21, 38, 55, 72, 89,106,134</Vector>
+    <Vector name="LayerBackIn" type="numeric" nEntries="8"> 
+      20, 37, 54, 71, 88,105,133,168</Vector>
+    <Vector name="BlockThick" type="numeric" nEntries="8"> 
+      233.375*mm, 37.065*mm, 32.165*mm, 
+      35.575*mm,  33.165*mm, 32.275*mm, 
+      71.675*mm,  88.575*mm
+    </Vector>
+    <Vector name="LayerType" type="numeric" nEntries="169"> 
+      12, 35, 8, 9, 8, 17, 10, 28,  8,  9,  8, 34,  0, 40, 11, 11, 11, 39, 1,  2, 10,
+      31, 37, 21, 8, 9, 8, 32,  0, 40, 11, 11, 11, 39,  1,  6,  6, 10,
+      31, 37, 21, 8, 9, 8, 23,  0, 40, 11, 11, 11, 39,  1,  6,  6, 10,
+      31, 38, 21, 8, 9, 8, 27,  0, 40, 11, 11, 11, 39,  1,  3,  2, 10,
+      41, 38, 24, 8, 9, 8, 25,  0, 40, 11, 11, 11, 39,  1,  6,  6, 10,
+      30, 38, 21, 8, 9, 8, 22,  0, 40, 11, 11, 11, 39,  1,  6,  6, 10,
+      41, 38, 22, 8, 9, 8, 17, 10, 16,  8,  9,  8, 18, 10, 20,  8,  9,  8, 33, 0, 40, 11, 11, 11, 39, 1, 2, 10,
+      29, 38, 26, 8, 9, 8, 14, 10, 30, 8, 9, 8, 17, 10, 15, 8, 9, 8, 19, 10, 13, 8, 9, 8, 21, 0, 40, 11, 11, 11, 39, 1, 2, 10, 12
+    </Vector>
+    <Vector name="MaxModule" nEntries="169">
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+      </Vector>
+    <Vector name="LayerSense" type="numeric" nEntries="169">
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2,11, 1, 1, 1,10, 3, 4, 0,
+      0, 0, 0, 0, 0, 0, 0, 2,11, 1, 1, 1,10, 3, 8, 8, 0,
+      0, 0, 0, 0, 0, 0, 0, 2,11, 1, 1, 1,10, 3, 8, 8, 0,
+      0, 0, 0, 0, 0, 0, 0, 2,11, 1, 1, 1,10, 3, 5, 4, 0,
+      0, 0, 0, 0, 0, 0, 0, 2,11, 1, 1, 1,10, 3, 8, 8, 0,
+      0, 0, 0, 0, 0, 0, 0, 2,11, 1, 1, 1,10, 3, 8, 8, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2,11, 1, 1, 1,10, 3, 4, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2,11, 1, 1, 1,10, 3, 4, 0, 0
+    </Vector>
+    <Numeric name="zMinBlock"   value="[hgcal:zminEE]"/>
+    <Numeric name="rMaxFine"    value="[rMaxFine]"/>
+    <Numeric name="waferW"      value="[hgcal:WaferW]"/>
+    <Numeric name="waferGap"    value="0.0*fm"/>
+    <Numeric name="absorberW"   value="[hgcalEE:absorbW]"/>
+    <Numeric name="absorberH"   value="[hgcalEE:absorbH]"/>
+    <Numeric name="rMax"        value="[rMax]"/>
+    <Numeric name="rMaxB"       value="[rMaxB]"/>
+  </Algorithm>
+</PosPartSection> 
+
+<SpecParSection label="hgcalEE.xml" eval="true">
+  <SpecPar name="HGCalEE">
+    <PartSelector path="//HGCalEESensitive.*"/>    
+    <Parameter name="Volume" value="HGCalEESensitive" eval="false"/>
+    <Parameter name="GeometryMode" value="HGCalGeometryMode::Hexagon" eval="false"/>
+    <Parameter name="RadiusBound"  value="[rMinFine]"/>
+    <Parameter name="RadiusBound"  value="[rMaxFine]"/>
+    <Parameter name="RadiusBound"  value="[rMaxMiddle]"/>
+    <Parameter name="RadiusBound"  value="[rMaxCoarse]"/>
+    <Parameter name="RadiusLimits" value="[rMin]"/>
+    <Parameter name="RadiusLimits" value="[rMax]"/>
+    <Parameter name="LevelTop"     value="99"/>
+  </SpecPar>
+</SpecParSection>
+
+</DDDefinition>
diff --git a/Geometry/HGCalTBCommonData/data/TB181/Oct183/hgcalHE.xml b/Geometry/HGCalTBCommonData/data/TB181/Oct183/hgcalHE.xml
new file mode 100644
index 0000000000000..321a4c7dd47a4
--- /dev/null
+++ b/Geometry/HGCalTBCommonData/data/TB181/Oct183/hgcalHE.xml
@@ -0,0 +1,217 @@
+<?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="hgcalHE.xml" eval="true">
+  <Constant name="rMinFine"   value="0.0*fm"/>
+  <Constant name="rMaxFine"   value="0.0*fm"/>
+  <Constant name="rMaxMiddle" value="0.0*fm"/>
+  <Constant name="rMaxCoarse" value="2000.0*cm"/>
+  <Constant name="rMin"       value="[hgcal:rminHE]"/>
+  <Constant name="rMax"       value="[hgcal:rmaxHE]"/>
+  <Constant name="rMaxB"      value="[hgcal:rmaxHEF]"/>
+  <Constant name="absorbW"    value="1.5*[hgcal:WaferW]"/>
+  <Constant name="absorbH"    value="1.5*[hgcal:WaferW]"/>
+</ConstantsSection>
+
+<PosPartSection label="hgcalHE.xml">
+  <Algorithm name="hgcal:DDHGCalTBModuleX">
+    <rParent name="hgcal:HGCalHE"/>
+    <String name="GeneralMaterial" value="materials:Air"/>
+    <Vector name="WaferName" type="string" nEntries="2">
+      hgcalwafer:HGCalHEWaferFine, hgcalwafer:HGCalHEWaferCoarse</Vector>
+    <Vector name="CoverName" type="string" nEntries="9">
+      hgcal:HGCalHESiliconSensitive, hgcal:HGCalHEPCB, 
+      hgcal:HGCalHEKapton,           hgcal:HGCalHEAbsorber, 
+      hgcal:HGCalHECuAbsorber,       hgcal:HGCalHEPCBAbsorber,
+      hgcal:HGCalHECuKapton,         hgcal:HGCalHECuPCB,
+      hgcal:HGCalHEAirAbsorber</Vector>
+    <Vector name="MaterialNames" type="string" nEntries="66">
+      materials:Air,    materials:Air,    materials:Air,
+      materials:Air,    materials:Air,    materials:Iron, 
+      materials:Copper, materials:Air,    materials:Iron,
+      materials:Air,    materials:Air,    materials:Air,
+      materials:Air,    materials:Air,    materials:Air,
+      materials:Air,    materials:Air,    materials:Air,
+      materials:Air,    materials:Air,    materials:Air,
+      materials:Air,    materials:Air,    materials:Air,
+      materials:Air,    materials:Air,    materials:Air, 
+      materials:Air,    materials:Air,    materials:Air,
+      materials:Air,    materials:Air,    materials:Air,
+      materials:Air,    materials:Air,    materials:Air,
+      materials:Air,    materials:Air,    materials:Iron, 
+      materials:Copper, materials:Air,    materials:Iron,
+      materials:Air,    materials:Air,    materials:Air,
+      materials:Air,    materials:Air,    materials:Air,
+      materials:Air,    materials:Air,    materials:Air,
+      materials:Air,    materials:Air,    materials:Air,
+      materials:Air,    materials:Air,    materials:Air,
+      materials:Air,    materials:Air,    materials:Air, 
+      materials:Air,    materials:Air,    materials:Air,
+      materials:Air,    materials:Air,    materials:Air</Vector>
+    <Vector name="VolumeNames" type="string" nEntries="66">
+      HEPCB,          HEKapton,           HECuWShield, 
+      HECuShield,     HEPCBShield,        HEFeAbsorber,
+      HECuHeatShield, HESiliconSensitive, HEFeBox, 
+      HEAirGap1,      HEAirGap2,          HEAirGap3, 
+      HEAirGap4,      HEAirGap5,          HEAirGap6, 
+      HEAirGap7,      HEAirGap8,          HEAirGap9,
+      HEAirGap10,     HEAirGap11,         HEAirGap12,
+      HEAirGap13,     HEAirGap14,         HEAirGap15,
+      HEAirGap16,     HECuKapton,         HECuPCB, 
+      HEAirGap17,     HEAirGap18,         HEAirGap19,
+      HEAirGap20,     HEAirGap21,         HEAirGap22,
+      HEPCB,          HEKapton,           HECuWShield, 
+      HECuShield,     HEPCBShield,        HEFeAbsorber,
+      HECuHeatShield, HESiliconSensitive, HEFeBox, 
+      HEAirGap1,      HEAirGap2,          HEAirGap3, 
+      HEAirGap4,      HEAirGap5,          HEAirGap6, 
+      HEAirGap7,      HEAirGap8,          HEAirGap9,
+      HEAirGap10,     HEAirGap11,         HEAirGap12,
+      HEAirGap13,     HEAirGap14,         HEAirGap15,
+      HEAirGap16,     HECuKapton,         HECuPCB, 
+      HEAirGap17,     HEAirGap18,         HEAirGap19,
+      HEAirGap20,     HEAirGap21,         HEAirGap22</Vector>
+    <Vector name="Thickness" type="numeric" nEntries="66">
+      [hgcal:thPCB],     [hgcal:thKapton],   [hgcal:thAbsHE], 
+      [hgcal:thAbsCuHE], [hgcal:thAbsPCBHE], 40.0*mm,
+      6.0*mm,            [hgcal:thSilicon],  9.0*mm, 
+      10.2*mm,           10.8*mm,            12.7*mm, 
+      12.8*mm,           14.8*mm,            15.2*mm,
+      5.0*mm,            6.0*mm,             7.0*mm, 
+      7.1*mm,            8.0*mm,             8.5*mm,
+      8.6*mm,            10.0*mm,            40.0*mm, 
+      52*mm,             [hgcal:thCuKapton], [hgcal:thCuPCB], 
+      7.45*mm,           11.8*mm,            25.0*mm,
+      9.1*mm,            9.8*mm,             [hgcal:thAbsCuHE],
+      [hgcal:thPCB],     [hgcal:thKapton],   [hgcal:thAbsHE], 
+      [hgcal:thAbsCuHE], [hgcal:thAbsPCBHE], 40.0*mm,
+      6.0*mm,            [hgcal:thSilicon],  9.0*mm, 
+      10.2*mm,           10.8*mm,            12.7*mm, 
+      12.8*mm,           14.8*mm,            15.2*mm,
+      5.0*mm,            6.0*mm,             7.0*mm, 
+      7.1*mm,            8.0*mm,             8.5*mm,
+      8.6*mm,            10.0*mm,            40.0*mm, 
+      52*mm,             [hgcal:thCuKapton], [hgcal:thCuPCB], 
+      7.45*mm,           11.8*mm,            25.0*mm,
+      9.1*mm,            9.8*mm,             [hgcal:thAbsCuHE]
+    </Vector>
+    <Vector name="BlockThick" type="numeric" nEntries="12"> 
+      29.075*mm, 68.975*mm, 68.075*mm, 
+      71.075*mm, 68.575*mm, 176.1*mm, 
+      69.075*mm, 67.075*mm, 73.475*mm, 
+      66.475*mm, 75.075*mm, 103.525*mm
+    </Vector>
+    <Numeric name="InOut"   value="2"/>
+    <Vector name="LayerFrontIn" type="numeric" nEntries="12"> 
+       0, 12, 25, 38, 51, 62, 82, 95,108,121,134,147</Vector>
+    <Vector name="LayerBackIn" type="numeric" nEntries="12"> 
+      11, 24, 37, 50, 61, 81, 94,107,120,133,146,161</Vector>
+    <Vector name="LayerFrontOut" type="numeric" nEntries="12"> 
+     162,174,187,200,213,224,244,257,270,283,296,309</Vector>
+    <Vector name="LayerBackOut" type="numeric" nEntries="12"> 
+     173,186,199,212,223,243,256,269,282,295,308,323</Vector>
+    <Vector name="LayerType" type="numeric" nEntries="324"> 
+       8, 31,  0, 26,  7,  7,  7, 25,  1,  3,  2,  6,
+      20,  5,  9,  0, 26,  7,  7,  7, 25,  1,  3,  3,  6,
+      19,  5, 31,  0, 26,  7,  7,  7, 25,  1,  3,  2,  6,
+      19,  5, 12,  0, 26,  7,  7,  7, 25,  1,  3,  3,  6,
+      21,  5, 31,  0, 26,  7,  7,  7,  4,  3,  6,
+      17,  5, 11,  0, 26,  7,  7,  7, 25,  1, 25,  3, 25,  1,  3,  6, 15,  8, 24,  5,
+      23,  8, 31,  0, 26,  7,  7,  7, 25,  1,  3,  3,  6,
+      16,  5, 10,  0, 26,  7,  7,  7, 25,  1,  3,  3,  6,
+      19,  5, 14,  0, 26,  7,  7,  7, 25,  1,  2,  3,  6,
+      18,  5, 30,  0, 26,  7,  7,  7, 25,  1,  3,  3,  6,
+      22,  5, 13,  0, 26,  7,  7,  7, 25,  1,  3,  3,  6,
+      27,  5, 28,  0, 26,  7,  7,  7, 25,  1,  3,  3,  6, 29,  8,
+      41, 64, 33, 59, 40, 40, 40, 58, 34, 36, 65, 39,
+      53, 38, 42, 33, 59, 40, 40, 40, 58, 34, 36, 65, 39,
+      52, 38, 64, 33, 59, 40, 40, 40, 58, 34, 36, 65, 39,
+      52, 38, 45, 33, 59, 40, 40, 40, 58, 34, 36, 65, 39,
+      54, 38, 64, 33, 59, 40, 40, 40, 37, 65, 39,
+      50, 38, 44, 33, 59, 40, 40, 40, 58, 34, 58, 36, 58, 34, 65, 39, 48, 41, 57, 38,
+      56, 41, 64, 33, 59, 40, 40, 40, 58, 34, 36, 65, 39,
+      49, 38, 43, 33, 59, 40, 40, 40, 58, 34, 36, 65, 39,
+      52, 38, 47, 33, 59, 40, 40, 40, 58, 34, 36, 65, 39,
+      51, 38, 63, 33, 59, 40, 40, 40, 58, 34, 36, 65, 39,
+      55, 38, 46, 33, 59, 40, 40, 40, 58, 34, 36, 65, 39,
+      60, 38, 61, 33, 59, 40, 40, 40, 58, 34, 36, 65, 39, 62, 41
+    </Vector>
+    <Vector name="LayerSense" type="numeric" nEntries="324">
+      0, 0, 2, 8, 1, 1, 1, 7, 3, 5, 4, 0,
+      0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 5, 5, 0,
+      0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 5, 4, 0,
+      0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 5, 5, 0,
+      0, 0, 0, 2, 8, 1, 1, 1, 6, 5, 0,
+      0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 7, 5, 7, 3, 5, 0, 0, 0, 0, 0, 
+      0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 5, 5, 0,
+      0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 5, 5, 0,
+      0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 4, 5, 0,
+      0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 5, 5, 0,
+      0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 5, 9, 0,
+      0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 5, 9, 0, 0, 0,
+      0, 0, 2, 8, 1, 1, 1, 7, 3, 5, 9, 0,
+      0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 5, 9, 0,
+      0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 5, 9, 0,
+      0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 5, 9, 0,
+      0, 0, 0, 2, 8, 1, 1, 1, 6, 9, 0,
+      0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 7, 5, 7, 3, 9, 0, 0, 0, 0, 0, 
+      0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 5, 9, 0,
+      0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 5, 9, 0,
+      0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 4, 5, 0,
+      0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 5, 9, 0,
+      0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 5, 9, 0,
+      0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 5, 9, 0, 0, 0
+    </Vector>
+    <Vector name="MaxModule" type="numeric" nEntries="324">
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0,
+      0, 0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0,
+      0, 0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0,
+      0, 0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0,
+      0, 0, 0, 2, 2, 2, 2, 2, 2, 2, 0,
+      0, 0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 
+      0, 0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0,
+      0, 0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0,
+      0, 0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0,
+      0, 0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0,
+      0, 0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0,
+      0, 0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0
+    </Vector>
+    <Numeric name="zMinBlock"   value="[hgcal:zminHE]"/>
+    <Numeric name="rMaxFine"    value="[rMaxFine]"/>
+    <Numeric name="waferW"      value="[hgcal:WaferW]"/>
+    <Numeric name="waferGap"    value="1.0*mm"/>
+    <Numeric name="absorberW"   value="[hgcalHE:absorbW]"/>
+    <Numeric name="absorberH"   value="[hgcalHE:absorbH]"/>
+    <Numeric name="rMax"        value="[rMax]"/>
+    <Numeric name="rMaxB"       value="[rMaxB]"/>
+  </Algorithm>
+</PosPartSection> 
+
+<SpecParSection label="hgcalHE.xml" eval="true">
+  <SpecPar name="HGCalHE">
+    <PartSelector path="//HGCalHESiliconSensitive.*"/>
+    <Parameter name="Volume" value="HGCalHESiliconSensitive" eval="false"/>
+    <Parameter name="GeometryMode" value="HGCalGeometryMode::Hexagon" eval="false"/>
+    <Parameter name="RadiusBound"  value="[rMinFine]"/>
+    <Parameter name="RadiusBound"  value="[rMaxFine]"/>
+    <Parameter name="RadiusBound"  value="[rMaxMiddle]"/>
+    <Parameter name="RadiusBound"  value="[rMaxCoarse]"/>
+    <Parameter name="RadiusLimits" value="[rMin]"/>
+    <Parameter name="RadiusLimits" value="[rMax]"/>
+    <Parameter name="LevelTop"     value="99"/>
+  </SpecPar>
+</SpecParSection>
+
+</DDDefinition>
diff --git a/Geometry/HGCalTBCommonData/data/TB181/Oct184/hgcal.xml b/Geometry/HGCalTBCommonData/data/TB181/Oct184/hgcal.xml
new file mode 100644
index 0000000000000..27fb00306d13a
--- /dev/null
+++ b/Geometry/HGCalTBCommonData/data/TB181/Oct184/hgcal.xml
@@ -0,0 +1,259 @@
+<?xml version="1.0"?>
+<DDDefinition>
+
+<ConstantsSection label="hgcal.xml" eval="true">
+  <Constant name="rmin"          value="0.0*fm"/>
+  <Constant name="rmax"          value="52.0*cm"/>
+  <Constant name="zCaloFront"    value="[cms:zCaloFront]"/>
+  <Constant name="rminEE"        value="0.0*fm"/>
+  <Constant name="rmaxEE"        value="19.5*cm"/>
+  <Constant name="rmaxEEF"       value="26.5*cm"/>
+  <Constant name="zminEE"        value="0.0*fm"/>
+  <Constant name="zmaxEE"        value="63.0*cm"/>
+  <Constant name="rminHE"        value="0.0*fm"/>
+  <Constant name="rmaxHE"        value="19.5*cm"/>
+  <Constant name="rmaxHEF"       value="26.5*cm"/>
+  <Constant name="zminHE"        value="0.0*fm"/>
+  <Constant name="zmaxHE"        value="94.5*cm"/>
+  <Constant name="rminAH"        value="0.0*fm"/>
+  <Constant name="rmaxAH"        value="[rmax]"/>
+  <Constant name="zminAH"        value="0.0*fm"/>
+  <Constant name="zmaxAH"        value="114*cm"/>
+  <Constant name="zgapEEFH"      value="3.5*cm"/>
+  <Constant name="zgapFHBH"      value="36.5*cm"/>
+  <Constant name="zCalor"        value="([zmaxEE]+[zgapEEFH]+[zmaxHE]+
+					[zgapFHBH]+[zmaxAH])/2.0"/>
+  <Constant name="zposCalo"      value="([zCaloFront]+[zCalor])"/>
+  <Constant name="zposEE"        value="-[zCalor]"/>
+  <Constant name="zposHE"        value="[zposEE]+[zmaxEE]+[zgapEEFH]"/>
+  <Constant name="zposAH"        value="[zposHE]+[zmaxHE]+[zgapFHBH]"/>
+  <Constant name="thSilicon"     value="0.1*mm"/>
+  <Constant name="thPCB"         value="1.3*mm"/>
+  <Constant name="thKapton"      value="0.075*mm"/>
+  <Constant name="thCuKapton"    value="0.025*mm"/>
+  <Constant name="thCuPCB"       value="0.175*mm"/>
+  <Constant name="thAbsEE"       value="1.2*mm"/>
+  <Constant name="thAbsEE48To63" value="0.55*mm"/>
+  <Constant name="thAbsEE52To70" value="0.60*mm"/>
+  <Constant name="thAbsEE59To62" value="0.61*mm"/>
+  <Constant name="thAbsEE68To74" value="0.71*mm"/>
+  <Constant name="thAbsCuEE"     value="1.2*mm"/>
+  <Constant name="thAbsHE"       value="1.2*mm"/>
+  <Constant name="thAbsCuHE"     value="1.2*mm"/>
+  <Constant name="thAbsPCBHE"    value="1.2*mm"/>
+  <Constant name="WaferW"        value="123.7*mm"/>
+  <Constant name="tan30deg"      value="tan(30.0*deg)"/>
+</ConstantsSection>
+
+<MaterialSection label="hgcal.xml">
+  <CompositeMaterial name="WCu" density="14.979*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.75">
+      <rMaterial name="materials:Tungsten"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.25">
+      <rMaterial name="materials:Copper"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+</MaterialSection>
+
+<SolidSection label="hgcal.xml">
+  <Tubs name="HGCal" rMin="[rmin]" rMax="[rmax]" dz="[zCalor]" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Polycone name="HGCalEE" startPhi="0*deg" deltaPhi="360*deg">
+    <ZSection z="[zminEE]" rMin="[rminEE]" rMax="[rmaxEEF]"/>
+    <ZSection z="[zmaxEE]" rMin="[rminEE]" rMax="[rmaxEEF]"/>
+  </Polycone>
+  <Polycone name="HGCalHE" startPhi="0*deg" deltaPhi="360*deg">
+    <ZSection z="[zminHE]" rMin="[rminHE]" rMax="[rmaxHEF]"/>
+    <ZSection z="[zmaxHE]" rMin="[rminHE]" rMax="[rmaxHEF]"/>
+  </Polycone>
+  <Polycone name="HGCalAH" startPhi="0*deg" deltaPhi="360*deg">
+    <ZSection z="[zminAH]" rMin="[rminAH]" rMax="[rmaxAH]"/>
+    <ZSection z="[zmaxAH]" rMin="[rminAH]" rMax="[rmaxAH]"/>
+  </Polycone>
+  <Polyhedra name="HGCalEESensitive" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thSilicon]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thSilicon]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+  <Polyhedra name="HGCalHESiliconSensitive" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thSilicon]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thSilicon]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+  <Polyhedra name="HGCalPCB" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thPCB]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thPCB]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+  <Polyhedra name="HGCalKapton" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thKapton]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thKapton]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+  <Polyhedra name="HGCalCuKapton" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thCuKapton]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thCuKapton]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+  <Polyhedra name="HGCalCuPCB" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thCuPCB]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thCuPCB]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+  <Polyhedra name="HGCalEEAbs" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thAbsEE]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thAbsEE]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+  <Polyhedra name="HGCalEEAbs48To63" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thAbsEE48To63]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thAbsEE48To63]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+  <Polyhedra name="HGCalEEAbs52To70" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thAbsEE52To70]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thAbsEE52To70]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+  <Polyhedra name="HGCalEEAbs59To62" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thAbsEE59To62]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thAbsEE59To62]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+  <Polyhedra name="HGCalEEAbs68To74" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thAbsEE68To74]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thAbsEE68To74]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+  <Polyhedra name="HGCalEECuAbs" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thAbsCuEE]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thAbsCuEE]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+  <Polyhedra name="HGCalHEAbs" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thAbsHE]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thAbsHE]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+  <Polyhedra name="HGCalHECuAbs" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thAbsCuHE]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thAbsCuHE]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+  <Polyhedra name="HGCalHEPCBAbs" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thAbsPCBHE]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thAbsPCBHE]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+</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>
+  <LogicalPart name="HGCalAH" category="unspecified">
+    <rSolid name="HGCalAH"/>
+    <rMaterial name="materials:Air"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalEESensitive" category="unspecified">
+    <rSolid name="HGCalEESensitive"/>
+    <rMaterial name="materials:Air"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalHESiliconSensitive" category="unspecified">
+    <rSolid name="HGCalHESiliconSensitive"/>
+    <rMaterial name="materials:Air"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalEEPCB" category="unspecified">
+    <rSolid name="HGCalPCB"/>
+    <rMaterial name="materials:G10"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalHEPCB" category="unspecified">
+    <rSolid name="HGCalPCB"/>
+    <rMaterial name="materials:G10"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalEEKapton" category="unspecified">
+    <rSolid name="HGCalKapton"/>
+    <rMaterial name="materials:Kapton"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalEECuKapton" category="unspecified">
+    <rSolid name="HGCalCuKapton"/>
+    <rMaterial name="materials:Copper"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalEECuPCB" category="unspecified">
+    <rSolid name="HGCalCuPCB"/>
+    <rMaterial name="materials:Copper"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalHEKapton" category="unspecified">
+    <rSolid name="HGCalKapton"/>
+    <rMaterial name="materials:Kapton"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalHECuKapton" category="unspecified">
+    <rSolid name="HGCalCuKapton"/>
+    <rMaterial name="materials:Copper"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalHECuPCB" category="unspecified">
+    <rSolid name="HGCalCuPCB"/>
+    <rMaterial name="materials:Copper"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalEEAbsorber" category="unspecified">
+    <rSolid name="HGCalEEAbs"/>
+    <rMaterial name="hgcal:WCu"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalEEAbsorber48To63" category="unspecified">
+    <rSolid name="HGCalEEAbs48To63"/>
+    <rMaterial name="hgcal:WCu"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalEEAbsorber52To70" category="unspecified">
+    <rSolid name="HGCalEEAbs52To70"/>
+    <rMaterial name="hgcal:WCu"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalEEAbsorber59To62" category="unspecified">
+    <rSolid name="HGCalEEAbs59To62"/>
+    <rMaterial name="hgcal:WCu"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalEEAbsorber68To74" category="unspecified">
+    <rSolid name="HGCalEEAbs68To74"/>
+    <rMaterial name="hgcal:WCu"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalEECuAbsorber" category="unspecified">
+    <rSolid name="HGCalEECuAbs"/>
+    <rMaterial name="materials:Copper"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalHEAbsorber" category="unspecified">
+    <rSolid name="HGCalHEAbs"/>
+    <rMaterial name="hgcal:WCu"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalHECuAbsorber" category="unspecified">
+    <rSolid name="HGCalHECuAbs"/>
+    <rMaterial name="materials:Copper"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalHEPCBAbsorber" category="unspecified">
+    <rSolid name="HGCalHEPCBAbs"/>
+    <rMaterial name="materials:G10"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalHEAirAbsorber" category="unspecified">
+    <rSolid name="HGCalHEPCBAbs"/>
+    <rMaterial name="materials:Air"/>
+  </LogicalPart>
+</LogicalPartSection>
+
+<PosPartSection label="hgcal.xml">
+  <PosPart copyNumber="1">
+    <rParent name="cms:CMSE"/>
+    <rChild name="hgcal:HGCal"/>
+    <Translation x="0*fm" y="0*fm" z="[zposCalo]"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcal:HGCal"/>
+    <rChild name="hgcal:HGCalEE"/>
+    <Translation x="0*fm" y="0*fm" z="[zposEE]"/>
+    <rRotation name="rotations:R090"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcal:HGCal"/>
+    <rChild name="hgcal:HGCalHE"/>
+    <Translation x="0*fm" y="0*fm" z="[zposHE]"/>
+    <rRotation name="rotations:R090"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcal:HGCal"/>
+    <rChild name="hgcal:HGCalAH"/>
+    <Translation x="0*fm" y="0*fm" z="[zposAH]"/>
+    <rRotation name="rotations:000D"/>
+  </PosPart>
+</PosPartSection>
+</DDDefinition>
diff --git a/Geometry/HGCalTBCommonData/data/TB181/Oct184/hgcalEE.xml b/Geometry/HGCalTBCommonData/data/TB181/Oct184/hgcalEE.xml
new file mode 100644
index 0000000000000..396fe3390dbf3
--- /dev/null
+++ b/Geometry/HGCalTBCommonData/data/TB181/Oct184/hgcalEE.xml
@@ -0,0 +1,151 @@
+<?xml version="1.0"?>
+<DDDefinition>
+
+<ConstantsSection label="hgcalEE.xml" eval="true">
+  <Constant name="rMinFine"   value="0.0*fm"/>
+  <Constant name="rMaxFine"   value="0.0*cm"/>
+  <Constant name="rMaxMiddle" value="120.0*cm"/>
+  <Constant name="rMaxCoarse" value="2000.0*cm"/>
+  <Constant name="rMin"       value="0.0*fm"/>
+  <Constant name="rMax"       value="[hgcal:rmaxEE]"/>
+  <Constant name="rMaxB"      value="[hgcal:rmaxEEF]"/>
+  <Constant name="absorbW"    value="1.5*[hgcal:WaferW]"/>
+  <Constant name="absorbH"    value="1.5*[hgcal:WaferW]"/>
+</ConstantsSection>
+
+<PosPartSection label="hgcalEE.xml">
+  <Algorithm name="hgcal:DDHGCalTBModuleX">
+    <rParent name="hgcal:HGCalEE"/>
+    <String name="GeneralMaterial" value="materials:Air"/>
+    <Vector name="WaferName" type="string" nEntries="2">
+      hgcalwafer:HGCalEEWaferFine, hgcalwafer:HGCalEEWaferCoarse</Vector>
+    <Vector name="CoverName" type="string" nEntries="11">
+      hgcal:HGCalEESensitive,        hgcal:HGCalEEPCB,            
+      hgcal:HGCalEEKapton,           hgcal:HGCalEEAbsorber, 
+      hgcal:HGCalEECuAbsorber,       hgcal:HGCalEEAbsorber48To63, 
+      hgcal:HGCalEEAbsorber52To70,   hgcal:HGCalEEAbsorber59To62, 
+      hgcal:HGCalEEAbsorber68To74,   hgcal:HGCalEECuKapton,
+      hgcal:HGCalEECuPCB</Vector>
+    <Vector name="MaterialNames" type="string" nEntries="29">
+      materials:Air,       materials:Air,    materials:Air, 
+      materials:Air,       materials:Air,    materials:Air,
+      materials:Air,       materials:Air,    materials:StainlessSteel, 
+      materials:Lead,      materials:Copper, materials:Air, 
+      materials:Aluminium, materials:Air,    materials:Air,   
+      materials:Air,       materials:Air,    materials:Air,
+      materials:Air,       materials:Air,    materials:Air,
+      materials:Air,       materials:Air,    materials:Air,
+      materials:Iron,      materials:Air,    materials:Air,
+      materials:Air,       materials:Aluminium</Vector>
+    <Vector name="VolumeNames" type="string" nEntries="29">
+      EEPCB,             EEKapton,          EECuWShield, 
+      EECuShield,        EECuWShield48To63, EECuWShield52To70,
+      EECuWShield59To62, EECuWShield68To74, EEFeAbsorber, 
+      EEPbAbsorber,      EECuHeatShield,    EESensitive, 
+      EEAlcase,          EEgap1,            EEgap2,      
+      EEgap3,            EEgap4,            EEgap5,      
+      EEgap6,            EEgap7,            EEgap8,      
+      EEgap9,            EEgap10,           EEgap11,      
+      EEFHAbs,           EECuKapton,        EECuPCB,
+      EEgap12,           EEMCPAl</Vector>
+    <Vector name="Thickness" type="numeric" nEntries="29">
+      [hgcal:thPCB],         [hgcal:thKapton],      [hgcal:thAbsEE], 
+      [hgcal:thAbsCuEE],     [hgcal:thAbsEE48To63], [hgcal:thAbsEE52To70],
+      [hgcal:thAbsEE59To62], [hgcal:thAbsEE68To74], 0.3*mm,        
+      4.9*mm,                6.0*mm,                [hgcal:thSilicon],
+      2.1*mm,                3.095*mm,              3.145*mm, 
+      3.7*mm,                4.7*mm,                5.5*mm,
+      6.7*mm,                7.7*mm,                8.7*mm,
+      9.5*mm,                10.09*mm,              119.7*mm,
+      40.0*mm,               [hgcal:thCuKapton],    [hgcal:thCuPCB],
+      44.0*mm,               5.0*mm</Vector>
+    <Vector name="BlockThick" type="numeric" nEntries="15"> 
+      144.15*mm, 29.05*mm,  29.05*mm, 
+      30.05*mm,  30.05*mm,  30.05*mm, 
+      28.05*mm,  28.05*mm,  28.05*mm, 
+      28.05*mm,  32.25*mm,  35.05*mm, 
+      30.295*mm, 30.835*mm, 86.10*mm
+    </Vector>
+    <Numeric name="InOut"   value="1"/>
+    <Vector name="LayerFrontIn" type="numeric" nEntries="15"> 
+       0, 23, 45, 67, 89,111,133,155,177,199,221,245,269,293,317</Vector>
+    <Vector name="LayerBackIn" type="numeric" nEntries="15"> 
+      22, 44, 66, 88,110,132,154,176,198,220,244,268,292,316,319</Vector>
+    <Vector name="LayerType" type="numeric" nEntries="320"> 
+      12, 23, 8, 9, 8, 16, 0, 26, 11, 11, 11, 25, 1, 2, 10, 2, 1, 25, 11, 11, 11, 26, 0,
+      19, 8, 9, 8, 15, 0, 26, 11, 11, 11, 25, 1, 2, 10, 2, 1, 25, 11, 11, 11, 26, 0,
+      19, 8, 9, 8, 15, 0, 26, 11, 11, 11, 25, 1, 2, 10, 2, 1, 25, 11, 11, 11, 26, 0,
+      20, 8, 9, 8, 15, 0, 26, 11, 11, 11, 25, 1, 2, 10, 2, 1, 25, 11, 11, 11, 26, 0,
+      20, 8, 9, 8, 15, 0, 26, 11, 11, 11, 25, 1, 2, 10, 2, 1, 25, 11, 11, 11, 26, 0,
+      20, 8, 9, 8, 15, 0, 26, 11, 11, 11, 25, 1, 2, 10, 2, 1, 25, 11, 11, 11, 26, 0,
+      18, 8, 9, 8, 15, 0, 26, 11, 11, 11, 25, 1, 2, 10, 2, 1, 25, 11, 11, 11, 26, 0,
+      18, 8, 9, 8, 15, 0, 26, 11, 11, 11, 25, 1, 2, 10, 2, 1, 25, 11, 11, 11, 26, 0,
+      18, 8, 9, 8, 15, 0, 26, 11, 11, 11, 25, 1, 2, 10, 2, 1, 25, 11, 11, 11, 26, 0,
+      18, 8, 9, 8, 15, 0, 26, 11, 11, 11, 25, 1, 2, 10, 2, 1, 25, 11, 11, 11, 26, 0,
+      18, 8, 9, 8, 17, 0, 26, 11, 11, 11, 25, 1, 3, 2, 10, 2, 3, 1, 25, 11, 11, 11, 26, 0,
+      21, 8, 9, 8, 17, 0, 26, 11, 11, 11, 25, 1, 3, 2, 10, 2, 3, 1, 25, 11, 11, 11, 26, 0,
+      21, 8, 9, 8, 14, 0, 26, 11, 11, 11, 25, 1, 5, 5, 10, 5, 5, 1, 25, 11, 11, 11, 26, 0,
+      22, 8, 9, 8, 13, 0, 26, 11, 11, 11, 25, 1, 5, 5, 10, 5, 5, 1, 25, 11, 11, 11, 26, 0,
+      24, 27, 12
+    </Vector>
+    <Vector name="LayerSense" type="numeric" nEntries="320">
+      0, 0, 0, 0, 0, 0, 2, 11, 1, 1, 1, 10, 3, 4, 0, 4, 3, 10, 1, 1, 1, 11, 2,
+      0, 0, 0, 0, 0, 2, 11, 1, 1, 1, 10, 3, 4, 0, 4, 3, 10, 1, 1, 1, 11, 2,
+      0, 0, 0, 0, 0, 2, 11, 1, 1, 1, 10, 3, 4, 0, 4, 3, 10, 1, 1, 1, 11, 2,
+      0, 0, 0, 0, 0, 2, 11, 1, 1, 1, 10, 3, 4, 0, 4, 3, 10, 1, 1, 1, 11, 2,
+      0, 0, 0, 0, 0, 2, 11, 1, 1, 1, 10, 3, 4, 0, 4, 3, 10, 1, 1, 1, 11, 2,
+      0, 0, 0, 0, 0, 2, 11, 1, 1, 1, 10, 3, 4, 0, 4, 3, 10, 1, 1, 1, 11, 2,
+      0, 0, 0, 0, 0, 2, 11, 1, 1, 1, 10, 3, 4, 0, 4, 3, 10, 1, 1, 1, 11, 2,
+      0, 0, 0, 0, 0, 2, 11, 1, 1, 1, 10, 3, 4, 0, 4, 3, 10, 1, 1, 1, 11, 2,
+      0, 0, 0, 0, 0, 2, 11, 1, 1, 1, 10, 3, 4, 0, 4, 3, 10, 1, 1, 1, 11, 2,
+      0, 0, 0, 0, 0, 2, 11, 1, 1, 1, 10, 3, 4, 0, 4, 3, 10, 1, 1, 1, 11, 2,
+      0, 0, 0, 0, 0, 2, 11, 1, 1, 1, 10, 3, 5, 4, 0, 4, 5, 3, 10, 1, 1, 1, 11, 2,
+      0, 0, 0, 0, 0, 2, 11, 1, 1, 1, 10, 3, 5, 4, 0, 4, 5, 3, 10, 1, 1, 1, 11, 2,
+      0, 0, 0, 0, 0, 2, 11, 1, 1, 1, 10, 3, 7, 7, 0, 7, 7, 3, 10, 1, 1, 1, 11, 2,
+      0, 0, 0, 0, 0, 2, 11, 1, 1, 1, 10, 3, 7, 7, 0, 7, 7, 3, 10, 1, 1, 1, 11, 2,
+      0, 0, 0
+    </Vector>
+    <Vector name="MaxModule" nEntries="320">
+      0, 0, 0, 0, 0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 0, 2, 2, 2, 2, 2, 2, 2, 2,
+      0, 0, 0, 0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 0, 2, 2, 2, 2, 2, 2, 2, 2,
+      0, 0, 0, 0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 0, 2, 2, 2, 2, 2, 2, 2, 2,
+      0, 0, 0, 0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 0, 2, 2, 2, 2, 2, 2, 2, 2,
+      0, 0, 0, 0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 0, 2, 2, 2, 2, 2, 2, 2, 2,
+      0, 0, 0, 0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 0, 2, 2, 2, 2, 2, 2, 2, 2,
+      0, 0, 0, 0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 0, 2, 2, 2, 2, 2, 2, 2, 2,
+      0, 0, 0, 0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 0, 2, 2, 2, 2, 2, 2, 2, 2,
+      0, 0, 0, 0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 0, 2, 2, 2, 2, 2, 2, 2, 2,
+      0, 0, 0, 0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 0, 2, 2, 2, 2, 2, 2, 2, 2,
+      0, 0, 0, 0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+      0, 0, 0, 0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+      0, 0, 0, 0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+      0, 0, 0, 0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+      0, 0, 0
+    </Vector>
+    <Numeric name="zMinBlock"   value="[hgcal:zminEE]"/>
+    <Numeric name="rMaxFine"    value="[rMaxFine]"/>
+    <Numeric name="waferW"      value="[hgcal:WaferW]"/>
+    <Numeric name="waferGap"    value="0.0*fm"/>
+    <Numeric name="absorberW"   value="[hgcalEE:absorbW]"/>
+    <Numeric name="absorberH"   value="[hgcalEE:absorbH]"/>
+    <Numeric name="rMax"        value="[rMax]"/>
+    <Numeric name="rMaxB"       value="[rMaxB]"/>
+  </Algorithm>
+</PosPartSection> 
+
+<SpecParSection label="hgcalEE.xml" eval="true">
+  <SpecPar name="HGCalEE">
+    <PartSelector path="//HGCalEESensitive.*"/>    
+    <Parameter name="Volume" value="HGCalEESensitive" eval="false"/>
+    <Parameter name="GeometryMode" value="HGCalGeometryMode::Hexagon" eval="false"/>
+    <Parameter name="RadiusBound"  value="[rMinFine]"/>
+    <Parameter name="RadiusBound"  value="[rMaxFine]"/>
+    <Parameter name="RadiusBound"  value="[rMaxMiddle]"/>
+    <Parameter name="RadiusBound"  value="[rMaxCoarse]"/>
+    <Parameter name="RadiusLimits" value="[rMin]"/>
+    <Parameter name="RadiusLimits" value="[rMax]"/>
+    <Parameter name="LevelTop"     value="99"/>
+  </SpecPar>
+</SpecParSection>
+
+</DDDefinition>
diff --git a/Geometry/HGCalTBCommonData/data/TB181/Test/hgcProdCuts.xml b/Geometry/HGCalTBCommonData/data/TB181/Test/hgcProdCuts.xml
new file mode 100644
index 0000000000000..779363c7aa16a
--- /dev/null
+++ b/Geometry/HGCalTBCommonData/data/TB181/Test/hgcProdCuts.xml
@@ -0,0 +1,15 @@
+<?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">
+
+<SpecParSection label="hgcProdCuts.xml" eval="true">
+  <SpecPar name="hgcProdCuts">
+    <PartSelector path="//HGCalHE"/>
+    <Parameter name="CMSCutsRegion" value="HGCalRegion" eval="false"/>
+    <Parameter name="ProdCutsForElectrons" value="0.03*mm"/>
+<Parameter name="ProdCutsForProtons" value="0.03*mm"/>
+    <Parameter name="ProdCutsForPositrons" value="0.03*mm"/>
+    <Parameter name="ProdCutsForGamma" value="0.03*mm"/>
+  </SpecPar>
+</SpecParSection>
+
+</DDDefinition>
diff --git a/Geometry/HGCalTBCommonData/data/TB181/Test/hgcalCons.xml b/Geometry/HGCalTBCommonData/data/TB181/Test/hgcalCons.xml
new file mode 100644
index 0000000000000..0ab8ca982a0a0
--- /dev/null
+++ b/Geometry/HGCalTBCommonData/data/TB181/Test/hgcalCons.xml
@@ -0,0 +1,132 @@
+<?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">
+
+<SpecParSection label="hgcalReco.xml" eval="true">
+ <SpecPar name="HGCalHEWafer">
+    <PartSelector path="//HGCalHEWafer.*"/>
+    <Parameter name="Volume" value="HGCalHEWafer" eval="false"/>
+    <Parameter name="WaferSize"      value="[hgcal:WaferW]"/>
+  </SpecPar>
+ <SpecPar name="HGCalHECell">
+    <PartSelector path="//HGCalHECell.*"/>
+    <Parameter name="Volume" value="HGCalHECell" eval="false"/>
+    <Parameter name="CellSize"      value="[hgcalwafer:CellWF]"/>
+    <Parameter name="CellSize"      value="[hgcalwafer:CellWC]"/>
+  </SpecPar>
+  <SpecPar name="HGCalHESiliconSensitive">
+    <PartSelector path="//HGCalHESiliconSensitive.*"/>
+    <Parameter name="Volume" value="HGCalHESiliconSensitive" eval="false"/>
+    <Parameter name="Slope"  value="0.0"/>
+    <Parameter name="GroupingZFine"  value="1"/>
+    <Parameter name="GroupingZFine"  value="1"/>
+    <Parameter name="GroupingZFine"  value="1"/>
+    <Parameter name="GroupingZFine"  value="2"/>
+    <Parameter name="GroupingZFine"  value="2"/>
+    <Parameter name="GroupingZFine"  value="2"/>
+    <Parameter name="GroupingZFine"  value="3"/>
+    <Parameter name="GroupingZFine"  value="3"/>
+    <Parameter name="GroupingZFine"  value="3"/>
+    <Parameter name="GroupingZFine"  value="4"/>
+    <Parameter name="GroupingZFine"  value="4"/>
+    <Parameter name="GroupingZFine"  value="4"/>
+    <Parameter name="GroupingZFine"  value="5"/>
+    <Parameter name="GroupingZFine"  value="5"/>
+    <Parameter name="GroupingZFine"  value="5"/>
+    <Parameter name="GroupingZFine"  value="6"/>
+    <Parameter name="GroupingZFine"  value="6"/>
+    <Parameter name="GroupingZFine"  value="6"/>
+    <Parameter name="GroupingZFine"  value="7"/>
+    <Parameter name="GroupingZFine"  value="7"/>
+    <Parameter name="GroupingZFine"  value="7"/>
+    <Parameter name="GroupingZFine"  value="8"/>
+    <Parameter name="GroupingZFine"  value="8"/>
+    <Parameter name="GroupingZFine"  value="8"/>
+    <Parameter name="GroupingZFine"  value="9"/>
+    <Parameter name="GroupingZFine"  value="9"/>
+    <Parameter name="GroupingZFine"  value="9"/>
+    <Parameter name="GroupingZFine"  value="10"/>
+    <Parameter name="GroupingZFine"  value="10"/>
+    <Parameter name="GroupingZFine"  value="10"/>
+    <Parameter name="GroupingZFine"  value="11"/>
+    <Parameter name="GroupingZFine"  value="11"/>
+    <Parameter name="GroupingZFine"  value="11"/>
+    <Parameter name="GroupingZFine"  value="12"/>
+    <Parameter name="GroupingZFine"  value="12"/>
+    <Parameter name="GroupingZFine"  value="12"/>
+    <Parameter name="GroupingZMid"   value="1"/>
+    <Parameter name="GroupingZMid"   value="1"/>
+    <Parameter name="GroupingZMid"   value="1"/>
+    <Parameter name="GroupingZMid"   value="2"/>
+    <Parameter name="GroupingZMid"   value="2"/>
+    <Parameter name="GroupingZMid"   value="2"/>
+    <Parameter name="GroupingZMid"   value="3"/>
+    <Parameter name="GroupingZMid"   value="3"/>
+    <Parameter name="GroupingZMid"   value="3"/>
+    <Parameter name="GroupingZMid"   value="4"/>
+    <Parameter name="GroupingZMid"   value="4"/>
+    <Parameter name="GroupingZMid"   value="4"/>
+    <Parameter name="GroupingZMid"   value="5"/>
+    <Parameter name="GroupingZMid"   value="5"/>
+    <Parameter name="GroupingZMid"   value="5"/>
+    <Parameter name="GroupingZMid"   value="6"/>
+    <Parameter name="GroupingZMid"   value="6"/>
+    <Parameter name="GroupingZMid"   value="6"/>
+    <Parameter name="GroupingZMid"   value="7"/>
+    <Parameter name="GroupingZMid"   value="7"/>
+    <Parameter name="GroupingZMid"   value="7"/>
+    <Parameter name="GroupingZMid"   value="8"/>
+    <Parameter name="GroupingZMid"   value="8"/>
+    <Parameter name="GroupingZMid"   value="8"/>
+    <Parameter name="GroupingZMid"   value="9"/>
+    <Parameter name="GroupingZMid"   value="9"/>
+    <Parameter name="GroupingZMid"   value="9"/>
+    <Parameter name="GroupingZMid"   value="10"/>
+    <Parameter name="GroupingZMid"   value="10"/>
+    <Parameter name="GroupingZMid"   value="10"/>
+    <Parameter name="GroupingZMid"   value="11"/>
+    <Parameter name="GroupingZMid"   value="11"/>
+    <Parameter name="GroupingZMid"   value="11"/>
+    <Parameter name="GroupingZMid"   value="12"/>
+    <Parameter name="GroupingZMid"   value="12"/>
+    <Parameter name="GroupingZMid"   value="12"/>
+    <Parameter name="GroupingZOut"   value="1"/>
+    <Parameter name="GroupingZOut"   value="1"/>
+    <Parameter name="GroupingZOut"   value="1"/>
+    <Parameter name="GroupingZOut"   value="2"/>
+    <Parameter name="GroupingZOut"   value="2"/>
+    <Parameter name="GroupingZOut"   value="2"/>
+    <Parameter name="GroupingZOut"   value="3"/>
+    <Parameter name="GroupingZOut"   value="3"/>
+    <Parameter name="GroupingZOut"   value="3"/>
+    <Parameter name="GroupingZOut"   value="4"/>
+    <Parameter name="GroupingZOut"   value="4"/>
+    <Parameter name="GroupingZOut"   value="4"/>
+    <Parameter name="GroupingZOut"   value="5"/>
+    <Parameter name="GroupingZOut"   value="5"/>
+    <Parameter name="GroupingZOut"   value="5"/>
+    <Parameter name="GroupingZOut"   value="6"/>
+    <Parameter name="GroupingZOut"   value="6"/>
+    <Parameter name="GroupingZOut"   value="6"/>
+    <Parameter name="GroupingZOut"   value="7"/>
+    <Parameter name="GroupingZOut"   value="7"/>
+    <Parameter name="GroupingZOut"   value="7"/>
+    <Parameter name="GroupingZOut"   value="8"/>
+    <Parameter name="GroupingZOut"   value="8"/>
+    <Parameter name="GroupingZOut"   value="8"/>
+    <Parameter name="GroupingZOut"   value="9"/>
+    <Parameter name="GroupingZOut"   value="9"/>
+    <Parameter name="GroupingZOut"   value="9"/>
+    <Parameter name="GroupingZOut"   value="10"/>
+    <Parameter name="GroupingZOut"   value="10"/>
+    <Parameter name="GroupingZOut"   value="10"/>
+    <Parameter name="GroupingZOut"   value="11"/>
+    <Parameter name="GroupingZOut"   value="11"/>
+    <Parameter name="GroupingZOut"   value="11"/>
+    <Parameter name="GroupingZOut"   value="12"/>
+    <Parameter name="GroupingZOut"   value="12"/>
+    <Parameter name="GroupingZOut"   value="12"/>
+    <Parameter name="LayerOffset"    value="0"/>
+  </SpecPar>
+</SpecParSection>
+
+</DDDefinition>
diff --git a/Geometry/HGCalTBCommonData/data/TB181/Test/hgcalHE.xml b/Geometry/HGCalTBCommonData/data/TB181/Test/hgcalHE.xml
new file mode 100644
index 0000000000000..fcc9d04ca7361
--- /dev/null
+++ b/Geometry/HGCalTBCommonData/data/TB181/Test/hgcalHE.xml
@@ -0,0 +1,132 @@
+<?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="hgcalHE.xml" eval="true">
+  <Constant name="rMinFine"   value="0.0*fm"/>
+  <Constant name="rMaxFine"   value="0.0*fm"/>
+  <Constant name="rMaxMiddle" value="0.0*fm"/>
+  <Constant name="rMaxCoarse" value="2000.0*cm"/>
+  <Constant name="rMin"       value="[hgcal:rminHE]"/>
+  <Constant name="rMax"       value="[hgcal:rmaxHE]"/>
+  <Constant name="absorbW"    value="1.5*[hgcal:WaferW]"/>
+  <Constant name="absorbH"    value="1.5*[hgcal:WaferW]"/>
+</ConstantsSection>
+
+<PosPartSection label="hgcalHE.xml">
+  <Algorithm name="hgcal:DDHGCalTBModule">
+    <rParent name="hgcal:HGCalHE"/>
+    <Vector name="WaferName" type="string" nEntries="2">
+      hgcalwafer:HGCalHEWaferFine, hgcalwafer:HGCalHEWaferCoarse</Vector>
+    <Vector name="CoverName" type="string" nEntries="9">
+      hgcal:HGCalHESiliconSensitive, hgcal:HGCalHEPCB,
+      hgcal:HGCalHEKapton,           hgcal:HGCalHEAbsorber,
+      hgcal:HGCalHECuAbsorber,       hgcal:HGCalHEPCBAbsorber,
+      hgcal:HGCalHECuKapton,         hgcal:HGCalHECuPCB,
+      hgcal:HGCalHEAirAbsorber</Vector>
+    <Vector name="MaterialNames" type="string" nEntries="32">
+      materials:Air,    materials:Air,    materials:Air,
+      materials:Air,    materials:Air,    materials:Iron, 
+      materials:Copper, materials:Air,    materials:Iron,
+      materials:Air,    materials:Air,    materials:Air,
+      materials:Air,    materials:Air,    materials:Air,
+      materials:Air,    materials:Air,    materials:Air,
+      materials:Air,    materials:Air,    materials:Air,
+      materials:Air,    materials:Air,    materials:Air,
+      materials:Air,    materials:Air,    materials:Air,
+      materials:Air,    materials:Air,    materials:Air,
+      materials:Air,    materials:Air</Vector>
+    <Vector name="VolumeNames" type="string" nEntries="32">
+      HEPCB,          HEKapton,           HECuWShield, 
+      HECuShield,     HEPCBShield,        HEFeAbsorber,
+      HECuHeatShield, HESiliconSensitive, HEFeBox, 
+      HEAirGap1,      HEAirGap2,          HEAirGap3, 
+      HEAirGap4,      HEAirGap5,          HEAirGap6, 
+      HEAirGap7,      HEAirGap8,          HEAirGap9,
+      HEAirGap10,     HEAirGap11,         HEAirGap12,
+      HEAirGap13,     HEAirGap14,         HEAirGap15,
+      HEAirGap16,     HEAirGap17,         HEAirGap18,
+      HECuKapton,     HECuPCB,            HEAirGap19,
+      HEAirGap20,     HEAirGap21</Vector>
+    <Vector name="Thickness" type="numeric" nEntries="32">
+      [hgcal:thPCB],      [hgcal:thKapton],   [hgcal:thAbsHE], 
+      [hgcal:thAbsCuHE],  [hgcal:thAbsPCBHE], 40.0*mm,
+      6.0*mm,             [hgcal:thSilicon],  9.0*mm, 
+      10.7*mm,            12.8*mm,            13.8*mm, 
+      14.8*mm,            16.8*mm,            17.0*mm, 
+      18.0*mm,            3.0*mm,             4.0*mm, 
+      5.0*mm,             6.0*mm,             7.0*mm, 
+      8.0*mm,             9.0*mm,             10.0*mm, 
+      36.0*mm,            52.0*mm,            29.0*mm,
+      [hgcal:thCuKapton], [hgcal:thCuPCB],    8.8*mm,
+      9.8*mm,             [hgcal:thAbsCuHE]</Vector>
+    <Vector name="LayerThick" type="numeric" nEntries="12">
+      28.075*mm,  67.075*mm,  67.075*mm, 
+      68.075*mm,  66.975*mm,  67.075*mm, 
+      169.075*mm, 74.075*mm,  74.075*mm, 
+      77.075*mm,  74.075*mm,  111.075*mm
+      </Vector>
+    <Vector name="Layers" type="numeric" nEntries="12"> 
+      12, 13, 13, 13, 11, 15, 17, 13, 13, 12, 12, 14</Vector>
+    <Vector name="LayerType" type="numeric" nEntries="158"> 
+      8,  29,  0, 28,  7,  7,  7, 27,  1,  3,  3,  6,
+      21,  5, 29,  0, 28,  7,  7,  7, 27,  1,  3,  3,  6,
+      16,  5, 11,  0, 28,  7,  7,  7, 27,  1,  3,  3,  6,
+      18,  5, 10,  0, 28,  7,  7,  7, 27,  1,  3,  3,  6,
+      20,  5, 30,  0, 28,  7,  7,  7,  4,  3,  6, 
+      19,  5,  9,  0, 28,  7,  7,  7, 27,  1, 27,  1,  3,  3,  6,
+      17,  8, 24,  5, 25,  8, 29,  0, 28,  7,  7,  7, 27,  1,  3,  3,  6, 
+      20,  5, 13,  0, 28,  7,  7,  7, 27,  1,  3,  3,  6,
+      22,  5, 12,  0, 28,  7,  7,  7, 27,  1,  2,  3,  6,
+      23,  5, 15,  0, 28,  7,  7,  7, 27,  1,  2,  6,
+      21,  5, 14,  0, 28,  7,  7,  7, 27,  1,  3,  6,
+      20,  5, 14,  0, 28,  7,  7,  7, 27,  1,  3,  6, 26,  8
+    </Vector>
+    <Vector name="LayerSense" type="numeric" nEntries="158">
+      0, 0, 2, 8, 1, 1, 1, 7, 3, 5, 5, 0,
+      0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 5, 5, 0,
+      0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 5, 5, 0,
+      0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 5, 5, 0,
+      0, 0, 0, 2, 8, 1, 1, 1, 6, 5, 0,
+      0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 7, 3, 5, 5, 0,
+      0, 0, 0, 0, 0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 5, 5, 0,
+      0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 5, 5, 0,
+      0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 4, 5, 0,
+      0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 4, 0,
+      0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 5, 0,
+      0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 5, 0, 0, 0
+    </Vector>
+    <Numeric name="zMinBlock"   value="[hgcal:zminHE]"/>
+    <Numeric name="rMaxFine"    value="[rMaxFine]"/>
+    <Numeric name="waferW"      value="[hgcal:WaferW]"/>
+    <Numeric name="waferGap"    value="1.0*mm"/>
+    <Numeric name="absorberW"   value="[hgcalHE:absorbW]"/>
+    <Numeric name="absorberH"   value="[hgcalHE:absorbH]"/>
+    <Numeric name="Sectors"     value="12"/>
+    <Vector name="SlopeBottom" type="numeric" nEntries="2">
+      0.0, 0.0</Vector>
+    <Vector name="SlopeTop" type="numeric" nEntries="2">
+      0, 0</Vector>
+    <Vector name="ZFront" type="numeric" nEntries="2">
+      [hgcal:zminHE], [hgcal:zmaxHE]</Vector>
+    <Vector name="RMaxFront" type="numeric" nEntries="2">
+      [hgcal:rmaxHE], [hgcal:rmaxHE]</Vector>
+    <String name="RotNameSpace" value="hgcalmodule"/>
+  </Algorithm>
+</PosPartSection> 
+
+<SpecParSection label="hgcalHE.xml" eval="true">
+  <SpecPar name="HGCalHE">
+    <PartSelector path="//HGCalHESiliconSensitive.*"/>
+    <Parameter name="Volume" value="HGCalHESiliconSensitive" eval="false"/>
+    <Parameter name="GeometryMode" value="HGCalGeometryMode::Hexagon" eval="false"/>
+    <Parameter name="RadiusBound"  value="[rMinFine]"/>
+    <Parameter name="RadiusBound"  value="[rMaxFine]"/>
+    <Parameter name="RadiusBound"  value="[rMaxMiddle]"/>
+    <Parameter name="RadiusBound"  value="[rMaxCoarse]"/>
+    <Parameter name="RadiusLimits" value="[rMin]"/>
+    <Parameter name="RadiusLimits" value="[rMax]"/>
+    <Parameter name="LevelTop"     value="99"/>
+  </SpecPar>
+</SpecParSection>
+
+</DDDefinition>
diff --git a/Geometry/HGCalTBCommonData/data/TB181/Test/hgcalsense.xml b/Geometry/HGCalTBCommonData/data/TB181/Test/hgcalsense.xml
new file mode 100644
index 0000000000000..5b9cedd2f3594
--- /dev/null
+++ b/Geometry/HGCalTBCommonData/data/TB181/Test/hgcalsense.xml
@@ -0,0 +1,11 @@
+<?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">
+
+<SpecParSection label="hgcalsense.xml" eval="true">
+  <SpecPar name="hgcfh">
+    <PartSelector path="//.*HGCalHECell.*"/> 
+    <Parameter name="SensitiveDetector" value="HGCSensitiveDetector" eval="false"/>
+    <Parameter name="ReadOutName" value="HGCHitsHEfront" eval="false"/>
+  </SpecPar>
+</SpecParSection>
+</DDDefinition>
diff --git a/Geometry/HGCalTBCommonData/data/TB181/ahcal.xml b/Geometry/HGCalTBCommonData/data/TB181/ahcal.xml
new file mode 100644
index 0000000000000..da94b08d816d5
--- /dev/null
+++ b/Geometry/HGCalTBCommonData/data/TB181/ahcal.xml
@@ -0,0 +1,207 @@
+<?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="ahcal.xml" eval="true">
+  <Constant name="absorberThick" value="17.2*mm"/>
+  <Constant name="radiatorThick" value="17.2*mm"/>
+  <Constant name="airgapThick"   value="1.285*mm"/>
+  <Constant name="cassetteThick" value="0.5*mm"/>
+  <Constant name="cableThick"    value="1.5*mm"/>
+  <Constant name="pcbThick"      value="0.7*mm"/>
+  <Constant name="foilThick"     value="0.115*mm"/>
+  <Constant name="scintThick"    value="3.0*mm"/>
+  <Constant name="passiveHeight" value="72.0*cm"/>
+  <Constant name="passiveWidth"  value="72.0*cm"/>
+  <Constant name="activeHeight"  value="72.0*cm"/>
+  <Constant name="activeWidth"   value="72.0*cm"/>
+  <Constant name="tileGap"       value="30.0*mm"/>
+  <Constant name="tileHeight"    value="30*mm"/>
+  <Constant name="tileWidth"     value="30*mm"/>
+  <Constant name="tileEdge"      value="0.1*mm"/>
+</ConstantsSection>
+
+<MaterialSection label="ahcal.xml">
+  <CompositeMaterial name="Steel235" density="7.87*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.9843">
+      <rMaterial name="materials:Iron"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.0017">
+      <rMaterial name="materials:Carbon"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.0140">
+      <rMaterial name="materials:Manganese"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+  <CompositeMaterial name="PCB" density="1.70*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.180774">
+      <rMaterial name="materials:Silicon"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.405633">
+      <rMaterial name="materials:Oxygen"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.278042">
+      <rMaterial name="materials:Carbon"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.0684428">
+      <rMaterial name="materials:Hydrogen"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.0671091">
+      <rMaterial name="materials:Bromine"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+  <CompositeMaterial name="Polystyrene" density="1.060*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.077418">
+      <rMaterial name="materials:Hydrogen"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.922582">
+      <rMaterial name="materials:Carbon"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+  <CompositeMaterial name="PVC" density="1.35*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.048384">
+      <rMaterial name="materials:Hydrogen"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.384378">
+      <rMaterial name="materials:Carbon"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.567238">
+      <rMaterial name="materials:Chlorine"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+  <CompositeMaterial name="Polystyrole" density="1.065*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.077421">
+      <rMaterial name="materials:Hydrogen"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.922579">
+      <rMaterial name="materials:Carbon"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+  <CompositeMaterial name="CFM" density="0.120*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.009">
+      <rMaterial name="materials:Air"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.872">
+      <rMaterial name="ahcal:PVC"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.119">
+      <rMaterial name="ahcal:Polystyrole"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+</MaterialSection>
+
+
+<SolidSection label="ahcal.xml">
+  <Box name="AHcalTileSensitive" dx="[tileWidth]/2" dy="[tileHeight]/2"
+       dz="[scintThick]/2"/>
+</SolidSection>
+
+<LogicalPartSection label="ahcal.xml">
+  <LogicalPart name="AHcalTileSensitive" category="unspecified">
+    <rSolid name="AHcalTileSensitive"/>
+    <rMaterial name="ahcal:Polystyrene"/>
+  </LogicalPart>
+</LogicalPartSection>
+
+<PosPartSection label="ahcal.xml">
+  <Algorithm name="hgcal:DDAHcalModuleAlgo">
+    <rParent name="hgcal:HGCalAH"/>
+    <String name="TileName" value="ahcal:AHcalTileSensitive"/>
+    <Vector name="MaterialNames" type="string" nEntries="10">
+      ahcal:Steel235, materials:Air, ahcal:Steel235, ahcal:CFM, ahcal:PCB, 
+      ahcal:Polystyrole, ahcal:Polystyrene, ahcal:Steel235, ahcal:Steel235, 
+      materials:Air</Vector>
+    <Vector name="VolumeNames" type="string" nEntries="10">
+      AHcalRadiator, AHcalAirGa1p, AHcalCassette, AHcalCable, AHcalPCB,
+      AHcalFoil, AHcalActive, AHcalAbsorber, AHcalAbsorberLastCover,
+      AHcalAirGap2</Vector>
+    <Vector name="Thickness" type="numeric" nEntries="10">
+      [ahcal:radiatorThick], [ahcal:airgapThick], [ahcal:cassetteThick], 
+      [ahcal:cableThick], [ahcal:pcbThick], [ahcal:foilThick], 
+      [ahcal:scintThick], [ahcal:absorberThick], 5.0*mm,
+      9.0*mm</Vector>
+    <Vector name="Layers" type="numeric" nEntries="20"> 
+      20, 20, 20, 20, 20, 
+      20, 20, 20, 20, 20, 
+      20, 20, 20, 20, 20, 
+      20, 20, 20, 20, 19 
+    </Vector>
+    <Vector name="LayerThick" type="numeric" nEntries="20"> 
+      52.4*mm, 52.4*mm, 52.4*mm, 52.4*mm, 52.4*mm, 
+      52.4*mm, 52.4*mm, 52.4*mm, 52.4*mm, 52.4*mm, 
+      52.4*mm, 52.4*mm, 52.4*mm, 52.4*mm, 52.4*mm, 
+      52.4*mm, 52.4*mm, 52.4*mm, 52.4*mm, 140.485*mm
+      </Vector>
+    <Vector name="LayerType" type="numeric" nEntries="399"> 
+      7, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1,
+      0, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1,
+      0, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1,
+      0, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1,
+      0, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1,
+      0, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1, 
+      0, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1, 
+      0, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1, 
+      0, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1, 
+      0, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1, 
+      0, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1, 
+      0, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1, 
+      0, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1, 
+      0, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1, 
+      0, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1, 
+      0, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1, 
+      0, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1, 
+      0, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1, 
+      0, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1, 
+      0, 9, 0, 9, 0, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 0, 9, 0
+    </Vector>
+    <Vector name="LayerSense" type="numeric" nEntries="399">
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0
+    </Vector>
+    <Vector name="Widths" type="numeric" nEntries="2">
+      [ahcal:passiveWidth], [ahcal:activeWidth] </Vector>
+    <Vector name="Heights" type="numeric" nEntries="2">
+      [ahcal:passiveHeight], [ahcal:activeHeight] </Vector>
+    <Vector name="TileN" type="numeric" nEntries="2">
+      24, 24 </Vector>
+    <Vector name="TileStep" type="numeric" nEntries="2">
+      [ahcal:tileGap], [ahcal:tileGap] </Vector>
+    <Numeric name="zMinBlock"   value="[hgcal:zminAH]"/>
+    <String name="RotNameSpace" value="hgcalmodule"/>
+  </Algorithm>
+</PosPartSection> 
+
+<SpecParSection label="ahcal.xml" eval="true">
+  <SpecPar name="AHcal">
+    <PartSelector path="//AHcalTileSensitive.*"/>
+    <Parameter name="Volume" value="AHcalTileSensitive" eval="false"/>
+    <Parameter name="SensitiveDetector" value="AHcalSensitiveDetector" eval="false"/>
+    <Parameter name="ReadOutName" value="HcalHits" eval="false"/>
+  </SpecPar>
+  <SpecPar name="hgcProdCutsAHcal">
+    <PartSelector path="//HGCalAH"/>
+    <Parameter name="CMSCutsRegion" value="HGCalAHcalRegion" eval="false"/>
+    <Parameter name="ProdCutsForElectrons" value="1.0*mm"/>
+    <Parameter name="ProdCutsForPositrons" value="1.0*mm"/>
+    <Parameter name="ProdCutsForGamma"     value="1.0*mm"/>
+  </SpecPar>
+</SpecParSection>
+
+</DDDefinition>
diff --git a/Geometry/HGCalTBCommonData/data/TB181/cms.xml b/Geometry/HGCalTBCommonData/data/TB181/cms.xml
new file mode 100644
index 0000000000000..e56671bbae601
--- /dev/null
+++ b/Geometry/HGCalTBCommonData/data/TB181/cms.xml
@@ -0,0 +1,39 @@
+<?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="cms.xml" eval="true">
+  <Constant name="zCaloFront" value="1110.0*cm"/>
+</ConstantsSection>
+
+<SolidSection label="cms.xml">
+  <Tubs name="OCMS" rMin="0.0*fm" rMax="2.0*m" dz="30.0*m" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="CMSE" rMin="0.0*fm" rMax="2.0*m" dz="30.0*m" startPhi="0*deg" deltaPhi="360*deg"/>
+</SolidSection>
+
+<LogicalPartSection label="cms.xml">
+  <LogicalPart name="World" category="unspecified">
+    <rSolid name="OCMS"/>
+    <rMaterial name="materials:Air"/>
+  </LogicalPart>
+  <LogicalPart name="OCMS" category="unspecified">
+    <rSolid name="OCMS"/>
+    <rMaterial name="materials:Air"/>
+  </LogicalPart>
+  <LogicalPart name="CMSE" category="unspecified">
+    <rSolid name="CMSE"/>
+    <rMaterial name="materials:Air"/>
+  </LogicalPart>
+</LogicalPartSection>
+
+<PosPartSection label="cms.xml">
+  <PosPart copyNumber="1">
+    <rParent name="cms:World"/>
+    <rChild name="cms:OCMS"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="cms:OCMS"/>
+    <rChild name="cms:CMSE"/>
+  </PosPart>
+</PosPartSection>
+
+</DDDefinition>
diff --git a/Geometry/HGCalTBCommonData/data/TB181/hgcProdCuts.xml b/Geometry/HGCalTBCommonData/data/TB181/hgcProdCuts.xml
new file mode 100644
index 0000000000000..f47dad76b3243
--- /dev/null
+++ b/Geometry/HGCalTBCommonData/data/TB181/hgcProdCuts.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<DDDefinition>
+
+<SpecParSection label="hgcProdCuts.xml" eval="true">
+  <SpecPar name="hgcProdCuts">
+    <PartSelector path="//HGCalEE"/>
+    <PartSelector path="//HGCalHE"/>
+    <Parameter name="CMSCutsRegion" value="HGCalRegion" eval="false"/>
+    <Parameter name="ProdCutsForElectrons" value="0.03*mm"/>
+    <Parameter name="ProdCutsForProtons" value="0.03*mm"/>
+    <Parameter name="ProdCutsForPositrons" value="0.03*mm"/>
+    <Parameter name="ProdCutsForGamma" value="0.03*mm"/>
+  </SpecPar>
+</SpecParSection>
+
+</DDDefinition>
diff --git a/Geometry/HGCalTBCommonData/data/dd4hep/cms-test-ddhgcalTB181V1-algorithm.xml b/Geometry/HGCalTBCommonData/data/dd4hep/cms-test-ddhgcalTB181V1-algorithm.xml
new file mode 100644
index 0000000000000..7cbff8df477d5
--- /dev/null
+++ b/Geometry/HGCalTBCommonData/data/dd4hep/cms-test-ddhgcalTB181V1-algorithm.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0"?>
+<DDDefinition>
+  <debug>
+<!-- 
+    <debug_shapes/>
+    <debug_includes/>
+    <debug_rotations/>
+    <debug_includes/>
+    <debug_volumes/>
+    <debug_constants/>
+    <debug_namespaces/>
+    <debug_placements/>
+    <debug_algorithms/>
+    <debug_materials/>
+    <debug_visattr/>
+-->
+  </debug>
+  
+  <open_geometry/>
+  <close_geometry/>
+
+  <IncludeSection>
+    <Include ref="Geometry/CMSCommonData/data/materials/2021/v1/materials.xml"/>
+    <Include ref="Geometry/CMSCommonData/data/rotations.xml"/>
+    <Include ref="Geometry/HGCalCommonData/data/hgcalMaterial/v1/hgcalMaterial.xml"/>
+    <Include ref="Geometry/HGCalTBCommonData/data/TB181/cms.xml"/>
+    <Include ref="Geometry/HGCalTBCommonData/data/TB181/Oct181/hgcal.xml"/>
+    <Include ref="Geometry/HGCalCommonData/data/hgcalwafer/v7/hgcalwafer.xml"/>
+    <Include ref="Geometry/HGCalTBCommonData/data/TB181/Oct181/hgcalEE.xml"/>
+    <Include ref="Geometry/HGCalTBCommonData/data/TB181/Oct181/hgcalsense.xml"/>
+    <Include ref="Geometry/HGCalTBCommonData/data/TB181/hgcProdCuts.xml"/>
+    <Include ref="Geometry/HGCalTBCommonData/data/TB181/Oct181/hgcalCons.xml"/>
+    <Include ref="Geometry/HGCalCommonData/data/dd4hep/world.xml"/>
+  </IncludeSection>
+  
+</DDDefinition>
+
diff --git a/Geometry/HGCalTBCommonData/data/dd4hep/cms-test-ddhgcalTBModule-algorithm.xml b/Geometry/HGCalTBCommonData/data/dd4hep/cms-test-ddhgcalTBModule-algorithm.xml
new file mode 100644
index 0000000000000..4ddd18d8ddeff
--- /dev/null
+++ b/Geometry/HGCalTBCommonData/data/dd4hep/cms-test-ddhgcalTBModule-algorithm.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+<DDDefinition>
+  <debug>
+<!-- 
+    <debug_shapes/>
+    <debug_includes/>
+    <debug_rotations/>
+    <debug_includes/>
+    <debug_volumes/>
+    <debug_constants/>
+    <debug_namespaces/>
+    <debug_placements/>
+    <debug_algorithms/>
+    <debug_materials/>
+    <debug_visattr/>
+-->
+  </debug>
+  
+  <open_geometry/>
+  <close_geometry/>
+
+  <IncludeSection>
+    <Include ref="Geometry/CMSCommonData/data/materials/2021/v1/materials.xml"/>
+    <Include ref="Geometry/CMSCommonData/data/rotations.xml"/>
+    <Include ref="Geometry/HGCalTBCommonData/data/TB170/cms.xml"/>
+    <Include ref="Geometry/HGCalTBCommonData/data/TB170/hgcal.xml"/>
+    <Include ref="Geometry/HGCalCommonData/data/hgcalwafer/v7/hgcalwafer.xml"/>
+    <Include ref="Geometry/HGCalTBCommonData/data/TB170/hgcalEE.xml"/>
+    <Include ref="Geometry/HGCalCommonData/data/dd4hep/world.xml"/>
+  </IncludeSection>
+  
+</DDDefinition>
+
diff --git a/Geometry/HGCalTBCommonData/data/dd4hep/cms-test-ddhgcalTBModuleX-algorithm.xml b/Geometry/HGCalTBCommonData/data/dd4hep/cms-test-ddhgcalTBModuleX-algorithm.xml
new file mode 100644
index 0000000000000..998141f36e4dd
--- /dev/null
+++ b/Geometry/HGCalTBCommonData/data/dd4hep/cms-test-ddhgcalTBModuleX-algorithm.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+<DDDefinition>
+  <debug>
+<!-- 
+    <debug_shapes/>
+    <debug_includes/>
+    <debug_rotations/>
+    <debug_includes/>
+    <debug_volumes/>
+    <debug_constants/>
+    <debug_namespaces/>
+    <debug_placements/>
+    <debug_algorithms/>
+    <debug_materials/>
+    <debug_visattr/>
+-->
+  </debug>
+  
+  <open_geometry/>
+  <close_geometry/>
+
+  <IncludeSection>
+    <Include ref="Geometry/CMSCommonData/data/materials/2021/v1/materials.xml"/>
+    <Include ref="Geometry/CMSCommonData/data/rotations.xml"/>
+    <Include ref="Geometry/HGCalCommonData/data/hgcalMaterial/v1/hgcalMaterial.xml"/>
+    <Include ref="Geometry/HGCalTBCommonData/data/TB181/cms.xml"/>
+    <Include ref="Geometry/HGCalTBCommonData/data/TB181/Oct181/hgcal.xml"/>
+    <Include ref="Geometry/HGCalCommonData/data/hgcalwafer/v7/hgcalwafer.xml"/>
+    <Include ref="Geometry/HGCalTBCommonData/data/TB181/Oct181/hgcalEE.xml"/>
+    <Include ref="Geometry/HGCalCommonData/data/dd4hep/world.xml"/>
+  </IncludeSection>
+  
+</DDDefinition>
+
diff --git a/Geometry/HGCalTBCommonData/python/testAHcalModuleAlgoXML_cfi.py b/Geometry/HGCalTBCommonData/python/testAHcalModuleAlgoXML_cfi.py
new file mode 100644
index 0000000000000..6417319f308e4
--- /dev/null
+++ b/Geometry/HGCalTBCommonData/python/testAHcalModuleAlgoXML_cfi.py
@@ -0,0 +1,13 @@
+import FWCore.ParameterSet.Config as cms
+
+XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource",
+    geomXMLFiles = cms.vstring(
+        'Geometry/CMSCommonData/data/materials.xml',
+        'Geometry/CMSCommonData/data/rotations.xml',
+        'Geometry/HGCalCommonData/data/hgcalMaterial/v1/hgcalMaterial.xml',
+        'Geometry/HGCalTBCommonData/data/TB181/cms.xml',
+        'Geometry/HGCalTBCommonData/data/TB181/Oct181/hgcal.xml',
+        'Geometry/HGCalTBCommonData/data/TB181/ahcal.xml',
+    ),
+    rootNodeName = cms.string('cms:OCMS')
+)
diff --git a/Geometry/HGCalTBCommonData/python/testTB160XML_cfi.py b/Geometry/HGCalTBCommonData/python/testTB160XML_cfi.py
new file mode 100644
index 0000000000000..b6f3a557ff444
--- /dev/null
+++ b/Geometry/HGCalTBCommonData/python/testTB160XML_cfi.py
@@ -0,0 +1,17 @@
+import FWCore.ParameterSet.Config as cms
+
+XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource",
+    geomXMLFiles = cms.vstring('Geometry/CMSCommonData/data/materials.xml',
+        'Geometry/CMSCommonData/data/rotations.xml',
+        'Geometry/HGCalTBCommonData/data/TB160/cms.xml',
+        'Geometry/HGCalTBCommonData/data/TB160/hgcal.xml',
+        'Geometry/HGCalTBCommonData/data/TB160/16Module/hgcalEE.xml',
+        'Geometry/HGCalTBCommonData/data/hgcalwafer/v7/hgcalwafer.xml',
+        'Geometry/HGCalTBCommonData/data/TB160/hgcalBeam.xml',
+        'Geometry/HGCalTBCommonData/data/TB160/hgcalsense.xml',
+        'Geometry/HGCalTBCommonData/data/TB160/hgcProdCuts.xml',
+        'Geometry/HGCalTBCommonData/data/TB160/16Module/hgcalCons.xml'),
+    rootNodeName = cms.string('cms:OCMS')
+)
+
+
diff --git a/Geometry/HGCalTBCommonData/python/testTB161XML_cfi.py b/Geometry/HGCalTBCommonData/python/testTB161XML_cfi.py
new file mode 100644
index 0000000000000..c0ab86fa8a208
--- /dev/null
+++ b/Geometry/HGCalTBCommonData/python/testTB161XML_cfi.py
@@ -0,0 +1,17 @@
+import FWCore.ParameterSet.Config as cms
+
+XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource",
+    geomXMLFiles = cms.vstring('Geometry/CMSCommonData/data/materials.xml',
+        'Geometry/CMSCommonData/data/rotations.xml',
+        'Geometry/HGCalTBCommonData/data/TB161/cms.xml',
+        'Geometry/HGCalTBCommonData/data/TB161/hgcal.xml',
+        'Geometry/HGCalTBCommonData/data/TB161/8ModuleV2/hgcalEE.xml',
+        'Geometry/HGCalTBCommonData/data/hgcalwafer/v7/hgcalwafer.xml',
+        'Geometry/HGCalTBCommonData/data/TB161/hgcalBeam.xml',
+        'Geometry/HGCalTBCommonData/data/TB161/hgcalsense.xml',
+        'Geometry/HGCalTBCommonData/data/TB161/hgcProdCuts.xml',
+        'Geometry/HGCalTBCommonData/data/TB161/8Module/hgcalCons.xml'),
+    rootNodeName = cms.string('cms:OCMS')
+)
+
+
diff --git a/Geometry/HGCalTBCommonData/python/testTB181V0XML_cfi.py b/Geometry/HGCalTBCommonData/python/testTB181V0XML_cfi.py
new file mode 100644
index 0000000000000..988093434c0ff
--- /dev/null
+++ b/Geometry/HGCalTBCommonData/python/testTB181V0XML_cfi.py
@@ -0,0 +1,21 @@
+import FWCore.ParameterSet.Config as cms
+
+XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource",
+    geomXMLFiles = cms.vstring('Geometry/CMSCommonData/data/materials.xml',
+                               'Geometry/CMSCommonData/data/rotations.xml',
+                               'Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml',
+                               'Geometry/HGCalTBCommonData/data/TB181/Oct181/cms.xml',
+                               'Geometry/HGCalTBCommonData/data/TB181/Oct181/hgcal.xml',
+                               'Geometry/HGCalTBCommonData/data/TB181/Oct181/hgcalEE.xml',
+                               'Geometry/HGCalTBCommonData/data/TB181/Oct181/hgcalHE.xml',
+                               'Geometry/HGCalTBCommonData/data/TB181/Oct181/ahcal.xml',
+                               'Geometry/HGCalTBCommonData/data/TB181/Oct180/hgcalBeam.xml',
+                               'Geometry/HGCalCommonData/data/hgcalwafer/v7/hgcalwafer.xml',
+                               'Geometry/HGCalTBCommonData/data/TB181/Oct181/hgcalsense.xml',
+                               'Geometry/HGCalTBCommonData/data/TB181/hgcProdCuts.xml',
+                               'Geometry/HGCalTBCommonData/data/TB181/Oct181/hgcalCons.xml'
+                               ),
+    rootNodeName = cms.string('cms:OCMS')
+)
+
+
diff --git a/Geometry/HGCalTBCommonData/python/testTB181V1XML_cfi.py b/Geometry/HGCalTBCommonData/python/testTB181V1XML_cfi.py
new file mode 100644
index 0000000000000..394438d552953
--- /dev/null
+++ b/Geometry/HGCalTBCommonData/python/testTB181V1XML_cfi.py
@@ -0,0 +1,16 @@
+import FWCore.ParameterSet.Config as cms
+
+XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource",
+    geomXMLFiles = cms.vstring('Geometry/CMSCommonData/data/materials.xml',
+                               'Geometry/CMSCommonData/data/rotations.xml',
+                               'Geometry/HGCalCommonData/data/hgcalMaterial/v1/hgcalMaterial.xml',
+                               'Geometry/HGCalTBCommonData/data/TB181/Oct181/cms.xml',
+                               'Geometry/HGCalTBCommonData/data/TB181/Oct181/hgcal.xml',
+                               'Geometry/HGCalCommonData/data/hgcalwafer/v7/hgcalwafer.xml',
+                               'Geometry/HGCalTBCommonData/data/TB181/Oct181/hgcalEE.xml',
+                               'Geometry/HGCalTBCommonData/data/TB181/Oct181/hgcalsense.xml',
+                               'Geometry/HGCalTBCommonData/data/TB181/hgcProdCuts.xml',
+                               'Geometry/HGCalTBCommonData/data/TB181/Oct181/hgcalCons.xml'
+                               ),
+    rootNodeName = cms.string('cms:OCMS')
+)
diff --git a/Geometry/HGCalTBCommonData/python/testTB181V2XML_cfi.py b/Geometry/HGCalTBCommonData/python/testTB181V2XML_cfi.py
new file mode 100644
index 0000000000000..dac4a3e89891c
--- /dev/null
+++ b/Geometry/HGCalTBCommonData/python/testTB181V2XML_cfi.py
@@ -0,0 +1,16 @@
+import FWCore.ParameterSet.Config as cms
+
+XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource",
+    geomXMLFiles = cms.vstring('Geometry/CMSCommonData/data/materials.xml',
+                               'Geometry/CMSCommonData/data/rotations.xml',
+                               'Geometry/HGCalCommonData/data/hgcalMaterial/v1/hgcalMaterial.xml',
+                               'Geometry/HGCalTBCommonData/data/TB181/Oct181/cms.xml',
+                               'Geometry/HGCalTBCommonData/data/TB181/Oct181/hgcal.xml',
+                               'Geometry/HGCalTBCommonData/data/TB181/Test/hgcalHE.xml',
+                               'Geometry/HGCalCommonData/data/hgcalwafer/v7/hgcalwafer.xml',
+                               'Geometry/HGCalTBCommonData/data/TB181/Test/hgcalsense.xml',
+                               'Geometry/HGCalTBCommonData/data/TB181/Test/hgcProdCuts.xml',
+                               'Geometry/HGCalTBCommonData/data/TB181/Test/hgcalCons.xml'
+                               ),
+    rootNodeName = cms.string('cms:OCMS')
+)
diff --git a/Geometry/HGCalTBCommonData/python/testTB181XML_cfi.py b/Geometry/HGCalTBCommonData/python/testTB181XML_cfi.py
new file mode 100644
index 0000000000000..1d969abd6a9cc
--- /dev/null
+++ b/Geometry/HGCalTBCommonData/python/testTB181XML_cfi.py
@@ -0,0 +1,21 @@
+import FWCore.ParameterSet.Config as cms
+
+XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource",
+    geomXMLFiles = cms.vstring('Geometry/CMSCommonData/data/materials.xml',
+                               'Geometry/CMSCommonData/data/rotations.xml',
+                               'Geometry/HGCalCommonData/data/hgcalMaterial/v1/hgcalMaterial.xml',
+                               'Geometry/HGCalTBCommonData/data/TB181/Oct181/cms.xml',
+                               'Geometry/HGCalTBCommonData/data/TB181/Oct181/hgcal.xml',
+                               'Geometry/HGCalTBCommonData/data/TB181/Oct181/hgcalEE.xml',
+                               'Geometry/HGCalTBCommonData/data/TB181/Oct181/hgcalHE.xml',
+                               'Geometry/HGCalTBCommonData/data/TB181/Oct181/ahcal.xml',
+                               'Geometry/HGCalTBCommonData/data/TB181/Oct181/hgcalBeam.xml',
+                               'Geometry/HGCalCommonData/data/hgcalwafer/v7/hgcalwafer.xml',
+                               'Geometry/HGCalTBCommonData/data/TB181/Oct181/hgcalsense.xml',
+                               'Geometry/HGCalTBCommonData/data/TB181/hgcProdCuts.xml',
+                               'Geometry/HGCalTBCommonData/data/TB181/Oct181/hgcalCons.xml'
+                               ),
+    rootNodeName = cms.string('cms:OCMS')
+)
+
+
diff --git a/Geometry/HGCalTBCommonData/test/python/dumpTBGeometryDDD_cfg.py b/Geometry/HGCalTBCommonData/test/python/dumpTBGeometryDDD_cfg.py
new file mode 100644
index 0000000000000..42becc4ad7684
--- /dev/null
+++ b/Geometry/HGCalTBCommonData/test/python/dumpTBGeometryDDD_cfg.py
@@ -0,0 +1,26 @@
+import FWCore.ParameterSet.Config as cms
+
+process = cms.Process("DUMP")
+process.load("Geometry.HGCalTBCommonData.testTB181XML_cfi")
+process.load('FWCore.MessageService.MessageLogger_cfi')
+
+if 'MessageLogger' in process.__dict__:
+    process.MessageLogger.G4cerr=dict()
+    process.MessageLogger.G4cout=dict()
+    process.MessageLogger.HGCalGeom=dict()
+
+process.source = cms.Source("EmptySource")
+
+process.maxEvents = cms.untracked.PSet(
+    input = cms.untracked.int32(1)
+)
+
+process.add_(cms.ESProducer("TGeoMgrFromDdd",
+        verbose = cms.untracked.bool(False),
+        level   = cms.untracked.int32(14)
+))
+
+process.dump = cms.EDAnalyzer("DumpSimGeometry",
+                              outputFileName = cms.untracked.string('TBGeom.root'))
+
+process.p = cms.Path(process.dump)
diff --git a/Geometry/HGCalTBCommonData/test/python/dumpTBModuleDD4hep_cfg.py b/Geometry/HGCalTBCommonData/test/python/dumpTBModuleDD4hep_cfg.py
new file mode 100644
index 0000000000000..705aeabbf1584
--- /dev/null
+++ b/Geometry/HGCalTBCommonData/test/python/dumpTBModuleDD4hep_cfg.py
@@ -0,0 +1,25 @@
+import FWCore.ParameterSet.Config as cms
+
+process = cms.Process("DDHGCalTBModuleTest")
+
+process.load('FWCore.MessageService.MessageLogger_cfi')
+process.source = cms.Source("EmptySource")
+process.maxEvents = cms.untracked.PSet(
+    input = cms.untracked.int32(1)
+    )
+
+process.MessageLogger.cerr.FwkReport.reportEvery = 5
+if hasattr(process,'MessageLogger'):
+    process.MessageLogger.HGCalGeom=dict()
+
+process.DDDetectorESProducer = cms.ESSource("DDDetectorESProducer",
+                                            confGeomXMLFiles = cms.FileInPath('Geometry/HGCalTBCommonData/data/dd4hep/cms-test-ddhgcalTBModule-algorithm.xml'),
+                                            appendToDataLabel = cms.string('DDHGCalTBModule')
+                                            )
+
+process.testDump = cms.EDAnalyzer("DDTestDumpFile",
+                                  outputFileName = cms.untracked.string('hgcalTBModuleDD4hep.root'),
+                                  DDDetector = cms.ESInputTag('','DDHGCalTBModule')
+                                  )
+
+process.p = cms.Path(process.testDump)
diff --git a/Geometry/HGCalTBCommonData/test/python/dumpTBModuleDDD_cfg.py b/Geometry/HGCalTBCommonData/test/python/dumpTBModuleDDD_cfg.py
new file mode 100644
index 0000000000000..4c1a1d6f3eb64
--- /dev/null
+++ b/Geometry/HGCalTBCommonData/test/python/dumpTBModuleDDD_cfg.py
@@ -0,0 +1,57 @@
+###############################################################################
+# Way to use this:
+#   cmsRun dumpTBModuleDDD_cfg.py type=HGCalTBModule
+#
+#   Options for type HGCalTBModule, HGCalTBModuleX, AHcalModuleAlgo
+#
+###############################################################################
+import FWCore.ParameterSet.Config as cms
+import os, sys, imp, re
+import FWCore.ParameterSet.VarParsing as VarParsing
+
+####################################################################
+### SETUP OPTIONS
+options = VarParsing.VarParsing('standard')
+options.register('type',
+                 "HGCalTBModule",
+                  VarParsing.VarParsing.multiplicity.singleton,
+                  VarParsing.VarParsing.varType.string,
+                  "type of operations: HGCalTBModule, HGCalTBModuleX, AHcalModuleAlgo")
+
+### get and parse the command line arguments
+options.parseArguments()
+print(options)
+
+process = cms.Process("DumpTBModule")
+
+####################################################################
+# Use the options
+geomFile = "Geometry.HGCalTBCommonData.test" + options.type + "XML_cfi"
+outFile = "dump" + options.type + "DDD.root"
+
+print("Geometry file: ", geomFile)
+print("Output file:   ", outFile)
+
+process.load(geomFile)
+process.load('FWCore.MessageService.MessageLogger_cfi')
+
+if 'MessageLogger' in process.__dict__:
+    process.MessageLogger.G4cerr=dict()
+    process.MessageLogger.G4cout=dict()
+    process.MessageLogger.HGCalGeom=dict()
+
+process.source = cms.Source("EmptySource")
+
+process.maxEvents = cms.untracked.PSet(
+    input = cms.untracked.int32(1)
+)
+
+process.add_(cms.ESProducer("TGeoMgrFromDdd",
+        verbose = cms.untracked.bool(False),
+        level   = cms.untracked.int32(14)
+))
+
+process.dump = cms.EDAnalyzer("DumpSimGeometry",
+                              outputFileName = cms.untracked.string(outFile))
+
+process.p = cms.Path(process.dump)
diff --git a/Geometry/HGCalTBCommonData/test/python/testHGCalTBParametersDD4hep_cfg.py b/Geometry/HGCalTBCommonData/test/python/testHGCalTBParametersDD4hep_cfg.py
new file mode 100644
index 0000000000000..7a0e2e30fd795
--- /dev/null
+++ b/Geometry/HGCalTBCommonData/test/python/testHGCalTBParametersDD4hep_cfg.py
@@ -0,0 +1,51 @@
+import FWCore.ParameterSet.Config as cms
+
+process = cms.Process("HGCalParametersTest")
+process.load("SimGeneral.HepPDTESSource.pdt_cfi")
+process.load("Geometry.HGCalCommonData.hgcalParametersInitialization_cfi")
+process.load('FWCore.MessageService.MessageLogger_cfi')
+
+if hasattr(process,'MessageLogger'):
+    process.MessageLogger.HGCalGeom=dict()
+
+process.DDDetectorESProducer = cms.ESSource("DDDetectorESProducer",
+                                            confGeomXMLFiles = cms.FileInPath('Geometry/HGCalTBCommonData/data/dd4hep/cms-test-ddhgcalTB181V1-algorithm.xml'),
+                                            appendToDataLabel = cms.string('')
+                                            )
+
+process.DDCompactViewESProducer = cms.ESProducer("DDCompactViewESProducer",
+                                                 appendToDataLabel = cms.string('')
+)
+
+process.load("IOMC.RandomEngine.IOMC_cff")
+process.RandomNumberGeneratorService.generator.initialSeed = 456789
+
+process.source = cms.Source("EmptySource")
+
+process.maxEvents = cms.untracked.PSet(
+    input = cms.untracked.int32(1)
+)
+
+process.generator = cms.EDProducer("FlatRandomEGunProducer",
+    PGunParameters = cms.PSet(
+        PartID = cms.vint32(14),
+        MinEta = cms.double(-3.5),
+        MaxEta = cms.double(3.5),
+        MinPhi = cms.double(-3.14159265359),
+        MaxPhi = cms.double(3.14159265359),
+        MinE   = cms.double(9.99),
+        MaxE   = cms.double(10.01)
+    ),
+    AddAntiParticle = cms.bool(False),
+    Verbosity       = cms.untracked.int32(0),
+    firstRun        = cms.untracked.uint32(1)
+)
+
+process.hgcalEEParametersInitialize.fromDD4hep = cms.bool(True)
+process.hgcalHESiParametersInitialize.fromDD4hep = cms.bool(True)
+process.hgcalHEScParametersInitialize.fromDD4hep = cms.bool(True)
+
+process.load("Geometry.HGCalCommonData.hgcParameterTesterEE_cfi")
+process.hgcParameterTesterEE.Mode = 0
+ 
+process.p1 = cms.Path(process.generator*process.hgcParameterTesterEE)
diff --git a/Geometry/HGCalTBCommonData/test/python/testHGCalTBParametersDDD_cfg.py b/Geometry/HGCalTBCommonData/test/python/testHGCalTBParametersDDD_cfg.py
new file mode 100644
index 0000000000000..ea41de6427b5d
--- /dev/null
+++ b/Geometry/HGCalTBCommonData/test/python/testHGCalTBParametersDDD_cfg.py
@@ -0,0 +1,39 @@
+import FWCore.ParameterSet.Config as cms
+
+process = cms.Process("HGCalParametersTest")
+process.load("SimGeneral.HepPDTESSource.pdt_cfi")
+process.load("Geometry.HGCalTBCommonData.testTB181V1XML_cfi")
+process.load("Geometry.HGCalCommonData.hgcalParametersInitialization_cfi")
+process.load('FWCore.MessageService.MessageLogger_cfi')
+
+if hasattr(process,'MessageLogger'):
+    process.MessageLogger.HGCalGeom=dict()
+
+process.load("IOMC.RandomEngine.IOMC_cff")
+process.RandomNumberGeneratorService.generator.initialSeed = 456789
+
+process.source = cms.Source("EmptySource")
+
+process.maxEvents = cms.untracked.PSet(
+    input = cms.untracked.int32(1)
+)
+
+process.generator = cms.EDProducer("FlatRandomEGunProducer",
+    PGunParameters = cms.PSet(
+        PartID = cms.vint32(14),
+        MinEta = cms.double(-3.5),
+        MaxEta = cms.double(3.5),
+        MinPhi = cms.double(-3.14159265359),
+        MaxPhi = cms.double(3.14159265359),
+        MinE   = cms.double(9.99),
+        MaxE   = cms.double(10.01)
+    ),
+    AddAntiParticle = cms.bool(False),
+    Verbosity       = cms.untracked.int32(0),
+    firstRun        = cms.untracked.uint32(1)
+)
+ 
+process.load("Geometry.HGCalCommonData.hgcParameterTesterEE_cfi")
+process.hgcParameterTesterEE.Mode = 0
+ 
+process.p1 = cms.Path(process.generator*process.hgcParameterTesterEE)