Merge pull request #47946 from bsunanda/Phase2-hgx363M

cmsbuild · web-flow · commit e24f89532f74 · 2025-04-25T15:08:27.000+02:00
Phase2-hgx363M Modify the code to tune the new scintillator code for the V19 version of HGCal
diff --git a/Geometry/HGCalCommonData/data/hgcal/v16/hgcal.xml b/Geometry/HGCalCommonData/data/hgcal/v16/hgcal.xml
@@ -19,7 +19,7 @@
   <Constant name="ScintillatorThickness" value="3.0*mm"/>
   <Constant name="NumberOfCellsFine"     value="12"/>
   <Constant name="NumberOfCellsCoarse"   value="8"/>
-  <Constant name="NPhiBinBHFine"         value="360"/>
+  <Constant name="NPhiBinBHFine"         value="288"/>
   <Constant name="NPhiBinBH"             value="288"/>
   <Constant name="FirstMixedLayer"       value="8"/>
   <Constant name="LayerRotation"         value="-30*deg"/>
diff --git a/Geometry/HGCalCommonData/data/hgcal/v17/hgcal.xml b/Geometry/HGCalCommonData/data/hgcal/v17/hgcal.xml
@@ -19,7 +19,7 @@
   <Constant name="ScintillatorThickness" value="3.0*mm"/>
   <Constant name="NumberOfCellsFine"     value="12"/>
   <Constant name="NumberOfCellsCoarse"   value="8"/>
-  <Constant name="NPhiBinBHFine"         value="360"/>
+  <Constant name="NPhiBinBHFine"         value="288"/>
   <Constant name="NPhiBinBH"             value="288"/>
   <Constant name="FirstMixedLayer"       value="8"/>
   <Constant name="LayerRotation"         value="-30*deg"/>
diff --git a/Geometry/HGCalCommonData/data/hgcal/v17ng/hgcal.xml b/Geometry/HGCalCommonData/data/hgcal/v17ng/hgcal.xml
@@ -19,7 +19,7 @@
   <Constant name="ScintillatorThickness" value="3.0*mm"/>
   <Constant name="NumberOfCellsFine"     value="12"/>
   <Constant name="NumberOfCellsCoarse"   value="8"/>
-  <Constant name="NPhiBinBHFine"         value="360"/>
+  <Constant name="NPhiBinBHFine"         value="288"/>
   <Constant name="NPhiBinBH"             value="288"/>
   <Constant name="FirstMixedLayer"       value="8"/>
   <Constant name="LayerRotation"         value="-30*deg"/>
diff --git a/Geometry/HGCalCommonData/data/hgcal/v18/hgcal.xml b/Geometry/HGCalCommonData/data/hgcal/v18/hgcal.xml
@@ -20,7 +20,7 @@
   <Constant name="ScintillatorThickness" value="3.0*mm"/>
   <Constant name="NumberOfCellsFine"     value="12"/>
   <Constant name="NumberOfCellsCoarse"   value="8"/>
-  <Constant name="NPhiBinBHFine"         value="360"/>
+  <Constant name="NPhiBinBHFine"         value="288"/>
   <Constant name="NPhiBinBH"             value="288"/>
   <Constant name="FirstMixedLayer"       value="8"/>
   <Constant name="LayerRotation"         value="-30*deg"/>
diff --git a/Geometry/HGCalCommonData/data/hgcal/v18ng/hgcal.xml b/Geometry/HGCalCommonData/data/hgcal/v18ng/hgcal.xml
@@ -20,7 +20,7 @@
   <Constant name="ScintillatorThickness" value="3.0*mm"/>
   <Constant name="NumberOfCellsFine"     value="12"/>
   <Constant name="NumberOfCellsCoarse"   value="8"/>
-  <Constant name="NPhiBinBHFine"         value="360"/>
+  <Constant name="NPhiBinBHFine"         value="288"/>
   <Constant name="NPhiBinBH"             value="288"/>
   <Constant name="FirstMixedLayer"       value="8"/>
   <Constant name="LayerRotation"         value="-30*deg"/>
diff --git a/Geometry/HGCalCommonData/data/hgcalCons/v16/hgcalCons.xml b/Geometry/HGCalCommonData/data/hgcalCons/v16/hgcalCons.xml
@@ -163,8 +163,8 @@
     <Parameter name="WaferZside"          value="1"/>
     <Parameter name="WaferThickness"      value="[hgcal:ScintillatorThickness]"/>
     <Parameter name="MinimumTileSize"     value="[MinimumTileSize]"/>
