diff --git a/DetectorDescription/DDCMS/src/DDFilteredView.cc b/DetectorDescription/DDCMS/src/DDFilteredView.cc index d656338ca47bb..a0cd77ee36d70 100644 --- a/DetectorDescription/DDCMS/src/DDFilteredView.cc +++ b/DetectorDescription/DDCMS/src/DDFilteredView.cc @@ -541,11 +541,20 @@ const std::vector DDFilteredView::parameters() const { not dd4hep::isA(currVol.solid())) { const TGeoCompositeShape* shape = static_cast(currVol->GetShape()); const TGeoBoolNode* boolean = shape->GetBoolNode(); - while (boolean->GetLeftShape()->IsA() != TGeoBBox::Class()) { + while (boolean->GetLeftShape()->IsA() == TGeoCompositeShape::Class()) { boolean = static_cast(boolean->GetLeftShape())->GetBoolNode(); } - const TGeoBBox* box = static_cast(boolean->GetLeftShape()); - return {box->GetDX(), box->GetDY(), box->GetDZ()}; + if (boolean->GetLeftShape()->IsA() == TGeoBBox::Class()) { + const TGeoBBox* box = static_cast(boolean->GetLeftShape()); + return {box->GetDX(), box->GetDY(), box->GetDZ()}; + } else if (boolean->GetLeftShape()->IsA() == TGeoPcon::Class()) { + const TGeoPcon* pcon = static_cast(boolean->GetLeftShape()); + double param[4]; + pcon->GetBoundingCylinder(param); + return {param[0], param[1], param[2], param[3]}; + } else { + throw cms::Exception("DDFilteredView") << "Unknown boolean solid component"; + } } else return currVol.solid().dimensions(); } diff --git a/Geometry/MTDCommonData/test/testMTDGeometry.py b/Geometry/MTDCommonData/test/testMTDGeometry.py index 7c97b8456bdcf..273faef0f3b30 100644 --- a/Geometry/MTDCommonData/test/testMTDGeometry.py +++ b/Geometry/MTDCommonData/test/testMTDGeometry.py @@ -1,9 +1,9 @@ import FWCore.ParameterSet.Config as cms -from Configuration.Eras.Era_Phase2C11I13M9_cff import Phase2C11I13M9 +from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9 from Configuration.ProcessModifiers.dd4hep_cff import dd4hep -process = cms.Process("MTDGeometryTest",Phase2C11I13M9,dd4hep) +process = cms.Process("MTDGeometryTest",Phase2C17I13M9,dd4hep) process.source = cms.Source("EmptySource") process.maxEvents = cms.untracked.PSet( @@ -47,10 +47,8 @@ ) ) -process.DDDetectorESProducer = cms.ESSource("DDDetectorESProducer", - confGeomXMLFiles = cms.FileInPath('Geometry/MTDCommonData/data/dd4hep/cms-mtdD76-geometry.xml'), - appendToDataLabel = cms.string('') - ) +process.load('Configuration.Geometry.GeometryDD4hep_cff') +process.DDDetectorESProducer.confGeomXMLFiles = cms.FileInPath("Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D88.xml") process.DDSpecParRegistryESProducer = cms.ESProducer("DDSpecParRegistryESProducer", appendToDataLabel = cms.string('') diff --git a/Geometry/MTDCommonData/test/testMTDinDD4hep.py b/Geometry/MTDCommonData/test/testMTDinDD4hep.py index a8a7e0f516da0..f51f8bdd6d5cd 100644 --- a/Geometry/MTDCommonData/test/testMTDinDD4hep.py +++ b/Geometry/MTDCommonData/test/testMTDinDD4hep.py @@ -1,9 +1,9 @@ import FWCore.ParameterSet.Config as cms -from Configuration.Eras.Era_Phase2C11I13M9_cff import Phase2C11I13M9 +from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9 from Configuration.ProcessModifiers.dd4hep_cff import dd4hep -process = cms.Process("CompareGeometryTest",Phase2C11I13M9,dd4hep) +process = cms.Process("CompareGeometryTest",Phase2C17I13M9,dd4hep) process.source = cms.Source("EmptySource") process.maxEvents = cms.untracked.PSet( @@ -50,10 +50,8 @@ threshold = cms.untracked.string('INFO') ) -process.DDDetectorESProducer = cms.ESSource("DDDetectorESProducer", - confGeomXMLFiles = cms.FileInPath('Geometry/MTDCommonData/data/dd4hep/cms-mtdD76-geometry.xml'), - appendToDataLabel = cms.string('') -) +process.load('Configuration.Geometry.GeometryDD4hep_cff') +process.DDDetectorESProducer.confGeomXMLFiles = cms.FileInPath("Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D88.xml") process.DDSpecParRegistryESProducer = cms.ESProducer("DDSpecParRegistryESProducer", appendToDataLabel = cms.string('') diff --git a/Geometry/MTDCommonData/test/testMTDinDDD.py b/Geometry/MTDCommonData/test/testMTDinDDD.py index 406c0fc9c8f8b..914948c2c8144 100644 --- a/Geometry/MTDCommonData/test/testMTDinDDD.py +++ b/Geometry/MTDCommonData/test/testMTDinDDD.py @@ -1,8 +1,8 @@ import FWCore.ParameterSet.Config as cms -from Configuration.Eras.Era_Phase2C11I13M9_cff import Phase2C11I13M9 +from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9 -process = cms.Process("CompareGeometryTest",Phase2C11I13M9) +process = cms.Process("CompareGeometryTest",Phase2C17I13M9) process.source = cms.Source("EmptySource") process.maxEvents = cms.untracked.PSet( @@ -49,7 +49,7 @@ threshold = cms.untracked.string('INFO') ) -process.load('Configuration.Geometry.GeometryExtended2026D76_cff') +process.load('Configuration.Geometry.GeometryExtended2026D88_cff') process.testBTL = cms.EDAnalyzer("TestMTDIdealGeometry", ddTopNodeName = cms.untracked.string('BarrelTimingLayer'), diff --git a/Geometry/MTDGeometryBuilder/test/dd4hep_mtd_cfg.py b/Geometry/MTDGeometryBuilder/test/dd4hep_mtd_cfg.py index 558fb0b88f2c3..66c94bf2329aa 100644 --- a/Geometry/MTDGeometryBuilder/test/dd4hep_mtd_cfg.py +++ b/Geometry/MTDGeometryBuilder/test/dd4hep_mtd_cfg.py @@ -1,9 +1,9 @@ import FWCore.ParameterSet.Config as cms -from Configuration.Eras.Era_Phase2C11I13M9_cff import Phase2C11I13M9 +from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9 from Configuration.ProcessModifiers.dd4hep_cff import dd4hep -process = cms.Process("GeometryTest",Phase2C11I13M9,dd4hep) +process = cms.Process("GeometryTest",Phase2C17I13M9,dd4hep) process.source = cms.Source("EmptyIOVSource", lastValue = cms.uint64(1), @@ -50,10 +50,8 @@ threshold = cms.untracked.string('INFO') ) -process.DDDetectorESProducer = cms.ESSource("DDDetectorESProducer", - confGeomXMLFiles = cms.FileInPath('Geometry/MTDCommonData/data/dd4hep/cms-mtdD76-geometry.xml'), - appendToDataLabel = cms.string('') -) +process.load('Configuration.Geometry.GeometryDD4hep_cff') +process.DDDetectorESProducer.confGeomXMLFiles = cms.FileInPath("Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D88.xml") process.DDCompactViewESProducer = cms.ESProducer("DDCompactViewESProducer", appendToDataLabel = cms.string('') diff --git a/Geometry/MTDGeometryBuilder/test/mtd_cfg.py b/Geometry/MTDGeometryBuilder/test/mtd_cfg.py index 0321885ed64b1..72a1c541c76c3 100644 --- a/Geometry/MTDGeometryBuilder/test/mtd_cfg.py +++ b/Geometry/MTDGeometryBuilder/test/mtd_cfg.py @@ -1,8 +1,8 @@ import FWCore.ParameterSet.Config as cms -from Configuration.Eras.Era_Phase2C11I13M9_cff import Phase2C11I13M9 +from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9 -process = cms.Process("GeometryTest",Phase2C11I13M9) +process = cms.Process("GeometryTest",Phase2C17I13M9) process.source = cms.Source("EmptyIOVSource", lastValue = cms.uint64(1), @@ -46,7 +46,7 @@ threshold = cms.untracked.string('INFO') ) -process.load("Configuration.Geometry.GeometryExtended2026D76_cff") +process.load("Configuration.Geometry.GeometryExtended2026D88_cff") process.load("Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff") diff --git a/Geometry/MTDNumberingBuilder/test/dd4hep_mtd_cfg.py b/Geometry/MTDNumberingBuilder/test/dd4hep_mtd_cfg.py index 0229563b15ad4..b1aa341af3084 100644 --- a/Geometry/MTDNumberingBuilder/test/dd4hep_mtd_cfg.py +++ b/Geometry/MTDNumberingBuilder/test/dd4hep_mtd_cfg.py @@ -1,9 +1,9 @@ import FWCore.ParameterSet.Config as cms -from Configuration.Eras.Era_Phase2C11I13M9_cff import Phase2C11I13M9 +from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9 from Configuration.ProcessModifiers.dd4hep_cff import dd4hep -process = cms.Process("GeometryTest",Phase2C11I13M9,dd4hep) +process = cms.Process("GeometryTest",Phase2C17I13M9,dd4hep) process.source = cms.Source("EmptyIOVSource", lastValue = cms.uint64(1), @@ -47,10 +47,8 @@ threshold = cms.untracked.string('INFO') ) -process.DDDetectorESProducer = cms.ESSource("DDDetectorESProducer", - confGeomXMLFiles = cms.FileInPath('Geometry/MTDCommonData/data/dd4hep/cms-mtdD76-geometry.xml'), - appendToDataLabel = cms.string('') -) +process.load('Configuration.Geometry.GeometryDD4hep_cff') +process.DDDetectorESProducer.confGeomXMLFiles = cms.FileInPath("Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D88.xml") process.DDCompactViewESProducer = cms.ESProducer("DDCompactViewESProducer", appendToDataLabel = cms.string('') diff --git a/Geometry/MTDNumberingBuilder/test/mtd_cfg.py b/Geometry/MTDNumberingBuilder/test/mtd_cfg.py index 254dab86ed389..55282962d6957 100644 --- a/Geometry/MTDNumberingBuilder/test/mtd_cfg.py +++ b/Geometry/MTDNumberingBuilder/test/mtd_cfg.py @@ -1,8 +1,8 @@ import FWCore.ParameterSet.Config as cms -from Configuration.Eras.Era_Phase2C11I13M9_cff import Phase2C11I13M9 +from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9 -process = cms.Process("GeometryTest",Phase2C11I13M9) +process = cms.Process("GeometryTest",Phase2C17I13M9) process.source = cms.Source("EmptyIOVSource", lastValue = cms.uint64(1), @@ -46,7 +46,7 @@ threshold = cms.untracked.string('INFO') ) -process.load("Configuration.Geometry.GeometryExtended2026D76_cff") +process.load("Configuration.Geometry.GeometryExtended2026D88_cff") process.load("Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff") diff --git a/RecoMTD/DetLayers/test/mtd_cfg.py b/RecoMTD/DetLayers/test/mtd_cfg.py index 4e948e77b92f3..8d8f2f5c21cd8 100644 --- a/RecoMTD/DetLayers/test/mtd_cfg.py +++ b/RecoMTD/DetLayers/test/mtd_cfg.py @@ -1,8 +1,8 @@ import FWCore.ParameterSet.Config as cms -from Configuration.Eras.Era_Phase2C11I13M9_cff import Phase2C11I13M9 +from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9 -process = cms.Process("GeometryTest",Phase2C11I13M9) +process = cms.Process("GeometryTest",Phase2C17I13M9) process.source = cms.Source("EmptySource") @@ -48,7 +48,7 @@ threshold = cms.untracked.string('INFO')) # Choose Tracker Geometry -process.load("Configuration.Geometry.GeometryExtended2026D76_cff") +process.load("Configuration.Geometry.GeometryExtended2026D88_cff") process.load("Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff")