Merge pull request #49530 from bsunanda/Phase2-hgx364W

Phase2-hgx364W Try to resolve the issue of wafer number mismatch in V19 geometry of HGCal

Author: cmsbuild

Geometry/HGCalCommonData/src/HGCalDDDConstants.cc

@@ -1780,7 +1780,16 @@ void HGCalDDDConstants::waferFromPosition(const double x,
           dx0 = -cshift.first;
           dy0 = cshift.second;
           if (debug)
-            edm::LogVerbatim("HGCalGeom") << "Cassette " << (ktr->second).cassette << " Shift " << dx0 << ":" << dy0;
+            edm::LogVerbatim("HGCalGeom") << "Cassette " << (ktr->second).cassette << " Shift " << dx0 << ":" << dy0
+                                          << " Type " << (ktr->second).type << ":" << (ktr->second).part << ":"
+                                          << (ktr->second).orient << ":" << (ktr->second).cassette;
+        } else {
+          if (mode_ == HGCalGeometryMode::Hexagon8FineCell) {
+            if (debug)
+              edm::LogVerbatim("HGCalGeom") << "Cannot find waferinformation --> Skip this " << layer << ":" << waferU
+                                            << ":" << waferV << " wafer assignment";
+            continue;
+          }
         }
       }
       double dx = std::abs(xx - dx0 - hgpar_->waferPosX_[k]);

Geometry/HGCalCommonData/src/HGCalGeomParameters.cc

@@ -1605,7 +1605,11 @@ void HGCalGeomParameters::loadSpecParsHexagon8(HGCalParameters& php,
                                   << HGCalWaferIndex::waferU(waferIndex[k]) << ":"
                                   << HGCalWaferIndex::waferV(waferIndex[k]) << "]  Thickness type "
                                   << HGCalProperty::waferThick(waferProperties[k]) << " Partial type " << partial
-                                  << " Orientation " << HGCalProperty::waferOrient(waferProperties[k]) << ":" << orient;
+                                  << " Orientation " << HGCalProperty::waferOrient(waferProperties[k]) << ":" << orient
+                                  << " Info " << php.waferInfoMap_[waferIndex[k]].type << ":"
+                                  << php.waferInfoMap_[waferIndex[k]].part << ":"
+                                  << php.waferInfoMap_[waferIndex[k]].orient << ":"
+                                  << php.waferInfoMap_[waferIndex[k]].cassette;
 #endif
   }
 }

Geometry/HGCalGeometry/test/HGCalIdCheck.cc

@@ -94,6 +94,9 @@ HGCalIdCheck::HGCalIdCheck(const edm::ParameterSet &iC)
           int32_t cellV = std::atoi(items[7].c_str());
           HGCSiliconDetId detId(det, zp, type, layer, waferU, waferV, cellU, cellV);
           detIds_.emplace_back(detId);
+          edm::LogVerbatim("HGCGeom") << "[" << detIds_.size() << "] " << det << ":" << zp << ":" << type << ":"
+                                      << layer << ":" << waferU << ":" << waferV << ":" << cellU << ":" << cellV
+                                      << " ==> " << detId;
         }
       }
       fInput.close();