Merge pull request #38531 from bsunanda/Phase2-hgx316BBB

Phase2-hgx316BBB Investigate the differences between ddd and dd4hep versions in HGCal V17 geometry
cms-sw · Jul 3, 2022 · 9debe91 · 9debe91
2 parents d7b4b73 + 81fa51d
commit 9debe91
Show file tree

Hide file tree

Showing 9 changed files with 146 additions and 17 deletions.
diff --git a/Geometry/HGCalCommonData/data/dd4hep/cms-test-ddhgcalcell-algorithm.xml b/Geometry/HGCalCommonData/data/dd4hep/cms-test-ddhgcalcell-algorithm.xml
@@ -23,9 +23,9 @@
     <Include ref="Geometry/CMSCommonData/data/materials/2021/v1/materials.xml"/>
     <Include ref="Geometry/CMSCommonData/data/rotations.xml"/>
     <Include ref="Geometry/HGCalCommonData/test/cms.xml"/>
-    <Include ref="Geometry/HGCalCommonData/data/hgcalcell/v9/hgcal.xml"/>
-    <Include ref="Geometry/HGCalCommonData/data/hgcalcell/v9/hgcalcell.xml"/>
-    <Include ref="Geometry/HGCalCommonData/data/hgcalcell/v9/hgcalpos.xml"/>
+    <Include ref="Geometry/HGCalCommonData/data/hgcalcell/v17/hgcal.xml"/>
+    <Include ref="Geometry/HGCalCommonData/data/hgcalcell/v17/hgcalcell.xml"/>
+    <Include ref="Geometry/HGCalCommonData/data/hgcalcell/v17/hgcalpos.xml"/>
     <Include ref="Geometry/HGCalCommonData/data/dd4hep/world.xml"/>
   </IncludeSection>
 