-    <Parameter name="NPhiBinBH"           value="[hgcal:NPhiBinBHFine]"/>
     <Parameter name="NPhiBinBH"           value="[hgcal:NPhiBinBH]"/>
+    <Parameter name="NPhiBinBH"           value="[hgcal:NPhiBinBHFine]"/>
     <Parameter name="LayerFrontBH"        value="[hgcal:FirstMixedLayer]"/>
     <Parameter name="LayerFrontBH"        value="[hgcal:FirstMixedLayer]"/>
     <Parameter name="RMinLayerBH"         value="[hgcal:radMixL3]"/>
diff --git a/Geometry/HGCalCommonData/data/hgcalCons/v17/hgcalCons.xml b/Geometry/HGCalCommonData/data/hgcalCons/v17/hgcalCons.xml
@@ -165,8 +165,8 @@
     <Parameter name="WaferZside"          value="1"/>
     <Parameter name="WaferThickness"      value="[hgcal:ScintillatorThickness]"/>
     <Parameter name="MinimumTileSize"     value="[MinimumTileSize]"/>
-    <Parameter name="NPhiBinBH"           value="[hgcal:NPhiBinBHFine]"/>
     <Parameter name="NPhiBinBH"           value="[hgcal:NPhiBinBH]"/>
+    <Parameter name="NPhiBinBH"           value="[hgcal:NPhiBinBHFine]"/>
     <Parameter name="LayerFrontBH"        value="[hgcal:FirstMixedLayer]"/>
     <Parameter name="LayerFrontBH"        value="[hgcal:FirstMixedLayer]"/>
     <Parameter name="Cassettes"           value="12"/>
diff --git a/Geometry/HGCalCommonData/data/hgcalCons/v17n/hgcalCons.xml b/Geometry/HGCalCommonData/data/hgcalCons/v17n/hgcalCons.xml
@@ -165,8 +165,8 @@
     <Parameter name="WaferZside"          value="1"/>
     <Parameter name="WaferThickness"      value="[hgcal:ScintillatorThickness]"/>
     <Parameter name="MinimumTileSize"     value="[MinimumTileSize]"/>
-    <Parameter name="NPhiBinBH"           value="[hgcal:NPhiBinBHFine]"/>
     <Parameter name="NPhiBinBH"           value="[hgcal:NPhiBinBH]"/>
+    <Parameter name="NPhiBinBH"           value="[hgcal:NPhiBinBHFine]"/>
     <Parameter name="LayerFrontBH"        value="[hgcal:FirstMixedLayer]"/>
     <Parameter name="LayerFrontBH"        value="[hgcal:FirstMixedLayer]"/>
     <Parameter name="Cassettes"           value="12"/>
diff --git a/Geometry/HGCalCommonData/data/hgcalCons/v18/hgcalCons.xml b/Geometry/HGCalCommonData/data/hgcalCons/v18/hgcalCons.xml
@@ -179,8 +179,8 @@
     <Parameter name="WaferZside"          value="1"/>
     <Parameter name="WaferThickness"      value="[hgcal:ScintillatorThickness]"/>
     <Parameter name="MinimumTileSize"     value="[MinimumTileSize]"/>
-    <Parameter name="NPhiBinBH"           value="[hgcal:NPhiBinBHFine]"/>
     <Parameter name="NPhiBinBH"           value="[hgcal:NPhiBinBH]"/>
+    <Parameter name="NPhiBinBH"           value="[hgcal:NPhiBinBHFine]"/>
     <Parameter name="LayerFrontBH"        value="[hgcal:FirstMixedLayer]"/>
     <Parameter name="LayerFrontBH"        value="[hgcal:FirstMixedLayer]"/>
     <Parameter name="Cassettes"           value="12"/>
diff --git a/Geometry/HGCalCommonData/data/hgcalCons/v18n/hgcalCons.xml b/Geometry/HGCalCommonData/data/hgcalCons/v18n/hgcalCons.xml
@@ -179,8 +179,8 @@
     <Parameter name="WaferZside"          value="1"/>
     <Parameter name="WaferThickness"      value="[hgcal:ScintillatorThickness]"/>
     <Parameter name="MinimumTileSize"     value="[MinimumTileSize]"/>
-    <Parameter name="NPhiBinBH"           value="[hgcal:NPhiBinBHFine]"/>
     <Parameter name="NPhiBinBH"           value="[hgcal:NPhiBinBH]"/>
