Merge pull request #47848 from bsunanda/Phase2-hgx363G

Phase2-hgx363G Correct the DD4hep algorithm for the HGCaal passive elements

Author: cmsbuild

Geometry/HGCalCommonData/data/dd4hep/testHGCalV19.xml

@@ -8,17 +8,17 @@
     <Include ref="Geometry/CMSCommonData/data/rotations.xml"/>
     <Include ref="Geometry/CMSCommonData/data/extend/v2/cmsextent.xml"/>
     <Include ref="Geometry/CMSCommonData/data/cavernData/2021/v1/cavernData.xml"/>
-    <Include ref="Geometry/CMSCommonData/data/cms/2026/v5/cms.xml"/>
+    <Include ref="Geometry/CMSCommonData/data/cms/2030/v5/cms.xml"/>
     <Include ref="Geometry/CMSCommonData/data/cmsMother.xml"/>
     <Include ref="Geometry/CMSCommonData/data/eta3/etaMax.xml"/>
     <Include ref="Geometry/CMSCommonData/data/cmsTracker.xml"/>
-    <Include ref="Geometry/CMSCommonData/data/caloBase/2026/v8/caloBase.xml"/>
+    <Include ref="Geometry/CMSCommonData/data/caloBase/2030/v8/caloBase.xml"/>
     <Include ref="Geometry/CMSCommonData/data/cmsCalo.xml"/>
-    <Include ref="Geometry/CMSCommonData/data/muonBase/2026/v5/muonBase.xml"/>
+    <Include ref="Geometry/CMSCommonData/data/muonBase/2030/v5/muonBase.xml"/>
     <Include ref="Geometry/CMSCommonData/data/cmsMuon.xml"/>
     <Include ref="Geometry/CMSCommonData/data/mgnt.xml"/>
-    <Include ref="Geometry/CMSCommonData/data/beampipe/2026/v3/beampipe.xml"/>
-    <Include ref="Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml"/>
+    <Include ref="Geometry/CMSCommonData/data/beampipe/2030/v3/beampipe.xml"/>
+    <Include ref="Geometry/CMSCommonData/data/cmsBeam/2030/v1/cmsBeam.xml"/>
     <Include ref="Geometry/CMSCommonData/data/muonMB.xml"/>
     <Include ref="Geometry/CMSCommonData/data/muonMagnet.xml"/>
     <Include ref="Geometry/CMSCommonData/data/cavern/2021/v1/cavern.xml"/>
@@ -42,9 +42,9 @@
     <Include ref="Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackerProdCuts.xml"/>
     <Include ref="Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/pixelProdCuts.xml"/>
     <Include ref="Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml"/>
-    <Include ref="Geometry/EcalCommonData/data/eregalgo/2026/v2/eregalgo.xml"/>
-    <Include ref="Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml"/>
-    <Include ref="Geometry/EcalCommonData/data/ectkcablemat/2026/v2/ectkcablemat.xml"/>
+    <Include ref="Geometry/EcalCommonData/data/eregalgo/2030/v2/eregalgo.xml"/>
+    <Include ref="Geometry/EcalCommonData/data/ectkcable/2030/v1/ectkcable.xml"/>
+    <Include ref="Geometry/EcalCommonData/data/ectkcablemat/2030/v2/ectkcablemat.xml"/>
     <Include ref="Geometry/EcalCommonData/data/ebalgo.xml"/>
     <Include ref="Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml"/>
     <Include ref="Geometry/EcalCommonData/data/ebrot.xml"/>
@@ -73,22 +73,22 @@
     <Include ref="Geometry/MuonCommonData/data/mb3/2015/v2/mb3.xml"/>
     <Include ref="Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml"/>
     <Include ref="Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml"/>
-    <Include ref="Geometry/MuonCommonData/data/muonYoke/2026/v3/muonYoke.xml"/>
-    <Include ref="Geometry/MuonCommonData/data/mf/2026/v8/mf.xml"/>
+    <Include ref="Geometry/MuonCommonData/data/muonYoke/2030/v3/muonYoke.xml"/>
+    <Include ref="Geometry/MuonCommonData/data/mf/2030/v8/mf.xml"/>
     <Include ref="Geometry/MuonCommonData/data/csc/2021/v2/csc.xml"/>
-    <Include ref="Geometry/MuonCommonData/data/rpcf/2026/v3/rpcf.xml"/>
+    <Include ref="Geometry/MuonCommonData/data/rpcf/2030/v3/rpcf.xml"/>
     <Include ref="Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml"/>
     <Include ref="Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml"/>
     <Include ref="Geometry/MuonCommonData/data/gem21/TDR_Eta16/gem21.xml"/>
-    <Include ref="Geometry/MuonCommonData/data/mfshield/2026/v6/mfshield.xml"/>
+    <Include ref="Geometry/MuonCommonData/data/mfshield/2030/v6/mfshield.xml"/>
     <Include ref="Geometry/MuonCommonData/data/ge0/TDR_Dev/v4/ge0.xml"/>
