Merge pull request #46820 from bsunanda/Phase2-hgx360Y

Phase2-hgx360Y Update some of the parameters for V19 version of HGCal geometry
cms-sw · Nov 28, 2024 · 01fc805 · 01fc805
2 parents 32a8385 + b5d92fe
commit 01fc805
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 21 deletions.
diff --git a/Geometry/EcalCommonData/src/EcalSimParametersFromDD.cc b/Geometry/EcalCommonData/src/EcalSimParametersFromDD.cc
@@ -35,43 +35,67 @@ bool EcalSimParametersFromDD::build(const DDCompactView* cpv, const std::string&
   //First the specpars
   php.useWeight_ = true;
   std::vector<double> tempD = getDDDArray("EnergyWeight", sv);
+#ifdef EDM_ML_DEBUG
+  edm::LogVerbatim("EcalGeom") << "EcalSimParametersFromDD:" << name << " EnergyWeight " << tempD.empty();
+#endif
   if (!tempD.empty()) {
     if (tempD[0] < 0.1)
       php.useWeight_ = false;
   }
   tempD = getDDDArray("nxtalEta", sv);
+#ifdef EDM_ML_DEBUG
+  edm::LogVerbatim("EcalGeom") << "EcalSimParametersFromDD:" << name << " nxtalEta " << tempD.empty();
+#endif
   if (tempD.empty())
     php.nxtalEta_ = 0;
   else
     php.nxtalEta_ = static_cast<int>(tempD[0]);
   tempD = getDDDArray("nxtalPhi", sv);
+#ifdef EDM_ML_DEBUG
+  edm::LogVerbatim("EcalGeom") << "EcalSimParametersFromDD:" << name << " nxtalPhi " << tempD.empty();
+#endif
   if (tempD.empty())
     php.nxtalPhi_ = 0;
   else
     php.nxtalPhi_ = static_cast<int>(tempD[0]);
   tempD = getDDDArray("PhiBaskets", sv);
+#ifdef EDM_ML_DEBUG
+  edm::LogVerbatim("EcalGeom") << "EcalSimParametersFromDD:" << name << " PhiBaskets " << tempD.empty();
+#endif
   if (tempD.empty())
     php.phiBaskets_ = 0;
   else
     php.phiBaskets_ = static_cast<int>(tempD[0]);
   php.etaBaskets_ = dbl_to_int(getDDDArray("EtaBaskets", sv));
+#ifdef EDM_ML_DEBUG
+  edm::LogVerbatim("EcalGeom") << "EcalSimParametersFromDD:" << name << " EtaBaskets " << tempD.empty();
+#endif
   tempD = getDDDArray("ncrys", sv);
   if (tempD.empty())
     php.ncrys_ = 0;
   else
     php.ncrys_ = static_cast<int>(tempD[0]);
   tempD = getDDDArray("nmods", sv);
+#ifdef EDM_ML_DEBUG
+  edm::LogVerbatim("EcalGeom") << "EcalSimParametersFromDD:" << name << " ncrys " << tempD.empty();
+#endif
   if (tempD.empty())
     php.nmods_ = 0;
   else
     php.nmods_ = static_cast<int>(tempD[0]);
 
   std::vector<std::string> tempS = getStringArray("Depth1Name", sv);
+#ifdef EDM_ML_DEBUG
+  edm::LogVerbatim("EcalGeom") << "EcalSimParametersFromDD:" << name << " Depth1Name " << tempS.empty();
+#endif
   if (!tempS.empty())
     php.depth1Name_ = tempS[0];
   else
     php.depth1Name_ = " ";
   tempS = getStringArray("Depth2Name", sv);
+#ifdef EDM_ML_DEBUG
+  edm::LogVerbatim("EcalGeom") << "EcalSimParametersFromDD:" << name << " Depth2Name " << tempS.empty();
+#endif
   if (!tempS.empty())
     php.depth2Name_ = tempS[0];
   else

diff --git a/Geometry/HGCalCommonData/data/hgcalConsData/v19/hgcalConsData.xml b/Geometry/HGCalCommonData/data/hgcalConsData/v19/hgcalConsData.xml
@@ -3666,9 +3666,9 @@
        288,   288,   288,   288 
   </Vector>
   <Vector name="ScintRetract" type="numeric" nEntries="14">
-           4*mm,       4*mm,       4*mm,       4*mm,       4*mm,       4*mm,
-           4*mm,       4*mm,       4*mm,       4*mm,       4*mm,       4*mm,
-           4*mm,       4*mm 
+           4*mm,       4*mm,       4*mm,       4*mm,       8*mm,       8*mm,
+           8*mm,       8*mm,       8*mm,       8*mm,       8*mm,       8*mm,
+           8*mm,       8*mm 
   </Vector>
   <Vector name="TileRMin6" type="numeric" nEntries="24">
      1537.06*mm, 1559.91*mm, 1582.76*mm, 1605.61*mm, 1629.48*mm, 1653.35*mm,

diff --git a/Geometry/HGCalCommonData/data/hgcalHEmix/v19/hgcalHEmix.xml b/Geometry/HGCalCommonData/data/hgcalHEmix/v19/hgcalHEmix.xml
@@ -39,7 +39,7 @@
     <Vector name="RMaxFront" type="numeric" nEntries="4">
       [hgcal:rMaxHGCal1], [hgcal:rMaxHGCal5], [hgcal:rMaxHGCal10], 
       [hgcal:rMaxHGCal11]</Vector>
-,   <Vector name="WaferNamesFull" type="string" nEntries="24">
+    <Vector name="WaferNamesFull" type="string" nEntries="24">
       hgcalwafer:HGCalHEWafer06HD120, hgcalwafer:HGCalHEWafer07HD120,
       hgcalwafer:HGCalHEWafer08HD120, hgcalwafer:HGCalHEWafer09HD120, 
       hgcalwafer:HGCalHEWafer10HD120, hgcalwafer:HGCalHEWafer11HD120, 
@@ -1209,9 +1209,9 @@
          288,   288,   288,   288 
     </Vector>
     <Vector name="ScintRetract" type="numeric" nEntries="14">
-             4*mm,       4*mm,       4*mm,       4*mm,       4*mm,       4*mm,
-             4*mm,       4*mm,       4*mm,       4*mm,       4*mm,       4*mm,
-             4*mm,       4*mm 
+             4*mm,       4*mm,       4*mm,       4*mm,       8*mm,       8*mm,
+             8*mm,       8*mm,       8*mm,       8*mm,       8*mm,       8*mm,
+             8*mm,       8*mm 
     </Vector>
     <Vector name="Tile6RMin" type="numeric" nEntries="24">
        1537.06*mm, 1559.91*mm, 1582.76*mm, 1605.61*mm, 1629.48*mm, 1653.35*mm,

diff --git a/Geometry/HGCalCommonData/data/hgcalwafer/v19/hgcalwafer.xml b/Geometry/HGCalCommonData/data/hgcalwafer/v19/hgcalwafer.xml
@@ -434,7 +434,7 @@
       HGCalHESiliconSensitive, HGCalHEBasePlate</Vector>
     <Vector name="LayerMaterials" type="string" nEntries="6">
       hgcalMaterial:HGC_HEServices, hgcalMaterial:HGC_Hexaboard, materials:Epoxy,
-      hgcalMaterial:HGC_Kapton, materials:Silicon, hgcalMaterial:HGC_G10-FR4</Vector>
+      hgcalMaterial:HGC_Kapton, materials:Silicon, materials:Titanium</Vector>
     <Vector name="LayerThickness" type="numeric" nEntries="6">
       5.060*mm, 1.300*mm, 0.125*mm, 0.300*mm, [WaferThickness120], 1.050*mm</Vector>
     <Vector name="LayerSizeOffset" type="numeric" nEntries="6">
@@ -482,7 +482,7 @@
       HGCalHESiliconSensitive, HGCalHEBasePlate</Vector>
     <Vector name="LayerMaterials" type="string" nEntries="6">
       hgcalMaterial:HGC_HEServices, hgcalMaterial:HGC_Hexaboard, materials:Epoxy,
-      hgcalMaterial:HGC_Kapton, materials:Silicon, hgcalMaterial:HGC_G10-FR4</Vector>
+      hgcalMaterial:HGC_Kapton, materials:Silicon, materials:Titanium</Vector>
     <Vector name="LayerThickness" type="numeric" nEntries="6">
       5.060*mm, 1.300*mm, 0.125*mm, 0.300*mm, [WaferThickness120], 1.050*mm</Vector>
     <Vector name="LayerSizeOffset" type="numeric" nEntries="6">
@@ -530,7 +530,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.050*mm,
@@ -580,7 +580,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.050*mm,
@@ -630,7 +630,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.050*mm,
@@ -680,7 +680,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.050*mm,
@@ -730,7 +730,7 @@
       HGCalHESiliconSensitive, HGCalHEBasePlate</Vector>
     <Vector name="LayerMaterials" type="string" nEntries="6">
       hgcalMaterial:HGC_HEServices, hgcalMaterial:HGC_Hexaboard, materials:Epoxy,
-      hgcalMaterial:HGC_Kapton, materials:Silicon, hgcalMaterial:HGC_G10-FR4</Vector>
+      hgcalMaterial:HGC_Kapton, materials:Silicon, materials:Titanium</Vector>
     <Vector name="LayerThickness" type="numeric" nEntries="6">
       5.060*mm, 1.300*mm, 0.125*mm, 0.300*mm, [WaferThickness300], 1.050*mm</Vector>
     <Vector name="LayerSizeOffset" type="numeric" nEntries="6">
@@ -778,7 +778,7 @@
       HGCalHESiliconSensitive, HGCalHEBasePlate</Vector>
     <Vector name="LayerMaterials" type="string" nEntries="6">
       hgcalMaterial:HGC_HEServices, hgcalMaterial:HGC_Hexaboard, materials:Epoxy,
-      hgcalMaterial:HGC_Kapton, materials:Silicon, hgcalMaterial:HGC_G10-FR4</Vector>
+      hgcalMaterial:HGC_Kapton, materials:Silicon, materials:Titanium</Vector>
     <Vector name="LayerThickness" type="numeric" nEntries="6">
       5.060*mm, 1.300*mm, 0.125*mm, 0.300*mm, [WaferThickness300], 1.050*mm</Vector>
     <Vector name="LayerSizeOffset" type="numeric" nEntries="6">
@@ -1125,7 +1125,7 @@
       HGCalHESiliconSensitive, HGCalHEBasePlate</Vector>
     <Vector name="LayerMaterials" type="string" nEntries="6">
       hgcalMaterial:HGC_HEServices, hgcalMaterial:HGC_Hexaboard, materials:Epoxy,
-      hgcalMaterial:HGC_Kapton, materials:Silicon, hgcalMaterial:HGC_G10-FR4</Vector>
+      hgcalMaterial:HGC_Kapton, materials:Silicon, materials:Titanium</Vector>
     <Vector name="LayerThickness" type="numeric" nEntries="6">
       5.060*mm, 1.300*mm, 0.125*mm, 0.300*mm, [WaferThickness120], 1.05*mm</Vector>
     <Vector name="LayerSizeOffset" type="numeric" nEntries="6">
@@ -1161,7 +1161,7 @@
       HGCalHESiliconSensitive, HGCalHEBasePlate</Vector>
     <Vector name="LayerMaterials" type="string" nEntries="6">
       hgcalMaterial:HGC_HEServices, hgcalMaterial:HGC_Hexaboard, materials:Epoxy,
-      hgcalMaterial:HGC_Kapton, materials:Silicon, hgcalMaterial:HGC_G10-FR4</Vector>
+      hgcalMaterial:HGC_Kapton, materials:Silicon, materials:Titanium</Vector>
     <Vector name="LayerThickness" type="numeric" nEntries="6">
       5.060*mm, 1.300*mm, 0.125*mm, 0.300*mm, [WaferThickness120], 1.05*mm</Vector>
     <Vector name="LayerSizeOffset" type="numeric" nEntries="6">
@@ -1273,7 +1273,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,
@@ -1311,7 +1311,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,
@@ -1349,7 +1349,7 @@
       HGCalHESiliconSensitive, HGCalHEBasePlate</Vector>
     <Vector name="LayerMaterials" type="string" nEntries="6">
       hgcalMaterial:HGC_HEServices, hgcalMaterial:HGC_Hexaboard, materials:Epoxy,
-      hgcalMaterial:HGC_Kapton, materials:Silicon, hgcalMaterial:HGC_G10-FR4</Vector>
+      hgcalMaterial:HGC_Kapton, materials:Silicon, materials:Titanium</Vector>
     <Vector name="LayerThickness" type="numeric" nEntries="6">
       5.060*mm, 1.300*mm, 0.125*mm, 0.300*mm, [WaferThickness300], 1.05*mm</Vector>
     <Vector name="LayerSizeOffset" type="numeric" nEntries="6">
@@ -1385,7 +1385,7 @@
       HGCalHESiliconSensitive, HGCalHEBasePlate</Vector>
     <Vector name="LayerMaterials" type="string" nEntries="6">
       hgcalMaterial:HGC_HEServices, hgcalMaterial:HGC_Hexaboard, materials:Epoxy,
-      hgcalMaterial:HGC_Kapton, materials:Silicon, hgcalMaterial:HGC_G10-FR4</Vector>
+      hgcalMaterial:HGC_Kapton, materials:Silicon, materials:Titanium</Vector>
     <Vector name="LayerThickness" type="numeric" nEntries="6">
       5.060*mm, 1.300*mm, 0.125*mm, 0.300*mm, [WaferThickness300], 1.05*mm</Vector>
     <Vector name="LayerSizeOffset" type="numeric" nEntries="6">

diff --git a/Geometry/HGCalCommonData/test/python/g4OverlapCheck_cfg.py b/Geometry/HGCalCommonData/test/python/g4OverlapCheck_cfg.py
@@ -60,6 +60,7 @@
 if hasattr(process,'MessageLogger'):
 #    process.MessageLogger.SimG4CoreGeometry=dict()
     process.MessageLogger.HGCalGeom=dict()
+    process.MessageLogger.EcalGeom=dict()
 
 from SimG4Core.PrintGeomInfo.g4TestGeometry_cfi import *
 process = checkOverlap(process)