+    <Parameter name="NPhiBinBH"           value="[hgcal:NPhiBinBHFine]"/>
     <Parameter name="LayerFrontBH"        value="[hgcal:FirstMixedLayer]"/>
     <Parameter name="LayerFrontBH"        value="[hgcal:FirstMixedLayer]"/>
     <Parameter name="Cassettes"           value="12"/>
diff --git a/Geometry/HGCalCommonData/data/hgcalCons/v19/hgcalCons.xml b/Geometry/HGCalCommonData/data/hgcalCons/v19/hgcalCons.xml
@@ -179,8 +179,8 @@
     <Parameter name="WaferZside"          value="1"/>
     <Parameter name="WaferThickness"      value="[hgcal:ScintillatorThickness]"/>
     <Parameter name="MinimumTileSize"     value="[MinimumTileSize]"/>
-    <Parameter name="NPhiBinBH"           value="[hgcal:NPhiBinBHFine]"/>
     <Parameter name="NPhiBinBH"           value="[hgcal:NPhiBinBH]"/>
+    <Parameter name="NPhiBinBH"           value="[hgcal:NPhiBinBHFine]"/>
     <Parameter name="LayerFrontBH"        value="[hgcal:FirstMixedLayer]"/>
     <Parameter name="LayerFrontBH"        value="[hgcal:FirstMixedCoarseLayer]"/>
     <Parameter name="Cassettes"           value="12"/>
diff --git a/Geometry/HGCalCommonData/src/HGCalDDDConstants.cc b/Geometry/HGCalCommonData/src/HGCalDDDConstants.cc
@@ -1468,29 +1468,51 @@ bool HGCalDDDConstants::tileExist(int zside, int layer, int ring, int phi) const
 #ifdef EDM_ML_DEBUG
   edm::LogVerbatim("HGCalGeomT") << "TileExist: Layer : " << layer << ":" << index.first << " Fine " << fine;
 #endif
-  bool ok(true);
-  if (fine) {
-    int indx = HGCalTileIndex::tileIndex(layer, ring, 1);
-    auto itr = hgpar_->tileInfoMap_.find(indx);
-    ok = (itr == hgpar_->tileInfoMap_.end()) ? false : HGCalTileIndex::tileFineExist(itr->second.hex, zside, phi);
-#ifdef EDM_ML_DEBUG
-    if (!ok)
-      edm::LogWarning("HGCalGeomT") << "TileExist:input " << zside << ":" << layer << ":" << ring << ":" << phi
-                                    << " Index flag " << indx << ":" << (itr != hgpar_->tileInfoMap_.end()) << " ok "
-                                    << ok;
-#endif
-    return ok;
-  } else {
-    int indx = HGCalTileIndex::tileIndex(layer, ring, 0);
-    auto itr = hgpar_->tileInfoMap_.find(indx);
-    ok = (itr == hgpar_->tileInfoMap_.end()) ? false : HGCalTileIndex::tileExist(itr->second.hex, zside, phi);
+  bool ok = ((ring >= hgpar_->iradMinBH_[index.first]) && (ring <= hgpar_->iradMaxBH_[index.first]));
+  if (ok) {
+    if (fine) {
+      int indx = HGCalTileIndex::tileIndex(layer, ring, 1);
+      auto itr = hgpar_->tileInfoMap_.find(indx);
+      ok = (itr == hgpar_->tileInfoMap_.end()) ? false : HGCalTileIndex::tileFineExist(itr->second.hex, zside, phi);
+#ifdef EDM_ML_DEBUG
+      if (!ok)
+        edm::LogWarning("HGCalGeomT") << "TileExist:input " << zside << ":" << layer << ":" << ring << ":" << phi
+                                      << " Index flag " << indx << ":" << (itr != hgpar_->tileInfoMap_.end()) << " ok "
+                                      << ok;
+      if (HGCalTileIndex::tileFineExist(itr->second.hex, zside, phi) !=
+          HGCalTileIndex::tileExist(itr->second.hex, zside, phi))
+        edm::LogVerbatim("HGCalGeom") << "Zside:Layer:Ring:Phi " << zside << ":" << layer << ":" << ring << ":" << phi
+                                      << " hex " << std::hex << itr->second.hex[0] << ":" << itr->second.hex[1] << ":"
+                                      << itr->second.hex[2] << ":" << itr->second.hex[3] << ":" << itr->second.hex[4]
+                                      << ":" << itr->second.hex[5] << std::dec << " OK " << ok << ":"
+                                      << HGCalTileIndex::tileExist(itr->second.hex, zside, phi) << " CHECK";
+#endif
+      return ok;
+    } else {
+      int indx = HGCalTileIndex::tileIndex(layer, ring, 0);
+      auto itr = hgpar_->tileInfoMap_.find(indx);
+      ok = (itr == hgpar_->tileInfoMap_.end()) ? false : HGCalTileIndex::tileExist(itr->second.hex, zside, phi);
+#ifdef EDM_ML_DEBUG
+      if (!ok)
+        edm::LogWarning("HGCalGeomT") << "TileExist:input " << zside << ":" << layer << ":" << ring << ":" << phi
+                                      << " Index " << index.first << ":" << (itr != hgpar_->tileInfoMap_.end())
+                                      << " ok " << ok;
+      if (HGCalTileIndex::tileFineExist(itr->second.hex, zside, phi) !=
+          HGCalTileIndex::tileExist(itr->second.hex, zside, phi))
+        edm::LogVerbatim("HGCalGeom") << "Zside:Layer:Ring:Phi " << zside << ":" << layer << ":" << ring << ":" << phi
+                                      << " hex " << std::hex << itr->second.hex[0] << ":" << itr->second.hex[1] << ":"
+                                      << itr->second.hex[2] << ":" << itr->second.hex[3] << ":" << itr->second.hex[4]
+                                      << ":" << itr->second.hex[5] << std::dec << " OK " << ok << ":"
+                                      << HGCalTileIndex::tileFineExist(itr->second.hex, zside, phi) << " CHECK";
+#endif
+      return ok;
+    }
 #ifdef EDM_ML_DEBUG
-    if (!ok)
-      edm::LogWarning("HGCalGeomT") << "TileExist:input " << zside << ":" << layer << ":" << ring << ":" << phi
-                                    << " Index flag " << indx << ":" << (itr != hgpar_->tileInfoMap_.end()) << " ok "
-                                    << ok;
+  } else {
+    edm::LogWarning("HGCalGeomT") << "TileExist:input " << zside << ":" << layer << ":" << ring << ":" << phi
+                                  << " Index " << index.first << " Ring limits " << hgpar_->iradMinBH_[index.first]
+                                  << ":" << hgpar_->iradMaxBH_[index.first] << " ok " << ok;
 #endif
-    return ok;
   }
   return ok;
 }
