bsunanda:Run2-hcx113 Bug fix for Plan 1 Geometry

Geometry/HcalCommonData/src/HcalDDDRecConstants.cc

@@ -839,7 +839,7 @@ void HcalDDDRecConstants::initialize(void) {
 #ifdef EDM_ML_DEBUG
   std::cout << "Detector type and maximum depth for all RBX " 
 	    << depthMaxDf_.first << ":" << depthMaxDf_.second
-	    << "and for special RBX " << depthMaxSp_.first << ":" 
+	    << " and for special RBX " << depthMaxSp_.first << ":" 
 	    << depthMaxSp_.second << std::endl;
 #endif
 
@@ -867,6 +867,14 @@ void HcalDDDRecConstants::initialize(void) {
 	}
       }
       if (depth != 0) oldDep[depth] = std::pair<int,int>(lmin,lymax-1);
+#ifdef EDM_ML_DEBUG      
+      std::cout << "Eta|Phi|Zside " << eta << ":" << phi << ":" << zside
+		<< " with " << oldDep.size() << " old Depths" << std::endl;
+      unsigned int kk(0);
+      for (std::map<int,std::pair<int,int> >::const_iterator itr=oldDep.begin(); itr != oldDep.end(); ++itr,++kk)
+	std::cout << "[" << kk << "] " << itr->first << " --> " 
+		  << itr->second.first << ":" << itr->second.second << "\n";
+#endif
       std::pair<int,int> depths = hcons.ldMap()->getDepths(eta);
       for (int ndepth=depths.first; ndepth<=depths.second; ++ndepth) {
 	bool flag = ((subdet == HcalBarrel && eta == iEtaMax[0] && 
@@ -875,10 +883,10 @@ void HcalDDDRecConstants::initialize(void) {
 		      ndepth < hcons.getDepthEta16(subdet0,phi,zside)));
 	if (!flag) {
 	  std::vector<int> count(oldDep.size(),0);
-	  unsigned int l(0);
 	  int layFront = hcons.ldMap()->getLayerFront(subdet0,eta,phi,zside,ndepth);
 	  int layBack  = hcons.ldMap()->getLayerBack(subdet0,eta,phi,zside,ndepth);
 	  for (int lay=layFront; lay<=layBack; ++lay) {
+	    unsigned int l(0);
 	    for (std::map<int,std::pair<int,int> >::iterator itr=oldDep.begin();
 		 itr != oldDep.end(); ++itr,++l) {
 	      if (lay >= (itr->second).first && lay <= (itr->second).second) {
@@ -887,14 +895,18 @@ void HcalDDDRecConstants::initialize(void) {
 	    }
 	  }
 	  int odepth(0), maxlay(0);
-	  l = 0;
+	  unsigned int l(0);
 	  for (std::map<int,std::pair<int,int> >::iterator itr=oldDep.begin();
 	       itr != oldDep.end(); ++itr,++l) {
 	    if (count[l] > maxlay) {
 	      odepth = itr->first;
 	      maxlay = count[l];
 	    }
 	  }
+#ifdef EDM_ML_DEBUG      
+	  std::cout << "New Depth " << ndepth << " old Depth " << odepth 
+		    << " max " << maxlay << std::endl;
+#endif
 	  for (unsigned int k=0; k<phis.size(); ++k) {
 	    zside  = (phis[k] > 0) ? 1 : -1;
 	    phi    = (phis[k] > 0) ? phis[k] : -phis[k];

Geometry/HcalCommonData/src/HcalLayerDepthMap.cc

@@ -44,7 +44,7 @@ void HcalLayerDepthMap::initialize(const int subdet, const int ietaMax,
     int ietaMin = ieta[k1];
     int ietaMax = ietaMax_;
     int layMin  = layer[k1];
-    int layMax  = (k1+1 < ieta.size()) ? layer[k1+1] : maxLayers_;
+    int layMax  = (k1+1 < ieta.size()) ? (layer[k1+1]-1) : maxLayers_;
     for (unsigned int k2=k1+1; k2<ieta.size(); ++k2) {
       if (ieta[k2] > ieta[k1]) {
 	ietaMax = ieta[k2] - 1;

Geometry/HcalCommonData/test/python/runHcalRecNumberingTester_cfg.py

@@ -1,7 +1,7 @@
 import FWCore.ParameterSet.Config as cms
 process = cms.Process("HcalParametersTest")
 
-process.load('Geometry.HcalCommonData.testPhase1GeometryXML_cfi')
+process.load('Geometry.HcalCommonData.testGeometry17bXML_cfi')
 process.load('Geometry.HcalCommonData.hcalDDConstants_cff')
 
 process.source = cms.Source("EmptySource")