Merge pull request #47818 from bsunanda/Phase2-hgx363D

Phase2-hgx363D Modify the validation check of scintillation tiles to put the active cells in the geometry pool for the V19 version

Author: cmsbuild

Geometry/HGCalCommonData/data/hgcalwafer/v19/hgcalwafer.xml

@@ -1197,7 +1197,7 @@
       HGCalHESiliconSensitive, HGCalHEBasePlate, HGCalHEAirGap0</Vector>
     <Vector name="LayerMaterials" type="string" nEntries="7">
       hgcalMaterial:HGC_HEServices, hgcalMaterial:HGC_Hexaboard, materials:Epoxy,
-      hgcalMaterial:HGC_Kapton, materials:Silicon, hgcalMaterial:HGC_G10-FR4,
+      hgcalMaterial:HGC_Kapton, materials:Silicon, materials:Titanium,
       materials:Air</Vector>
     <Vector name="LayerThickness" type="numeric" nEntries="7">
       5.060*mm, 1.300*mm, 0.125*mm, 0.300*mm, [WaferThickness200], 1.05*mm,
@@ -1235,7 +1235,7 @@
       HGCalHESiliconSensitive, HGCalHEBasePlate, HGCalHEAirGap0</Vector>
     <Vector name="LayerMaterials" type="string" nEntries="7">
       hgcalMaterial:HGC_HEServices, hgcalMaterial:HGC_Hexaboard, materials:Epoxy,
-      hgcalMaterial:HGC_Kapton, materials:Silicon, hgcalMaterial:HGC_G10-FR4,
+      hgcalMaterial:HGC_Kapton, materials:Silicon, materials:Titanium,
       materials:Air</Vector>
     <Vector name="LayerThickness" type="numeric" nEntries="7">
       5.060*mm, 1.300*mm, 0.125*mm, 0.300*mm, [WaferThickness200], 1.05*mm,

Geometry/HGCalCommonData/src/HGCalDDDConstants.cc

@@ -1458,6 +1458,17 @@ int HGCalDDDConstants::tileCount(int layer, int ring) const {
 bool HGCalDDDConstants::tileExist(int zside, int layer, int ring, int phi) const {
   int indx = HGCalTileIndex::tileIndex(layer, ring, 0);
   auto itr = hgpar_->tileInfoMap_.find(indx);
+#ifdef EDM_ML_DEBUG
+  edm::LogVerbatim("HGCalGeomT") << "TileExist:input " << zside << ":" << layer << ":" << ring << ":" << phi
+                                 << " Index flag " << indx << ":" << (itr != hgpar_->tileInfoMap_.end());
+#endif
+  if (itr == hgpar_->tileInfoMap_.end()) {
+    indx = HGCalTileIndex::tileIndex(layer, ring, 1);
+    itr = hgpar_->tileInfoMap_.find(indx);
+#ifdef EDM_ML_DEBUG
+    edm::LogVerbatim("HGCalGeomT") << "Tile Index flag " << indx << ":" << (itr != hgpar_->tileInfoMap_.end());
+#endif
+  }
   bool ok = (itr == hgpar_->tileInfoMap_.end()) ? false : HGCalTileIndex::tileExist(itr->second.hex, zside, phi);
   return ok;
 }
@@ -1569,8 +1580,8 @@ void HGCalDDDConstants::waferFromPosition(const double x, const double y, int& w
   } else {
     wafer = -1;
 #ifdef EDM_ML_DEBUG
-    edm::LogWarning("HGCalGeom") << "Cannot get wafer type corresponding to " << x << ":" << y << "    " << xx << ":"
-                                 << yy;
+    edm::LogVerbatim("HGCalGeom") << "Cannot get wafer type corresponding to " << x << ":" << y << "    " << xx << ":"
+                                  << yy;
 #endif
   }
 #ifdef EDM_ML_DEBUG

Geometry/HGCalGeometry/src/HGCalGeometry.cc

@@ -21,7 +21,7 @@
 typedef CaloCellGeometry::Tr3D Tr3D;
 typedef std::vector<float> ParmVec;
 
-#define EDM_ML_DEBUG
+//#define EDM_ML_DEBUG
 
 const bool debugLocate = false;
 
@@ -117,12 +117,12 @@ void HGCalGeometry::newCell(
       m_validIds.emplace_back(idc);
 #ifdef EDM_ML_DEBUG
       edm::LogVerbatim("HGCalGeom") << "Valid Id [0] " << HGCScintillatorDetId(idc);
-#endif
     } else {
-      edm::LogWarning("HGCalGeom") << "Check " << HGCScintillatorDetId(idc) << " from " << HGCScintillatorDetId(detId)
-                                   << " Mode " << m_topology.dddConstants().geomMode() << ":" << m_topology.geomMode()
-                                   << " Valid " << m_topology.tileTrapezoid() << ":" << m_topology.valid(idc)
-                                   << " ERROR ???";
+      edm::LogVerbatim("HGCalGeom") << "Check " << HGCScintillatorDetId(idc) << " from " << HGCScintillatorDetId(detId)
+                                    << " Mode " << m_topology.dddConstants().geomMode() << ":" << m_topology.geomMode()
+                                    << " Valid " << m_topology.tileTrapezoid() << ":" << m_topology.valid(idc)
+                                    << " ERROR ???";
+#endif
     }
   } else {
 #ifdef EDM_ML_DEBUG