diff --git a/Geometry/HGCalCommonData/data/hgcalcell/v17/hgcalpos.xml b/Geometry/HGCalCommonData/data/hgcalcell/v17/hgcalpos.xml
@@ -0,0 +1,131 @@
+<?xml version="1.0"?>
+<DDDefinition>
+
+<PosPartSection label="hgcalpos.xml">
+  <PosPart copyNumber="1">
+    <rParent name="cms:CMSE"/>
+    <rChild name="hgcalcell:HGCalEECellFull0Fine"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="cms:CMSE"/>
+    <rChild name="hgcalcell:HGCalEECellTrunc01Fine"/>
+    <Translation x="-4.5*cm" y="-1.5*cm" z="0*cm"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="cms:CMSE"/>
+    <rChild name="hgcalcell:HGCalEECellTrunc02Fine"/>
+    <Translation x="-3.0*cm" y="-1.5*cm" z="0*cm"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="cms:CMSE"/>
+    <rChild name="hgcalcell:HGCalEECellTrunc03Fine"/>
+    <Translation x="-1.5*cm" y="-1.5*cm" z="0*cm"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="cms:CMSE"/>
+    <rChild name="hgcalcell:HGCalEECellTrunc04Fine"/>
+    <Translation x="1.5*cm" y="-1.5*cm" z="0*cm"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="cms:CMSE"/>
+    <rChild name="hgcalcell:HGCalEECellTrunc05Fine"/>
+    <Translation x="3.0*cm" y="-1.5*cm" z="0*cm"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="cms:CMSE"/>
+    <rChild name="hgcalcell:HGCalEECellTrunc06Fine"/>
+    <Translation x="4.5*cm" y="-1.5*cm" z="0*cm"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="cms:CMSE"/>
+    <rChild name="hgcalcell:HGCalEECellExten01Fine"/>
+    <Translation x="-4.5*cm" y="-3.0*cm" z="0*cm"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="cms:CMSE"/>
+    <rChild name="hgcalcell:HGCalEECellExten02Fine"/>
+    <Translation x="-3.0*cm" y="-3.0*cm" z="0*cm"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="cms:CMSE"/>
+    <rChild name="hgcalcell:HGCalEECellExten03Fine"/>
+    <Translation x="-1.5*cm" y="-3.0*cm" z="0*cm"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="cms:CMSE"/>
+    <rChild name="hgcalcell:HGCalEECellExten04Fine"/>
+    <Translation x="1.5*cm" y="-3.0*cm" z="0*cm"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="cms:CMSE"/>
+    <rChild name="hgcalcell:HGCalEECellExten05Fine"/>
+    <Translation x="3.0*cm" y="-3.0*cm" z="0*cm"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="cms:CMSE"/>
+    <rChild name="hgcalcell:HGCalEECellExten06Fine"/>
+    <Translation x="4.5*cm" y="-3.0*cm" z="0*cm"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="cms:CMSE"/>
+    <rChild name="hgcalcell:HGCalEECellCorner01Fine"/>
+    <Translation x="-4.5*cm" y="1.5*cm" z="0*cm"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="cms:CMSE"/>
+    <rChild name="hgcalcell:HGCalEECellCorner02Fine"/>
+    <Translation x="-3.0*cm" y="1.5*cm" z="0*cm"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="cms:CMSE"/>
+    <rChild name="hgcalcell:HGCalEECellCorner03Fine"/>
+    <Translation x="-1.5*cm" y="1.5*cm" z="0*cm"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="cms:CMSE"/>
+    <rChild name="hgcalcell:HGCalEECellCorner04Fine"/>
+    <Translation x="1.5*cm" y="1.5*cm" z="0*cm"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="cms:CMSE"/>
+    <rChild name="hgcalcell:HGCalEECellCorner05Fine"/>
+    <Translation x="3.0*cm" y="1.5*cm" z="0*cm"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="cms:CMSE"/>
+    <rChild name="hgcalcell:HGCalEECellCorner06Fine"/>
+    <Translation x="4.5*cm" y="1.5*cm" z="0*cm"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="cms:CMSE"/>
+    <rChild name="hgcalcell:HGCalEECellCorner07Fine"/>
+    <Translation x="-4.5*cm" y="3.0*cm" z="0*cm"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="cms:CMSE"/>
+    <rChild name="hgcalcell:HGCalEECellCorner08Fine"/>
+    <Translation x="-3.0*cm" y="3.0*cm" z="0*cm"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="cms:CMSE"/>
+    <rChild name="hgcalcell:HGCalEECellCorner09Fine"/>
+    <Translation x="-1.5*cm" y="3.0*cm" z="0*cm"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="cms:CMSE"/>
+    <rChild name="hgcalcell:HGCalEECellCorner10Fine"/>
+    <Translation x="1.5*cm" y="3.0*cm" z="0*cm"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="cms:CMSE"/>
+    <rChild name="hgcalcell:HGCalEECellCorner11Fine"/>
+    <Translation x="3.0*cm" y="3.0*cm" z="0*cm"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="cms:CMSE"/>
+    <rChild name="hgcalcell:HGCalEECellCorner12Fine"/>
+    <Translation x="4.5*cm" y="3.0*cm" z="0*cm"/>
+  </PosPart>
+</PosPartSection>
+
+</DDDefinition>
diff --git a/Geometry/HGCalCommonData/plugins/DDHGCalSiliconRotatedModule.cc b/Geometry/HGCalCommonData/plugins/DDHGCalSiliconRotatedModule.cc
@@ -250,7 +250,7 @@ void DDHGCalSiliconRotatedModule::initialize(const DDNumericArguments& nArgs,
 #endif
   nameSpace_ = DDCurrentNamespace::ns();
 #ifdef EDM_ML_DEBUG
-  edm::LogVerbatim("HGCalGeom") << "DDHGCalSiliconRotatedModule: NameSpace " << nameSpace_;
+  edm::LogVerbatim("HGCalGeom") << "DDHGCalSiliconRotatedModule: NameSpace " << nameSpace_ << ":";
 #endif
   cassette_.setParameter(cassettes_, cassetteShift_);
 }
