Introduce changes needed for Hcal geometry for 2016 and 2017

cms-sw · Jan 31, 2016 · 2b64bca · 2b64bca
1 parent 1aabae2
commit 2b64bca
Show file tree

Hide file tree

Showing 21 changed files with 715 additions and 249 deletions.
diff --git a/Geometry/CaloTopology/src/HcalTopology.cc b/Geometry/CaloTopology/src/HcalTopology.cc
@@ -11,6 +11,7 @@
 #include "CLHEP/Units/GlobalPhysicalConstants.h"
 
 static const int IPHI_MAX=72;
+
 //#define DebugLog
 
 HcalTopology::HcalTopology(const HcalDDDRecConstants* hcons) :
@@ -50,14 +51,14 @@ HcalTopology::HcalTopology(const HcalDDDRecConstants* hcons) :
     HBSize_     = kHBSizePreLS1; // qie-per-fiber * fiber/rm * rm/rbx * rbx/barrel * barrel/hcal
     HESize_     = kHESizePreLS1; // qie-per-fiber * fiber/rm * rm/rbx * rbx/endcap * endcap/hcal
     HOSize_     = kHOSizePreLS1; // ieta * iphi * 2
-    HFSize_     = kHFSizePreLS1; // phi * eta * depth * pm 
+    HFSize_     = hcons_->nCells(HcalForward);  // ieta * iphi * depth * 2
     numberOfShapes_ = 87;
   } else if (mode_==HcalTopologyMode::SLHC) { // need to know more eventually
     topoVersion_=10;
     HBSize_     = nEtaHB_*72*maxDepthHB_*2;
     HESize_     = nEtaHE_*72*maxDepthHE_*2;
     HOSize_     = (lastHORing_-firstHORing_+1)*72*2; // ieta * iphi * 2
-    HFSize_     = (lastHFRing_-firstHFRing_+1)*72*maxDepthHF_*2; // ieta * iphi * depth * 2
+    HFSize_     = hcons_->nCells(HcalForward);  // ieta * iphi * depth * 2
     numberOfShapes_ = 500;
   }
   maxEta_ = (lastHERing_ > lastHFRing_) ? lastHERing_ : lastHFRing_;
