Merge pull request #48166 from bsunanda/Phase2-hgx364A

Phase2-hgx364A Update some of the tests in Geometry/HGCalGeometry/test to estimate the errors correctly

Author: cmsbuild

DataFormats/ForwardDetId/interface/HGCScintillatorDetId.h

@@ -163,7 +163,7 @@ class HGCScintillatorDetId : public DetId {
   static constexpr int kHGCalTypeOffset = 26;
   static constexpr int kHGCalTypeMask = 0x3;
   static constexpr int kHGCalTypeMask0 = 0xF3FFFFFF;
-  static constexpr int kHGCalPositionMask = 0xF2FFFFFF;
+  static constexpr uint32_t kHGCalPositionMask = 0xF13FFFFF;
 
   constexpr int iradiusTriggerAbs() const {
     if (trigger())

Geometry/HGCalGeometry/test/HGCalGeometryTester.cc

@@ -193,7 +193,7 @@ void HGCalGeometryTester::doTestScint(const HGCalGeometry* geom, DetId::Detector
             GlobalPoint global1 = geom->getPosition(id1);
             DetId idc1 = geom->getClosestCell(global1);
             GlobalPoint global2 = geom->getPosition(idc1);
-            std::string cherr = (id1.rawId() != idc1.rawId()) ? " ***** ERROR *****" : "";
+            std::string cherr = (detId.position() != HGCScintillatorDetId(idc1).position()) ? " ***** ERROR *****" : "";
             edm::LogVerbatim("HGCalGeomX")
                 << "DetId (" << det << ":" << zside << ":" << type << ":" << layer << ":" << ieta << ":" << iphi
                 << ") Geom " << icell1 << " position (" << global1.x() << ", " << global1.y() << ", " << global1.z()

Geometry/HGCalGeometry/test/HGCalSizeTester.cc

@@ -129,27 +129,15 @@ void HGCalSizeTester::doTestScint(const HGCalGeometry* geom, DetId::Detector det
             auto icell1 = geom->getGeometry(id1);
             GlobalPoint global1 = geom->getPosition(id1);
             DetId idc1 = geom->getClosestCell(global1);
-            std::pair<int, int> typm = geom->topology().dddConstants().tileType(layer, ieta, iphi);
-            if (typm.first >= 0) {
-              HGCScintillatorDetId detId(id1);
-              detId.setType(typm.first);
-              detId.setSiPM(typm.second);
-              id1 = static_cast<DetId>(detId);
-            }
             HGCScintillatorDetId detId(idc1);
-            typm = geom->topology().dddConstants().tileType(detId.layer(), detId.ring(), detId.iphi());
-            if (typm.first >= 0) {
-              detId.setType(typm.first);
-              detId.setSiPM(typm.second);
-              idc1 = static_cast<DetId>(detId);
-            }
-            std::string cherr = (id1.rawId() != idc1.rawId()) ? "***** ERROR *****" : "";
+            std::string cherr = ((detId.position() != HGCScintillatorDetId(id1).position())) ? "***** ERROR *****" : "";
             edm::LogVerbatim("HGCalGeomX")
                 << "DetId (" << det << ":" << zside << ":" << type << ":" << layer << ":" << ieta << ":" << iphi
                 << ") Geom " << icell1 << " position (" << global1.x() << ", " << global1.y() << ", " << global1.z()
                 << ") ids " << std::hex << id1.rawId() << ":" << idc1.rawId() << std::dec << ":"
                 << HGCScintillatorDetId(id1) << ":" << HGCScintillatorDetId(idc1)
-                << " parameter[11] = " << icell1->param()[10] << ":" << icell1->param()[10] << cherr;
+                << " parameter[11] = " << icell1->param()[10] << ":" << icell1->param()[10] << cherr << " " << std::hex
+                << detId.position() << " " << HGCScintillatorDetId(id1).position() << std::dec;
             std::vector<GlobalPoint> corners = geom->getNewCorners(idc1);
             std::ostringstream st1;
             st1 << corners.size() << " corners";