-
Notifications
You must be signed in to change notification settings - Fork 4.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #15871 from boudoul/Pixel4021_v3
Phase2 Tracker Tilted + V4021 Pixels : Geometry and WFs up to Local Reco - Rebase
- Loading branch information
Showing
44 changed files
with
72,435 additions
and
22 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
48 changes: 48 additions & 0 deletions
48
Configuration/Geometry/python/GeometryExtended2023D4Reco_cff.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| import FWCore.ParameterSet.Config as cms | ||
|
|
||
| # This config was generated automatically using generate2023Geometry.py | ||
| # If you notice a mistake, please update the generating script, not just this config | ||
|
|
||
| from Configuration.Geometry.GeometryExtended2023D4_cff import * | ||
|
|
||
| # tracker | ||
| from Geometry.CommonDetUnit.globalTrackingGeometry_cfi import * | ||
| from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * | ||
| from Geometry.TrackerGeometryBuilder.trackerParameters_cfi import * | ||
| from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * | ||
| from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * | ||
| trackerGeometry.applyAlignment = cms.bool(False) | ||
|
|
||
| # calo | ||
| from Geometry.CaloEventSetup.HGCalV6Topology_cfi import * | ||
| from Geometry.HGCalGeometry.HGCalV6GeometryESProducer_cfi import * | ||
| from Geometry.CaloEventSetup.CaloTopology_cfi import * | ||
| from Geometry.CaloEventSetup.CaloGeometryBuilder_cfi import * | ||
| CaloGeometryBuilder = cms.ESProducer("CaloGeometryBuilder", | ||
| SelectedCalos = cms.vstring("HCAL" , | ||
| "ZDC" , | ||
| "CASTOR" , | ||
| "EcalBarrel" , | ||
| "TOWER" ) | ||
| ) | ||
| 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.GEMGeometryBuilder.me0Geometry_cfi import * | ||
| from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import * | ||
| from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * | ||
|
|
||
| # forward | ||
| from Geometry.ForwardGeometry.ForwardGeometry_cfi import * | ||
|
|
11 changes: 11 additions & 0 deletions
11
Configuration/Geometry/python/GeometryExtended2023D4_cff.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| import FWCore.ParameterSet.Config as cms | ||
|
|
||
| # This config was generated automatically using generate2023Geometry.py | ||
| # If you notice a mistake, please update the generating script, not just this config | ||
|
|
||
| from Geometry.CMSCommonData.cmsExtendedGeometry2023D4XML_cfi import * | ||
| from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import * | ||
| from Geometry.HcalCommonData.hcalParameters_cfi import * | ||
| from Geometry.HcalCommonData.hcalDDDSimConstants_cfi import * | ||
| from Geometry.HGCalCommonData.hgcalV6ParametersInitialization_cfi import * | ||
| from Geometry.HGCalCommonData.hgcalV6NumberingInitialization_cfi import * |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
120 changes: 120 additions & 0 deletions
120
Geometry/CMSCommonData/python/cmsExtendedGeometry2023D4XML_cfi.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,120 @@ | ||
| import FWCore.ParameterSet.Config as cms | ||
|
|
||
| # This config was generated automatically using generate2023Geometry.py | ||
| # If you notice a mistake, please update the generating script, not just this config | ||
|
|
||
| XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource", | ||
| geomXMLFiles = cms.vstring( | ||
| 'Geometry/CMSCommonData/data/PhaseII/materials.xml', | ||
| 'Geometry/CMSCommonData/data/rotations.xml', | ||
| 'Geometry/CMSCommonData/data/extend/cmsextent.xml', | ||
| 'Geometry/CMSCommonData/data/PostLS2/cms.xml', | ||
| 'Geometry/CMSCommonData/data/eta3/etaMax.xml', | ||
| 'Geometry/CMSCommonData/data/cmsMother.xml', | ||
| 'Geometry/CMSCommonData/data/cmsTracker.xml', | ||
| 'Geometry/CMSCommonData/data/PhaseII/caloBase.xml', | ||
| 'Geometry/CMSCommonData/data/cmsCalo.xml', | ||
| 'Geometry/CMSCommonData/data/PhaseII/muonBase.xml', | ||
| 'Geometry/CMSCommonData/data/cmsMuon.xml', | ||
| 'Geometry/CMSCommonData/data/mgnt.xml', | ||
| 'Geometry/CMSCommonData/data/PostLS2/beampipe.xml', | ||
| 'Geometry/CMSCommonData/data/PostLS2/cmsBeam.xml', | ||
| 'Geometry/CMSCommonData/data/muonMB.xml', | ||
| 'Geometry/CMSCommonData/data/muonMagnet.xml', | ||
| 'Geometry/CMSCommonData/data/cavern.xml', | ||
| 'Geometry/TrackerCommonData/data/PhaseII/trackerParameters.xml', | ||
| 'Geometry/TrackerCommonData/data/pixfwdCommon.xml', | ||
| 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4021/pixfwdMaterials.xml', | ||
| 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4021/pixfwdCylinder.xml', | ||
| 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4021/pixfwd.xml', | ||
| 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4021/pixbar.xml', | ||
| 'Geometry/TrackerCommonData/data/trackermaterial.xml', | ||
| 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4021/tracker.xml', | ||
| 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4021/pixel.xml', | ||
| 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4021/trackerbar.xml', | ||
| 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4021/trackerfwd.xml', | ||
| 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4021/trackerStructureTopology.xml', | ||
| 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4021/pixelStructureTopology.xml', | ||
| 'Geometry/TrackerSimData/data/PhaseII/TiltedTracker4021/trackersens.xml', | ||
| 'Geometry/TrackerSimData/data/PhaseII/TiltedTracker4021/pixelsens.xml', | ||
| 'Geometry/TrackerRecoData/data/PhaseII/TiltedTracker4021/trackerRecoMaterial.xml', | ||
| 'Geometry/TrackerRecoData/data/PhaseII/TiltedTracker4021/pixelRecoMaterial.xml', | ||
| 'Geometry/TrackerSimData/data/PhaseII/TiltedTracker4021/trackerProdCuts.xml', | ||
| 'Geometry/TrackerSimData/data/PhaseII/TiltedTracker4021/pixelProdCuts.xml', | ||
| 'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml', | ||
| 'Geometry/EcalCommonData/data/ectkcable.xml', | ||
| 'Geometry/EcalCommonData/data/PhaseII/eregalgo.xml', | ||
| 'Geometry/EcalCommonData/data/ebalgo.xml', | ||
| 'Geometry/EcalCommonData/data/ebcon.xml', | ||
| 'Geometry/EcalCommonData/data/ebrot.xml', | ||
| 'Geometry/EcalCommonData/data/eecon.xml', | ||
| 'Geometry/EcalCommonData/data/PhaseII/escon.xml', | ||
| 'Geometry/EcalCommonData/data/PhaseII/esalgo.xml', | ||
| 'Geometry/HcalCommonData/data/hcalrotations.xml', | ||
| 'Geometry/HcalCommonData/data/PhaseII/HGCal/hcalalgo.xml', | ||
| 'Geometry/HcalCommonData/data/hcalbarrelalgo.xml', | ||
| 'Geometry/HcalCommonData/data/PhaseII/HGCal/hcalendcapalgo.xml', | ||
| 'Geometry/HcalCommonData/data/hcalouteralgo.xml', | ||
| 'Geometry/HcalCommonData/data/hcalforwardalgo.xml', | ||
| 'Geometry/HcalCommonData/data/PhaseII/hcalSimNumbering.xml', | ||
| 'Geometry/HcalCommonData/data/PhaseII/HGCal/hcalRecNumberingRebuild.xml', | ||
| 'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml', | ||
| 'Geometry/HGCalCommonData/data/v7/hgcal.xml', | ||
| 'Geometry/HGCalCommonData/data/v7/hgcalEE.xml', | ||
| 'Geometry/HGCalCommonData/data/v7/hgcalHEsil.xml', | ||
| 'Geometry/HGCalCommonData/data/v7/hgcalwafer.xml', | ||
| 'Geometry/HGCalCommonData/data/v7/hgcalCons.xml', | ||
| 'Geometry/MuonCommonData/data/v1/mbCommon.xml', | ||
| 'Geometry/MuonCommonData/data/v1/mb1.xml', | ||
| 'Geometry/MuonCommonData/data/v1/mb2.xml', | ||
| 'Geometry/MuonCommonData/data/v1/mb3.xml', | ||
| 'Geometry/MuonCommonData/data/v1/mb4.xml', | ||
| 'Geometry/MuonCommonData/data/design/muonYoke.xml', | ||
| 'Geometry/MuonCommonData/data/PhaseII/mf.xml', | ||
| 'Geometry/MuonCommonData/data/PhaseII/rpcf.xml', | ||
| 'Geometry/MuonCommonData/data/PhaseII/gemf.xml', | ||
| 'Geometry/MuonCommonData/data/PhaseII/TDR_BaseLine/gem11.xml', | ||
| 'Geometry/MuonCommonData/data/PhaseII/TDR_BaseLine/gem21.xml', | ||
| 'Geometry/MuonCommonData/data/v2/csc.xml', | ||
| 'Geometry/MuonCommonData/data/PhaseII/mfshield.xml', | ||
| 'Geometry/MuonCommonData/data/PhaseII/TDR_BaseLine/me0.xml', | ||
| 'Geometry/ForwardCommonData/data/v2/forwardshield.xml', | ||
| 'Geometry/ForwardCommonData/data/brmrotations.xml', | ||
| 'Geometry/ForwardCommonData/data/PostLS2/brm.xml', | ||
| 'Geometry/ForwardCommonData/data/zdcmaterials.xml', | ||
| 'Geometry/ForwardCommonData/data/lumimaterials.xml', | ||
| 'Geometry/ForwardCommonData/data/zdcrotations.xml', | ||
| 'Geometry/ForwardCommonData/data/lumirotations.xml', | ||
| 'Geometry/ForwardCommonData/data/zdc.xml', | ||
| 'Geometry/ForwardCommonData/data/zdclumi.xml', | ||
| 'Geometry/ForwardCommonData/data/cmszdc.xml', | ||
| )+ | ||
| cms.vstring( | ||
| 'Geometry/MuonCommonData/data/PhaseII/muonNumbering.xml', | ||
| 'Geometry/EcalSimData/data/PhaseII/ecalsens.xml', | ||
| 'Geometry/HcalCommonData/data/PhaseII/HGCal/hcalsenspmf.xml', | ||
| 'Geometry/HcalSimData/data/hf.xml', | ||
| 'Geometry/HcalSimData/data/hfpmt.xml', | ||
| 'Geometry/HcalSimData/data/hffibrebundle.xml', | ||
| 'Geometry/HcalSimData/data/CaloUtil.xml', | ||
| 'Geometry/HGCalSimData/data/hgcsensv6.xml', | ||
| 'Geometry/HGCalSimData/data/hgccons.xml', | ||
| 'Geometry/HGCalSimData/data/hgcProdCuts.xml', | ||
| 'Geometry/MuonSimData/data/PhaseII/muonSens.xml', | ||
| 'Geometry/DTGeometryBuilder/data/dtSpecsFilter.xml', | ||
| 'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml', | ||
| 'Geometry/CSCGeometryBuilder/data/cscSpecs.xml', | ||
| 'Geometry/RPCGeometryBuilder/data/PhaseII/RPCSpecs.xml', | ||
| 'Geometry/GEMGeometryBuilder/data/GEMSpecsFilter.xml', | ||
| 'Geometry/GEMGeometryBuilder/data/v5/GEMSpecs.xml', | ||
| 'Geometry/ForwardCommonData/data/brmsens.xml', | ||
| 'Geometry/ForwardSimData/data/zdcsens.xml', | ||
| 'Geometry/HcalSimData/data/HcalProdCuts.xml', | ||
| 'Geometry/EcalSimData/data/EcalProdCuts.xml', | ||
| 'Geometry/MuonSimData/data/PhaseII/muonProdCuts.xml', | ||
| 'Geometry/ForwardSimData/data/zdcProdCuts.xml', | ||
| 'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml', | ||
| 'Geometry/CMSCommonData/data/FieldParameters.xml', | ||
| ), | ||
| rootNodeName = cms.string('cms:OCMS') | ||
| ) |
Oops, something went wrong.