-
Notifications
You must be signed in to change notification settings - Fork 4.3k
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.
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
Phase2 tracker: add T30 (geometry with more realistic TFPX) #36660
Changes from 12 commits
94c9047
feb0628
ea9ee8b
f52e4b4
a7560c0
9fb1c06
ff37045
b3071c0
4da5cae
9788c37
1ed09f9
a5774ac
69e625b
4f7f7a4
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,60 @@ | ||
import FWCore.ParameterSet.Config as cms | ||
|
||
# This config was generated automatically using generate2026Geometry.py | ||
# If you notice a mistake, please update the generating script, not just this config | ||
|
||
from Configuration.Geometry.GeometryDD4hepExtended2026D91_cff import * | ||
|
||
# tracker | ||
from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * | ||
from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * | ||
from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * | ||
from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * | ||
from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * | ||
from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * | ||
trackerGeometry.applyAlignment = cms.bool(False) | ||
|
||
# calo | ||
from Geometry.CaloEventSetup.HGCalV9Topology_cfi import * | ||
from Geometry.HGCalGeometry.HGCalGeometryESProducer_cfi import * | ||
from Geometry.CaloEventSetup.CaloTopology_cfi import * | ||
from Geometry.CaloEventSetup.CaloGeometryBuilder_cfi import * | ||
CaloGeometryBuilder = cms.ESProducer("CaloGeometryBuilder", | ||
SelectedCalos = cms.vstring("HCAL", | ||
"ZDC", | ||
"EcalBarrel", | ||
"TOWER", | ||
"HGCalEESensitive", | ||
"HGCalHESiliconSensitive", | ||
"HGCalHEScintillatorSensitive" | ||
) | ||
) | ||
from Geometry.EcalAlgo.EcalBarrelGeometry_cfi import * | ||
from Geometry.HcalEventSetup.HcalGeometry_cfi import * | ||
from Geometry.HcalEventSetup.CaloTowerGeometry_cfi import * | ||
from Geometry.HcalEventSetup.CaloTowerTopology_cfi import * | ||
from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import * | ||
from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import * | ||
from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import * | ||
from Geometry.EcalMapping.EcalMapping_cfi import * | ||
from Geometry.EcalMapping.EcalMappingRecord_cfi import * | ||
|
||
# muon | ||
from Geometry.MuonNumbering.muonNumberingInitialization_cfi import * | ||
from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import * | ||
from Geometry.GEMGeometryBuilder.gemGeometry_cfi import * | ||
from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import * | ||
from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * | ||
|
||
# forward | ||
from Geometry.ForwardGeometry.ForwardGeometry_cfi import * | ||
|
||
# timing | ||
from RecoMTD.DetLayers.mtdDetLayerGeometry_cfi import * | ||
from Geometry.MTDGeometryBuilder.mtdParameters_cff import * | ||
from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * | ||
from Geometry.MTDNumberingBuilder.mtdTopology_cfi import * | ||
from Geometry.MTDGeometryBuilder.mtdGeometry_cfi import * | ||
from Geometry.MTDGeometryBuilder.idealForDigiMTDGeometry_cff import * | ||
mtdGeometry.applyAlignment = cms.bool(False) | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
import FWCore.ParameterSet.Config as cms | ||
|
||
# This config was generated automatically using generate2026Geometry.py | ||
# If you notice a mistake, please update the generating script, not just this config | ||
|
||
from Configuration.Geometry.GeometryDD4hep_cff import * | ||
DDDetectorESProducer.confGeomXMLFiles = cms.FileInPath("Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D91.xml") | ||
|
||
from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import * | ||
from Geometry.EcalCommonData.ecalSimulationParameters_cff import * | ||
from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * | ||
from Geometry.HGCalCommonData.hgcalV15ParametersInitialization_cfi import * | ||
from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import * | ||
from Geometry.MuonNumbering.muonGeometryConstants_cff import * | ||
from Geometry.MuonNumbering.muonOffsetESProducer_cff import * | ||
from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,60 @@ | ||
import FWCore.ParameterSet.Config as cms | ||
|
||
# This config was generated automatically using generate2026Geometry.py | ||
# If you notice a mistake, please update the generating script, not just this config | ||
|
||
from Configuration.Geometry.GeometryExtended2026D91_cff import * | ||
|
||
# tracker | ||
from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * | ||
from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * | ||
from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * | ||
from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * | ||
from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * | ||
from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * | ||
trackerGeometry.applyAlignment = cms.bool(False) | ||
|
||
# calo | ||
from Geometry.CaloEventSetup.HGCalV9Topology_cfi import * | ||
from Geometry.HGCalGeometry.HGCalGeometryESProducer_cfi import * | ||
from Geometry.CaloEventSetup.CaloTopology_cfi import * | ||
from Geometry.CaloEventSetup.CaloGeometryBuilder_cfi import * | ||
CaloGeometryBuilder = cms.ESProducer("CaloGeometryBuilder", | ||
SelectedCalos = cms.vstring("HCAL", | ||
"ZDC", | ||
"EcalBarrel", | ||
"TOWER", | ||
"HGCalEESensitive", | ||
"HGCalHESiliconSensitive", | ||
"HGCalHEScintillatorSensitive" | ||
) | ||
) | ||
from Geometry.EcalAlgo.EcalBarrelGeometry_cfi import * | ||
from Geometry.HcalEventSetup.HcalGeometry_cfi import * | ||
from Geometry.HcalEventSetup.CaloTowerGeometry_cfi import * | ||
from Geometry.HcalEventSetup.CaloTowerTopology_cfi import * | ||
from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import * | ||
from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import * | ||
from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import * | ||
from Geometry.EcalMapping.EcalMapping_cfi import * | ||
from Geometry.EcalMapping.EcalMappingRecord_cfi import * | ||
|
||
# muon | ||
from Geometry.MuonNumbering.muonNumberingInitialization_cfi import * | ||
from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import * | ||
from Geometry.GEMGeometryBuilder.gemGeometry_cfi import * | ||
from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import * | ||
from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * | ||
|
||
# forward | ||
from Geometry.ForwardGeometry.ForwardGeometry_cfi import * | ||
|
||
# timing | ||
from RecoMTD.DetLayers.mtdDetLayerGeometry_cfi import * | ||
from Geometry.MTDGeometryBuilder.mtdParameters_cff import * | ||
from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * | ||
from Geometry.MTDNumberingBuilder.mtdTopology_cfi import * | ||
from Geometry.MTDGeometryBuilder.mtdGeometry_cfi import * | ||
from Geometry.MTDGeometryBuilder.idealForDigiMTDGeometry_cff import * | ||
mtdGeometry.applyAlignment = cms.bool(False) | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
import FWCore.ParameterSet.Config as cms | ||
|
||
# This config was generated automatically using generate2026Geometry.py | ||
# If you notice a mistake, please update the generating script, not just this config | ||
|
||
from Geometry.CMSCommonData.cmsExtendedGeometry2026D91XML_cfi import * | ||
from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import * | ||
from Geometry.EcalCommonData.ecalSimulationParameters_cff import * | ||
from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * | ||
from Geometry.HGCalCommonData.hgcalV15ParametersInitialization_cfi import * | ||
from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import * | ||
from Geometry.MuonNumbering.muonGeometryConstants_cff import * | ||
from Geometry.MuonNumbering.muonOffsetESProducer_cff import * | ||
from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -69,4 +69,5 @@ | |
'Extended2026D88' : 'Extended2026D88,Extended2026D88Reco', | ||
'Extended2026D89' : 'Extended2026D89,Extended2026D89Reco', | ||
'Extended2026D90' : 'Extended2026D90,Extended2026D90Reco', | ||
'Extended2026D91' : 'Extended2026D91,Extended2026D91Reco', | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Thanks @mmusich on this point. I'm not sure. We are trying to focus on ones that uses for relvals at the moment, D77/D86/D88. I think we can leave as it is for a moment until we can make the first complete DD4hep Phase-2 workflows. |
||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The era is not done properly here. D91 uses C17, so the era should be
Phase2C17I13M9
. https://github.com/cms-sw/cmssw/blob/master/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py#L1583-L1589There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I've addressed the comment here: #36931.
BTW @adewit the new D91 geometry is not documented in https://github.com/cms-sw/cmssw/blob/master/Configuration/Geometry/README.md, is it intended?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks @mmusich - the lack of documentation is not intentional. Can we add it in #36931?
In the list of tracker versions:
T30: Phase2 tilted tracker, exploratory geometry *only to be used in D91 for now*. Outer Tracker (v8.0.1): based on v8.0.0 with updated TB2S spacing. Inner Tracker (v6.4.0): based on v6.1.5 but TFPX with more realistic module positions
And at the end of the list of geometries:
D91 = T30+C17+M10+I15+O9+F6
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
sure. Done in 2ae9367