-    <Include ref="Geometry/MuonCommonData/data/ge0shield/2026/v1/ge0shield.xml"/>
-    <Include ref="Geometry/ForwardCommonData/data/forwardshield/2026/v4/forwardshield.xml"/>
+    <Include ref="Geometry/MuonCommonData/data/ge0shield/2030/v1/ge0shield.xml"/>
+    <Include ref="Geometry/ForwardCommonData/data/forwardshield/2030/v4/forwardshield.xml"/>
     <Include ref="Geometry/ForwardCommonData/data/zdcmaterials/2021/v1/zdcmaterials.xml"/>
     <Include ref="Geometry/ForwardCommonData/data/lumimaterials.xml"/>
     <Include ref="Geometry/ForwardCommonData/data/zdcrotations.xml"/>
     <Include ref="Geometry/ForwardCommonData/data/lumirotations.xml"/>
-    <Include ref="Geometry/ForwardCommonData/data/zdc/2026/v1/zdc.xml"/>
+    <Include ref="Geometry/ForwardCommonData/data/zdc/2030/v1/zdc.xml"/>
     <Include ref="Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml"/>
     <Include ref="Geometry/ForwardCommonData/data/cmszdc.xml"/>
     <Include ref="Geometry/MTDCommonData/data/mtdMaterial/v3/mtdMaterial.xml"/>
@@ -102,21 +102,21 @@
     <Include ref="Geometry/HcalSimData/data/hf.xml"/>
     <Include ref="Geometry/HcalSimData/data/hfpmt.xml"/>
     <Include ref="Geometry/HcalSimData/data/hffibrebundle.xml"/>
-    <Include ref="Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml"/>
+    <Include ref="Geometry/HcalSimData/data/CaloUtil/2030/v2c/CaloUtil.xml"/>
     <Include ref="Geometry/HGCalSimData/data/hgcsensv17n.xml"/>
     <Include ref="Geometry/MuonSimData/data/PhaseII/v2/muonSens.xml"/>
     <Include ref="Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/dtSpecsFilter.xml"/>
     <Include ref="Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml"/>
     <Include ref="Geometry/CSCGeometryBuilder/data/cscSpecs.xml"/>
-    <Include ref="Geometry/RPCGeometryBuilder/data/2026/v1/RPCSpecs.xml"/>
+    <Include ref="Geometry/RPCGeometryBuilder/data/2030/v1/RPCSpecs.xml"/>
     <Include ref="Geometry/GEMGeometryBuilder/data/v12/GEMSpecsFilter.xml"/>
     <Include ref="Geometry/GEMGeometryBuilder/data/v12/GEMSpecs.xml"/>
     <Include ref="Geometry/ForwardSimData/data/zdcsens.xml"/>
     <Include ref="Geometry/MTDSimData/data/v2/mtdsens.xml"/>
-    <Include ref="Geometry/HcalSimData/data/HcalProdCuts/2026/v1/HcalProdCuts.xml"/>
+    <Include ref="Geometry/HcalSimData/data/HcalProdCuts/2030/v1/HcalProdCuts.xml"/>
     <Include ref="Geometry/EcalSimData/data/EcalProdCuts.xml"/>
     <Include ref="Geometry/HGCalSimData/data/hgcProdCutsv15.xml"/>
-    <Include ref="Geometry/MuonSimData/data/muonProdCuts/2026/v2/muonProdCuts.xml"/>
+    <Include ref="Geometry/MuonSimData/data/muonProdCuts/2030/v2/muonProdCuts.xml"/>
     <Include ref="Geometry/ForwardSimData/data/zdcProdCuts.xml"/>
     <Include ref="Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml"/>
     <Include ref="Geometry/MTDSimData/data/v2/mtdProdCuts.xml"/>

Geometry/HGCalCommonData/plugins/dd4hep/DDHGCalPassive.cc

@@ -118,6 +118,7 @@ struct HGCalPassive {
           ns.addSolidNS(ns.prepend(parentname), solid);
           dd4hep::Material matter = ns.material(moduleMaterial);
           dd4hep::Volume glogM = dd4hep::Volume(solid.name(), solid, matter);
+          ns.addVolumeNS(glogM);
 #ifdef EDM_ML_DEBUG
           edm::LogVerbatim("HGCalGeom") << "DDHGCalPassive: " << solid.name() << " extruded polygon made of "
                                         << matter.name() << " z|x|y|s (0) " << zw[0] << ":" << zx[0] << ":" << zy[0]
@@ -140,6 +141,7 @@ struct HGCalPassive {
               ns.addSolidNS(ns.prepend(layerName), solid);
               matter = ns.material(layerMaterials[i]);
               glogs[i] = dd4hep::Volume(solid.name(), solid, matter);
+              ns.addVolumeNS(glogs[i]);
 #ifdef EDM_ML_DEBUG
               edm::LogVerbatim("HGCalGeom")
                   << "DDHGCalPassive: Layer " << i << ":" << l << ":" << solid.name() << " extruded polygon made of "
@@ -155,7 +157,7 @@ struct HGCalPassive {
 #ifdef EDM_ML_DEBUG
             edm::LogVerbatim("HGCalGeom")
                 << "DDHGCalPassive: " << glogs[i].name() << " number " << copyNumber[i] << " positioned in "
-                << glogM.name() << " at (0, 0, " << cms::convert2mm(zi + 0.5 * layerThick[i]) << ") with no rotation";
+                << glogM.name() << " at (0,0," << cms::convert2mm(zi + 0.5 * layerThick[i]) << ") with no rotation";
 #endif
             ++copyNumber[i];
             zi += layerThick[i];