@@ -277,9 +277,6 @@ void DDHGCalSiliconRotatedModule::execute(DDCompactView& cpv) {
 }
 
 void DDHGCalSiliconRotatedModule::constructLayers(const DDLogicalPart& module, DDCompactView& cpv) {
-#ifdef EDM_ML_DEBUG
-  edm::LogVerbatim("HGCalGeom") << "DDHGCalSiliconRotatedModule: \t\tInside Layers";
-#endif
   double zi(zMinBlock_);
   int laymin(0);
   for (unsigned int i = 0; i < layers_.size(); i++) {

diff --git a/Geometry/HGCalCommonData/plugins/dd4hep/DDHGCalMixRotatedLayer.cc b/Geometry/HGCalCommonData/plugins/dd4hep/DDHGCalMixRotatedLayer.cc
@@ -419,7 +419,8 @@ struct HGCalMixRotatedLayer {
         glog.placeVolume(glog1, copy, tran);
 #ifdef EDM_ML_DEBUG
         edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedLayer: Position " << glog1.name() << " number " << copy
-                                      << " in " << glog.name() << " at (0, 0, " << cms::convert2mm(zpos)
+                                      << " in " << glog.name() << " at (" << cms::convert2mm(cshift.first) << ", "
+                                      << cms::convert2mm(cshift.second) << ", " << cms::convert2mm(zpos)
                                       << ") with no rotation";
 #endif
       }

diff --git a/Geometry/HGCalCommonData/plugins/dd4hep/DDHGCalSiliconRotatedModule.cc b/Geometry/HGCalCommonData/plugins/dd4hep/DDHGCalSiliconRotatedModule.cc
@@ -69,7 +69,7 @@ struct HGCalSiliconRotatedModule {
     edm::LogVerbatim("HGCalGeom") << "zStart " << cms::convert2mm(zMinBlock_) << " wafer width "
                                   << cms::convert2mm(waferSize_) << " separations " << cms::convert2mm(waferSepar_)
                                   << " sectors " << sectors_ << ":" << convertRadToDeg(alpha_) << ":" << cosAlpha_
-                                  << " rotation matrix " << rotstr_ << cassettes_ << " cassettes";
+                                  << " rotation matrix " << rotstr_ << " with " << cassettes_ << " cassettes";
 #endif
     waferFull_ = args.value<std::vector<std::string>>("WaferNamesFull");
     waferPart_ = args.value<std::vector<std::string>>("WaferNamesPartial");

diff --git a/Geometry/HGCalCommonData/plugins/dd4hep/DDHGCalWaferFullRotated.cc b/Geometry/HGCalCommonData/plugins/dd4hep/DDHGCalWaferFullRotated.cc
@@ -67,7 +67,7 @@ static long algorithm(dd4hep::Detector& /* description */, cms::DDParsingContext
   }
 #ifdef EDM_ML_DEBUG
   edm::LogVerbatim("HGCalGeom") << "DDHGCalWaferFullRotated: Cells/Wafer " << nCells << " Cell Type " << cellType
-                                << " # of cells " << cellNames.size();
+                                << " NameSpace " << ns.name() << " # of cells " << cellNames.size();
   std::ostringstream st2;
   for (unsigned int i = 0; i < cellOffset.size(); ++i)
     st2 << " [" << i << "] " << cellOffset[i];

diff --git a/Geometry/HGCalCommonData/python/testHGCalCellXML_cfi.py b/Geometry/HGCalCommonData/python/testHGCalCellXML_cfi.py
@@ -4,9 +4,9 @@
     geomXMLFiles = cms.vstring('Geometry/CMSCommonData/data/materials.xml',
         'Geometry/CMSCommonData/data/rotations.xml',
         'Geometry/HGCalCommonData/test/cms.xml',
-        'Geometry/HGCalCommonData/data/hgcalcell/v16/hgcal.xml',
-        'Geometry/HGCalCommonData/data/hgcalcell/v16/hgcalcell.xml',
-        'Geometry/HGCalCommonData/data/hgcalcell/v9/hgcalpos.xml'),
+        'Geometry/HGCalCommonData/data/hgcalcell/v17/hgcal.xml',
+        'Geometry/HGCalCommonData/data/hgcalcell/v17/hgcalcell.xml',
+        'Geometry/HGCalCommonData/data/hgcalcell/v17/hgcalpos.xml'),
     rootNodeName = cms.string('cms:OCMS')
 )
 

diff --git a/Geometry/HGCalCommonData/test/python/dumpExtendedHGCalGeometryDD4hep_cfg.py b/Geometry/HGCalCommonData/test/python/dumpExtendedHGCalGeometryDD4hep_cfg.py
@@ -13,12 +13,12 @@
     process.MessageLogger.HGCalGeom=dict()
 
 process.DDDetectorESProducer = cms.ESSource("DDDetectorESProducer",
-                                            confGeomXMLFiles = cms.FileInPath('Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D46.xml'),
+                                            confGeomXMLFiles = cms.FileInPath('Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D92.xml'),
                                             appendToDataLabel = cms.string('DDHGCal')
                                             )
 
 process.testDump = cms.EDAnalyzer("DDTestDumpFile",
-                                  outputFileName = cms.untracked.string('CMS2026D46DD4hep.root'),
+                                  outputFileName = cms.untracked.string('CMS2026D92DD4hep.root'),
                                   DDDetector = cms.ESInputTag('','DDHGCal')
                                   )
 

diff --git a/Geometry/HGCalCommonData/test/python/dumpExtendedHGCalGeometryDDD_cfg.py b/Geometry/HGCalCommonData/test/python/dumpExtendedHGCalGeometryDDD_cfg.py
@@ -4,7 +4,7 @@
 process = cms.Process('SIM',Phase2C9)
 
 process = cms.Process("GEODUMP")
-process.load("Configuration.Geometry.GeometryExtended2026D49_cff")
+process.load("Configuration.Geometry.GeometryExtended2026D92_cff")
 process.load('FWCore.MessageService.MessageLogger_cfi')
 
 if 'MessageLogger' in process.__dict__:
@@ -22,6 +22,6 @@
                             ))
 
 process.dump = cms.EDAnalyzer("DumpSimGeometry",
-                              outputFileName = cms.untracked.string('CMS2026D46DDD.root'))
+                              outputFileName = cms.untracked.string('CMS2026D92DDD.root'))
 
 process.p = cms.Path(process.dump)