@@ -430,20 +431,20 @@ bool HcalTopology::validRaw(const HcalDetId& id) const {
   int aieta=id.ietaAbs();
   int depth=id.depth();
   int iphi=id.iphi();
-  if ((ieta==0 || iphi<=0 || iphi>IPHI_MAX) || aieta>maxEta_) return false; // outer limits
+  if ((ieta==0 || iphi<=0 || iphi>IPHI_MAX) || aieta>maxEta_) ok = false; // outer limits
 
   if (ok) {
     HcalSubdetector subdet=id.subdet();
     if (subdet==HcalBarrel) {
       if (mode_==HcalTopologyMode::SLHC || mode_==HcalTopologyMode::H2HE) {
-	if ((aieta>lastHBRing() || depth>maxDepthHB_ || (aieta==lastHBRing() && depth > 2))) ok=false;
+	if ((aieta>lastHBRing() || depth>maxDepthHB_ || (aieta==lastHBRing() && depth > hcons_->getDepthEta16(0)))) ok=false;
       } else {
 	if (aieta>lastHBRing() || depth>2 || (aieta<=14 && depth>1)) ok=false;
       }
     } else if (subdet==HcalEndcap) {
       if (mode_==HcalTopologyMode::SLHC || mode_==HcalTopologyMode::H2HE) {
         if (depth>maxDepthHE_ || aieta<firstHERing() || aieta>lastHERing() ||
-            (aieta==firstHERing() && depth<3)) {
+            (aieta==firstHERing() && depth<hcons_->getDepthEta16(1))) {
           ok = false;
         } else {
           for (unsigned int i=0; i<etaBinsHE_.size(); ++i) {
@@ -458,14 +459,19 @@ bool HcalTopology::validRaw(const HcalDetId& id) const {
           }
         }
       } else {
-	if (depth>3 || aieta<firstHERing() || aieta>lastHERing() || (aieta==firstHERing() && depth!=3) || (aieta==17 && depth!=1 && mode_!=HcalTopologyMode::H2) || // special case at H2
+	if (depth>3 || aieta<firstHERing() || aieta>lastHERing() || 
+	    (aieta==firstHERing() && depth!=3) || 
+	    (aieta==17 && depth!=1 && mode_!=HcalTopologyMode::H2) || // special case at H2
 	    (((aieta>=17 && aieta<firstHETripleDepthRing()) || aieta==lastHERing()) && depth>2) ||
 	    (aieta>=firstHEDoublePhiRing() && (iphi%2)==0)) ok=false;
       }
     } else if (subdet==HcalOuter) {
       if (aieta>lastHORing() || iphi>IPHI_MAX || depth!=4) ok=false;
     } else if (subdet==HcalForward) {
-      if (aieta<firstHFRing() || aieta>lastHFRing() || ((iphi%2)==0) || (depth>maxDepthHF_) ||  (aieta>=firstHFQuadPhiRing() && ((iphi+1)%4)!=0)) ok=false;
+      int zside = (id.ieta() > 0) ? 1 : 0;
+      if (aieta<firstHFRing() || aieta>lastHFRing() || ((iphi%2)==0) || 
+	  (depth>hcons_->maxHFDepth(zside,iphi)) ||  
+	  (aieta>=firstHFQuadPhiRing() && ((iphi+1)%4)!=0)) ok=false;
     } else if (subdet==HcalTriggerTower) {
       ok=validHT(HcalTrigTowerDetId(id.rawId()));
     } else {
@@ -504,6 +510,7 @@ bool HcalTopology::incIPhi(const HcalDetId& id, HcalDetId &neighbor) const {
 	if (id.iphi()==IPHI_MAX-1) neighbor=HcalDetId(id.subdet(),id.ieta(),1,id.depth()); 
 	else neighbor=HcalDetId(id.subdet(),id.ieta(),id.iphi()+2,id.depth()); 
       }
+      if (!validRaw(neighbor)) ok = false;
       break;
     default: ok=false;
     }
@@ -541,6 +548,7 @@ bool HcalTopology::decIPhi(const HcalDetId& id, HcalDetId &neighbor) const {
 	if (id.iphi()==1) neighbor=HcalDetId(id.subdet(),id.ieta(),IPHI_MAX-1,id.depth()); 
 	else neighbor=HcalDetId(id.subdet(),id.ieta(),id.iphi()-2,id.depth()); 
       }
+      if (!validRaw(neighbor)) ok = false;
       break;
     default: ok=false;
     }
@@ -629,7 +637,7 @@ void HcalTopology::depthBinInformation(HcalSubdetector subdet, int etaRing,
     if (mode_==HcalTopologyMode::SLHC || mode_==HcalTopologyMode::H2HE) {
       startingBin = 1;
       if (etaRing==lastHBRing()) {
-	nDepthBins = 2;
+	nDepthBins = hcons_->getDepthEta16(0);
       } else {
 	nDepthBins = maxDepthHB_;
       }
@@ -645,8 +653,8 @@ void HcalTopology::depthBinInformation(HcalSubdetector subdet, int etaRing,
   } else if(subdet == HcalEndcap) {
     if (mode_==HcalTopologyMode::SLHC || mode_==HcalTopologyMode::H2HE) {
       if (etaRing==firstHERing()) {
-	nDepthBins  = maxDepthHE_ - 2;
-	startingBin = 3;
+	startingBin = hcons_->getDepthEta16(1);
+	nDepthBins  = maxDepthHE_ - startingBin + 1;
       } else {
 	nDepthBins  = maxDepthHE_;
 	startingBin = 1;

diff --git a/Geometry/HcalCommonData/BuildFile.xml b/Geometry/HcalCommonData/BuildFile.xml
@@ -1,5 +1,6 @@
 <use   name="DetectorDescription/Base"/>
 <use   name="DetectorDescription/Core"/>
+<use   name="DataFormats/HcalDetId"/>
 <export>
   <lib   name="1"/>
 </export>
diff --git a/Geometry/HcalCommonData/data/PhaseI/hcalRecNumbering.xml b/Geometry/HcalCommonData/data/PhaseI/hcalRecNumbering.xml
@@ -11,13 +11,22 @@
     1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1
   </Vector>
   <Vector name="layerGroupRecEta1" type="numeric" nEntries="19">
-    1, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4
+    1, 2, 2, 2, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4
   </Vector>
   <Vector name="layerGroupRecEta16" type="numeric" nEntries="19">
-    1, 1, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3
+    1, 1, 2, 2, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4
   </Vector>
   <Vector name="layerGroupRecEta17" type="numeric" nEntries="19">
-    1, 1, 2, 2, 3, 3, 3, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5
+    1, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3
+  </Vector>
+  <Vector name="layerGroupRecEta18" type="numeric" nEntries="19">
+    1, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5
+  </Vector>
+  <Vector name="layerGroupRecEta19" type="numeric" nEntries="19">
+    1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 4, 5, 5, 5, 5, 6, 6, 6, 6
+  </Vector>
+  <Vector name="layerGroupRecEta26" type="numeric" nEntries="19">
+    1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 5, 6, 6, 6, 6, 7, 7, 7, 7
   </Vector>
 </ConstantsSection>
 
@@ -26,7 +35,7 @@
     <PartSelector path="//HCal"/>
     <Parameter name="OnlyForHcalRecNumbering" value="HCAL" eval="false"/>
     <Parameter name="TopologyMode" value="HcalTopologyMode::SLHC" eval="false"/>
-    <Parameter name="TriggerMode"  value="HcalTopologyMode::tm_LHC_RCT" eval="false"/>
+    <Parameter name="TriggerMode"  value="HcalTopologyMode::tm_LHC_1x1" eval="false"/>
   </SpecPar>
 </SpecParSection>
 

diff --git a/Geometry/HcalCommonData/data/PhaseI/hcalSimNumbering.xml b/Geometry/HcalCommonData/data/PhaseI/hcalSimNumbering.xml
@@ -29,13 +29,22 @@
     20.0*deg
   </Vector>
   <Vector name="layerGroupSimEta1" type="numeric" nEntries="19">
-    1, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4
+    1, 2, 2, 2, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4
   </Vector>
   <Vector name="layerGroupSimEta16" type="numeric" nEntries="19">
-    1, 1, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3
+    1, 1, 2, 2, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4
   </Vector>
   <Vector name="layerGroupSimEta17" type="numeric" nEntries="19">
-    1, 1, 2, 2, 3, 3, 3, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5
+    1, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3
+  </Vector>
+  <Vector name="layerGroupSimEta18" type="numeric" nEntries="19">
+    1, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5
+  </Vector>
+  <Vector name="layerGroupSimEta19" type="numeric" nEntries="19">
+    1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 4, 5, 5, 5, 5, 6, 6, 6, 6
+  </Vector>
+  <Vector name="layerGroupSimEta26" type="numeric" nEntries="19">
+    1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 5, 6, 6, 6, 6, 7, 7, 7, 7
   </Vector>
   <Vector name="etaMin" type="numeric" nEntries="4">
     1, 16, 29, 1
@@ -44,7 +53,7 @@
     16, 29, 41, 15
   </Vector>
   <Vector name="MaxDepth" type="numeric" nEntries="4">
-     3,  5,  4,  4
+     4,  7,  4,  4
   </Vector>
   <Vector name="etaRange" type="numeric" nEntries="4">
     1.392, 3.000, 5.500, 1.305
@@ -53,8 +62,8 @@
     22.0*cm, 165.0*cm, 30.0*cm, 0.0*cm, 1115.0*cm, 0.375*cm,
     1137.0*cm
   </Vector>
-  <Vector name="noff" type="numeric" nEntries="13">
-    15, 99, 4, 10, 5, 2, 4, 18, 19, 11, 12, 13, 14
+  <Vector name="noff" type="numeric" nEntries="18">
+    15, 29,  4, 10,  5,  2,  4, 18, 19, 11, 12, 13, 14,  3,  4,  3,  1,  0
   </Vector>
   <Vector name="Layer0Wt" type="numeric" nEntries="2">
     1.2, 1.2

diff --git a/Geometry/HcalCommonData/data/PhaseII/hcalRecNumbering.xml b/Geometry/HcalCommonData/data/PhaseII/hcalRecNumbering.xml
@@ -13,13 +13,22 @@
     2, 2, 2, 2, 2, 2, 2, 2
   </Vector>
   <Vector name="layerGroupRecEta1" type="numeric" nEntries="19">
-    1, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4
+    1, 2, 2, 2, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4
   </Vector>
   <Vector name="layerGroupRecEta16" type="numeric" nEntries="19">
-    1, 1, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3
+    1, 1, 2, 2, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4
   </Vector>
   <Vector name="layerGroupRecEta17" type="numeric" nEntries="19">
-    1, 1, 2, 2, 3, 3, 3, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5
+    1, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3
+  </Vector>
+  <Vector name="layerGroupRecEta18" type="numeric" nEntries="19">
+    1, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5
+  </Vector>
+  <Vector name="layerGroupRecEta19" type="numeric" nEntries="19">
+    1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 4, 5, 5, 5, 5, 6, 6, 6, 6
+  </Vector>
+  <Vector name="layerGroupRecEta44" type="numeric" nEntries="19">
+    1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 5, 6, 6, 6, 6, 7, 7, 7, 7
   </Vector>
 </ConstantsSection>
 
@@ -28,7 +37,7 @@
     <PartSelector path="//HCal"/>
     <Parameter name="OnlyForHcalRecNumbering" value="HCAL" eval="false"/>
     <Parameter name="TopologyMode" value="HcalTopologyMode::SLHC" eval="false"/>
-    <Parameter name="TriggerMode"  value="HcalTopologyMode::tm_LHC_RCT" eval="false"/>
+    <Parameter name="TriggerMode"  value="HcalTopologyMode::tm_LHC_1x1" eval="false"/>
   </SpecPar>
 </SpecParSection>
 

diff --git a/Geometry/HcalCommonData/data/PhaseII/hcalSimNumbering.xml b/Geometry/HcalCommonData/data/PhaseII/hcalSimNumbering.xml
@@ -35,13 +35,22 @@
     20.0*deg
   </Vector>
   <Vector name="layerGroupSimEta1" type="numeric" nEntries="19">
-    1, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4
+    1, 2, 2, 2, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4
   </Vector>
   <Vector name="layerGroupSimEta16" type="numeric" nEntries="19">
-    1, 1, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3
+    1, 1, 2, 2, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4
   </Vector>
   <Vector name="layerGroupSimEta17" type="numeric" nEntries="19">
-    1, 1, 2, 2, 3, 3, 3, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5
+    1, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3
+  </Vector>
+  <Vector name="layerGroupSimEta18" type="numeric" nEntries="19">
+    1, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5
+  </Vector>
+  <Vector name="layerGroupSimEta19" type="numeric" nEntries="19">
+    1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 4, 5, 5, 5, 5, 6, 6, 6, 6
+  </Vector>
+  <Vector name="layerGroupSimEta44" type="numeric" nEntries="19">
+    1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 5, 6, 6, 6, 6, 7, 7, 7, 7
   </Vector>
   <Vector name="etaMin" type="numeric" nEntries="4">
     1, 16, 29, 1
@@ -50,7 +59,7 @@
     16, 56, 41, 15
   </Vector>
   <Vector name="MaxDepth" type="numeric" nEntries="4">
-     3,  5,  4,  4
+     4,  7,  4,  4
   </Vector>
   <Vector name="etaRange" type="numeric" nEntries="4">
     1.392, 3.000, 5.500, 1.305
@@ -59,8 +68,8 @@
     22.0*cm, 165.0*cm, 30.0*cm, 0.0*cm, 1115.0*cm, 0.375*cm,
     1137.0*cm
   </Vector>
-  <Vector name="noff" type="numeric" nEntries="13">
-    15, 99, 4, 10, 5, 2, 4, 18, 19, 11, 12, 13, 14
+  <Vector name="noff" type="numeric" nEntries="18">
+    15, 99, 4, 10, 5, 2, 4, 18, 19, 11, 12, 13, 14,  3,  4, 53,  4,  0
   </Vector>
   <Vector name="Layer0Wt" type="numeric" nEntries="2">
     1.2, 1.2

diff --git a/Geometry/HcalCommonData/data/Run2/hcalRecNumbering.xml b/Geometry/HcalCommonData/data/Run2/hcalRecNumbering.xml
@@ -0,0 +1,44 @@
+<?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="hcalRecNumbering.xml" eval="true">
+  <Vector name="etagroup" type="numeric" nEntries="29">
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1
+  </Vector>
+  <Vector name="phigroup" type="numeric" nEntries="29">
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1
+  </Vector>
+  <Vector name="layerGroupRecEta1" type="numeric" nEntries="19">
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 4, 4
+  </Vector>
+  <Vector name="layerGroupRecEta15" type="numeric" nEntries="19">
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 4, 4
+  </Vector>
+  <Vector name="layerGroupRecEta16" type="numeric" nEntries="19">
+    1, 1, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3
+  </Vector>
+  <Vector name="layerGroupRecEta17" type="numeric" nEntries="19">
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1
+  </Vector>
+  <Vector name="layerGroupRecEta18" type="numeric" nEntries="19">
+    1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2
+  </Vector>
+  <Vector name="layerGroupRecEta19" type="numeric" nEntries="19">
+    1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2
+  </Vector>
+  <Vector name="layerGroupRecEta27" type="numeric" nEntries="19">
+    1, 1, 1, 1, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3
+  </Vector>
+</ConstantsSection>
+
+<SpecParSection label="hcalRecNumbering.xml" eval="true">
+  <SpecPar name="hcal">
+    <PartSelector path="//HCal"/>
+    <Parameter name="OnlyForHcalRecNumbering" value="HCAL" eval="false"/>
+    <Parameter name="TopologyMode" value="HcalTopologyMode::LHC" eval="false"/>
+    <Parameter name="TriggerMode"  value="HcalTopologyMode::tm_LHC_RCT" eval="false"/>
+  </SpecPar>
+</SpecParSection>
+</DDDefinition>
diff --git a/...Data/data/Phase0/hcalRecNumberingRun2.xml → ...mmonData/data/Run2/hcalRecNumbering16.xml b/...Data/data/Phase0/hcalRecNumberingRun2.xml → ...mmonData/data/Run2/hcalRecNumbering16.xml
diff --git a/Geometry/HcalCommonData/data/Run2/hcalRecNumbering17.xml b/Geometry/HcalCommonData/data/Run2/hcalRecNumbering17.xml
@@ -0,0 +1,44 @@
+<?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="hcalRecNumbering.xml" eval="true">
+  <Vector name="etagroup" type="numeric" nEntries="29">
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1
+  </Vector>
+  <Vector name="phigroup" type="numeric" nEntries="29">
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1
+  </Vector>
+  <Vector name="layerGroupRecEta1" type="numeric" nEntries="19">
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 4, 4
+  </Vector>
+  <Vector name="layerGroupRecEta15" type="numeric" nEntries="19">
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 4, 4
+  </Vector>
+  <Vector name="layerGroupRecEta16" type="numeric" nEntries="19">
+    1, 1, 2, 2, 2, 2, 2, 2, 2, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4
+  </Vector>
+  <Vector name="layerGroupRecEta17" type="numeric" nEntries="19">
+    1, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3
+  </Vector>
+  <Vector name="layerGroupRecEta18" type="numeric" nEntries="19">
+    1, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5
+  </Vector>
+  <Vector name="layerGroupRecEta19" type="numeric" nEntries="19">
+    1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 4, 5, 5, 5, 5, 6, 6, 6, 6
+  </Vector>
+  <Vector name="layerGroupRecEta26" type="numeric" nEntries="19">
+    1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 5, 6, 6, 6, 6, 7, 7, 7, 7
+  </Vector>
+</ConstantsSection>
+
+<SpecParSection label="hcalRecNumbering.xml" eval="true">
+  <SpecPar name="hcal">
+    <PartSelector path="//HCal"/>
+    <Parameter name="OnlyForHcalRecNumbering" value="HCAL" eval="false"/>
+    <Parameter name="TopologyMode" value="HcalTopologyMode::LHC" eval="false"/>
+    <Parameter name="TriggerMode"  value="HcalTopologyMode::tm_LHC_1x1" eval="false"/>
+  </SpecPar>
+</SpecParSection>
+</DDDefinition>
diff --git a/Geometry/HcalCommonData/data/Run2/hcalSimNumbering.xml b/Geometry/HcalCommonData/data/Run2/hcalSimNumbering.xml
@@ -56,7 +56,7 @@
     16, 29, 41, 15
   </Vector>
   <Vector name="MaxDepth" type="numeric" nEntries="4">
-     2,  3,  4, 4
+     2,  3,  2,  4
   </Vector>
   <Vector name="etaRange" type="numeric" nEntries="4">
     1.392, 3.000, 5.500, 1.305