Remove wrong testing in HcalTopology

cms-sw · Feb 13, 2016 · c5645e9 · c5645e9
1 parent bb9305e
commit c5645e9
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/Geometry/CaloTopology/src/HcalTopology.cc b/Geometry/CaloTopology/src/HcalTopology.cc
@@ -445,9 +445,11 @@ bool HcalTopology::validRaw(const HcalDetId& id) const {
             if (aieta == etaBinsHE_[i].ieta) {
               if (aieta >= firstHEDoublePhiRing() && (iphi%2)==0) ok=false;
               if (aieta >= firstHEQuadPhiRing()   && (iphi%4)!=3) ok=false;
-              if (depth < etaBinsHE_[i].depthStart || 
-                  depth > (etaBinsHE_[i].depthStart+(int)(etaBinsHE_[i].layer.size())))
-                ok = false;
+              if (aieta+1 == hcons_->getNoff(1)) {
+		if (depth < 1) ok = false;
+	      } else {
+		if (depth < etaBinsHE_[i].depthStart) ok = false;
+	      }
               break;
             }
           }