diff --git a/Geometry/HGCalGeometry/src/HGCalGeometryLoader.cc b/Geometry/HGCalGeometry/src/HGCalGeometryLoader.cc
@@ -28,7 +28,8 @@ HGCalGeometry* HGCalGeometryLoader::build(const HGCalTopology& topology) {
   uint32_t numberOfShapes =
       (topology.tileTrapezoid() ? HGCalGeometry::k_NumberOfShapesTrd : HGCalGeometry::k_NumberOfShapes);
   HGCalGeometryMode::GeometryMode mode = topology.geomMode();
-  bool test = ((mode == HGCalGeometryMode::TrapezoidModule) || (mode == HGCalGeometryMode::TrapezoidCassette));
+  bool test = ((mode == HGCalGeometryMode::TrapezoidModule) || (mode == HGCalGeometryMode::TrapezoidCassette) ||
+               (mode == HGCalGeometryMode::TrapezoidFineCell));
 #ifdef EDM_ML_DEBUG
   edm::LogVerbatim("HGCalGeom") << "Number of Cells " << numberOfCells << ":" << numberExpected << " for sub-detector "
                                 << topology.subDetector() << " Shapes " << numberOfShapes << ":" << parametersPerShape_
@@ -89,6 +90,11 @@ HGCalGeometry* HGCalGeometryLoader::build(const HGCalTopology& topology) {
       int ring = topology.dddConstants().getParameter()->iradMinBH_[indx];
       int nphi = topology.dddConstants().getParameter()->scintCells(layer);
       int type = topology.dddConstants().getParameter()->scintType(layer);
+#ifdef EDM_ML_DEBUG
+      edm::LogVerbatim("HGCalGeom") << "Layer " << layer << ":" << indx << " Ring " << ring << ":"
+                                    << topology.dddConstants().getParameter()->iradMaxBH_[indx] << " Phi " << nphi
+                                    << " Type " << type;
+#endif
       for (int md = topology.dddConstants().getParameter()->firstModule_[indx];
            md <= topology.dddConstants().getParameter()->lastModule_[indx];
            ++md) {
