Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MTD geometry: update tests to scenario D88, update DDFilteredView::parameters() accordingly #36970

Merged
merged 2 commits into from
Feb 18, 2022
Merged

MTD geometry: update tests to scenario D88, update DDFilteredView::parameters() accordingly #36970

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
97b1005
Move MTD geometry tests to scenario D88
fabiocos Feb 14, 2022
0a18925
Update DDFilteredView::parameters() to account for polycones in boole…
fabiocos Feb 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions DetectorDescription/DDCMS/src/DDFilteredView.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -541,11 +541,20 @@ const std::vector<double> DDFilteredView::parameters() const {
not dd4hep::isA<dd4hep::PseudoTrap>(currVol.solid())) {
const TGeoCompositeShape* shape = static_cast<const TGeoCompositeShape*>(currVol->GetShape());
const TGeoBoolNode* boolean = shape->GetBoolNode();
while (boolean->GetLeftShape()->IsA() != TGeoBBox::Class()) {
while (boolean->GetLeftShape()->IsA() == TGeoCompositeShape::Class()) {
boolean = static_cast<const TGeoCompositeShape*>(boolean->GetLeftShape())->GetBoolNode();
}
const TGeoBBox* box = static_cast<const TGeoBBox*>(boolean->GetLeftShape());
return {box->GetDX(), box->GetDY(), box->GetDZ()};
if (boolean->GetLeftShape()->IsA() == TGeoBBox::Class()) {
const TGeoBBox* box = static_cast<const TGeoBBox*>(boolean->GetLeftShape());
return {box->GetDX(), box->GetDY(), box->GetDZ()};
} else if (boolean->GetLeftShape()->IsA() == TGeoPcon::Class()) {
const TGeoPcon* pcon = static_cast<const TGeoPcon*>(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();
}
Expand Down
10 changes: 4 additions & 6 deletions Geometry/MTDCommonData/test/testMTDGeometry.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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(
Expand Down Expand Up @@ -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('')
Expand Down
10 changes: 4 additions & 6 deletions Geometry/MTDCommonData/test/testMTDinDD4hep.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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(
Expand Down Expand Up @@ -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('')
Expand Down
6 changes: 3 additions & 3 deletions Geometry/MTDCommonData/test/testMTDinDDD.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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(
Expand Down Expand Up @@ -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'),
Expand Down
10 changes: 4 additions & 6 deletions Geometry/MTDGeometryBuilder/test/dd4hep_mtd_cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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),
Expand Down Expand Up @@ -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('')
Expand Down
6 changes: 3 additions & 3 deletions Geometry/MTDGeometryBuilder/test/mtd_cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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),
Expand Down Expand Up @@ -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")

Expand Down
10 changes: 4 additions & 6 deletions Geometry/MTDNumberingBuilder/test/dd4hep_mtd_cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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),
Expand Down Expand Up @@ -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('')
Expand Down
6 changes: 3 additions & 3 deletions Geometry/MTDNumberingBuilder/test/mtd_cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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),
Expand Down Expand Up @@ -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")

Expand Down
6 changes: 3 additions & 3 deletions RecoMTD/DetLayers/test/mtd_cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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")

Expand Down Expand Up @@ -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")

Expand Down