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.

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

New geometry scenarios #2304

Merged
merged 7 commits into from Feb 18, 2014
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
@@ -0,0 +1,4 @@
import FWCore.ParameterSet.Config as cms

from Geometry.CMSCommonData.cmsExtendedGeometry2023CFCalXML_cfi import *
from Geometry.TrackerNumberingBuilder.trackerNumberingSLHCGeometry_cfi import *
@@ -0,0 +1,4 @@
import FWCore.ParameterSet.Config as cms

from Geometry.CMSCommonData.cmsExtendedGeometry2023HGCalConceptXML_cfi import *
from Geometry.TrackerNumberingBuilder.trackerNumberingSLHCGeometry_cfi import *
@@ -0,0 +1,4 @@
import FWCore.ParameterSet.Config as cms

from Geometry.CMSCommonData.cmsExtendedGeometry2023SHCal4EtaXML_cfi import *
from Geometry.TrackerNumberingBuilder.trackerNumberingSLHCGeometry_cfi import *
130 changes: 130 additions & 0 deletions Geometry/CMSCommonData/python/cmsExtendedGeometry2023CFCalXML_cfi.py
@@ -0,0 +1,130 @@
import FWCore.ParameterSet.Config as cms

## 2015 + new phase 1 pixel detector + Tracker BarrelEndcap5Dv(described as a pixel detector before the detid migration)

XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource",
geomXMLFiles = cms.vstring('Geometry/CMSCommonData/data/materials.xml',
'Geometry/CMSCommonData/data/rotations.xml',
'Geometry/CMSCommonData/data/extend/cmsextent.xml',
'Geometry/CMSCommonData/data/PhaseI/cms.xml',
'Geometry/CMSCommonData/data/cmsMother.xml',
'Geometry/CMSCommonData/data/cmsTracker.xml',
'Geometry/CMSCommonData/data/eta4/etaMax.xml',
'Geometry/CMSCommonData/data/PhaseII/caloBase.xml',
'Geometry/CMSCommonData/data/cmsCalo.xml',
'Geometry/CMSCommonData/data/muonBase.xml',
'Geometry/CMSCommonData/data/cmsMuon.xml',
'Geometry/CMSCommonData/data/mgnt.xml',
'Geometry/CMSCommonData/data/PhaseI/beampipe.xml',
'Geometry/CMSCommonData/data/cmsBeam.xml',
'Geometry/CMSCommonData/data/muonMB.xml',
'Geometry/CMSCommonData/data/muonMagnet.xml',
'Geometry/CMSCommonData/data/cavern.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixfwdMaterials.xml',
'Geometry/TrackerCommonData/data/pixfwdCommon.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixfwdCylinder.xml',
'Geometry/TrackerCommonData/data/PhaseII/BarrelEndcap5D/pixfwd.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixfwdDisks.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixfwdInnerDisk1.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixfwdInnerDisk2.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixfwdInnerDisk3.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixfwdOuterDisk1.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixfwdOuterDisk2.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixfwdOuterDisk3.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixfwdblade1.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixfwdblade2.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixfwdblade3.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixbarmaterial.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixbarladder.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixbarladderfull0.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixbarladderfull1.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixbarladderfull2.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixbarladderfull3.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixbarlayer.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixbarlayer0.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixbarlayer1.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixbarlayer2.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixbarlayer3.xml',
'Geometry/TrackerCommonData/data/PhaseII/BarrelEndcap5D/pixbar.xml',
'Geometry/TrackerCommonData/data/trackermaterial.xml',
'Geometry/TrackerCommonData/data/PhaseII/BarrelEndcap5D/tracker.xml',
'Geometry/TrackerCommonData/data/trackerpixbar.xml',
'Geometry/TrackerCommonData/data/PhaseI/trackerpixfwd.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/ectkcable.xml',
'Geometry/HcalCommonData/data/hcalrotations.xml',
'Geometry/HcalCommonData/data/PhaseII/hcalalgo.xml',
'Geometry/HcalCommonData/data/hcalcablealgo.xml',
'Geometry/HcalCommonData/data/hcalbarrelalgo.xml',
'Geometry/HcalCommonData/data/PhaseII/hcalendcapalgo.xml',
'Geometry/HcalCommonData/data/hcalouteralgo.xml',
'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
'Geometry/HcalCommonData/data/PhaseII/hcalSimNumbering.xml',
'Geometry/HcalCommonData/data/PhaseII/hcalRecNumbering.xml',
'Geometry/HGCalCommonData/data/cfc.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/v2/mf.xml',
'Geometry/MuonCommonData/data/v2/rpcf.xml',
'Geometry/MuonCommonData/data/v2/gemf.xml',
'Geometry/MuonCommonData/data/v5/gem11.xml',
'Geometry/MuonCommonData/data/v2/csc.xml',
'Geometry/MuonCommonData/data/v2/mfshield.xml',
'Geometry/ForwardCommonData/data/forward.xml',
'Geometry/ForwardCommonData/data/v2/forwardshield.xml',
'Geometry/ForwardCommonData/data/brmrotations.xml',
'Geometry/ForwardCommonData/data/brm.xml',
'Geometry/ForwardCommonData/data/totemMaterials.xml',
'Geometry/ForwardCommonData/data/totemRotations.xml',
'Geometry/ForwardCommonData/data/totemt1.xml',
'Geometry/ForwardCommonData/data/totemt2.xml',
'Geometry/ForwardCommonData/data/ionpump.xml',
'Geometry/ForwardCommonData/data/castor.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/v2/muonGemNumbering.xml',
'Geometry/TrackerCommonData/data/PhaseII/BarrelEndcap5D/trackerStructureTopology.xml',
'Geometry/TrackerSimData/data/PhaseII/BarrelEndcap5D/trackersens.xml',
'Geometry/TrackerRecoData/data/PhaseII/BarrelEndcap5D/trackerRecoMaterial.xml',
'Geometry/EcalSimData/data/PhaseII/ecalsens.xml',
'Geometry/HcalCommonData/data/PhaseII/NoHE/hcalsenspmf.xml',
'Geometry/HcalSimData/data/hf.xml',
'Geometry/HcalSimData/data/hfpmt.xml',
'Geometry/HcalSimData/data/hffibrebundle.xml',
'Geometry/HcalSimData/data/CaloUtil.xml',
'Geometry/MuonSimData/data/v2/muonSens.xml',
'Geometry/DTGeometryBuilder/data/dtSpecsFilter.xml',
'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',
'Geometry/CSCGeometryBuilder/data/cscSpecs.xml',
'Geometry/RPCGeometryBuilder/data/RPCSpecs.xml',
'Geometry/GEMGeometryBuilder/data/v4/GEMSpecs.xml',
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Geometry/GEMGeometryBuilder/data/v4/GEMSpecs.xml does not exist anylonger. Can you change v4 to v5?

'Geometry/ForwardCommonData/data/brmsens.xml',
'Geometry/ForwardSimData/data/castorsens.xml',
'Geometry/ForwardSimData/data/zdcsens.xml',
'Geometry/HcalSimData/data/HcalProdCuts.xml',
'Geometry/EcalSimData/data/EcalProdCuts.xml',
'Geometry/TrackerSimData/data/PhaseII/BarrelEndcap5D/trackerProdCuts.xml',
'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
'Geometry/MuonSimData/data/v2/muonProdCuts.xml',
'Geometry/ForwardSimData/data/CastorProdCuts.xml',
'Geometry/ForwardSimData/data/zdcProdCuts.xml',
'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml',
'Geometry/CMSCommonData/data/FieldParameters.xml'),
rootNodeName = cms.string('cms:OCMS')
)


@@ -0,0 +1,138 @@
import FWCore.ParameterSet.Config as cms

## 2015 + new phase 1 pixel detector + Tracker BarrelEndcap5Dv(described as a pixel detector before the detid migration)

XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource",
geomXMLFiles = cms.vstring('Geometry/CMSCommonData/data/materials.xml',
'Geometry/CMSCommonData/data/rotations.xml',
'Geometry/CMSCommonData/data/extend/cmsextent.xml',
'Geometry/CMSCommonData/data/PhaseI/cms.xml',
'Geometry/CMSCommonData/data/cmsMother.xml',
'Geometry/CMSCommonData/data/cmsTracker.xml',
'Geometry/CMSCommonData/data/eta3/etaMax.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/PhaseI/beampipe.xml',
'Geometry/CMSCommonData/data/cmsBeam.xml',
'Geometry/CMSCommonData/data/muonMB.xml',
'Geometry/CMSCommonData/data/muonMagnet.xml',
'Geometry/CMSCommonData/data/cavern.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixfwdMaterials.xml',
'Geometry/TrackerCommonData/data/pixfwdCommon.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixfwdCylinder.xml',
'Geometry/TrackerCommonData/data/PhaseII/BarrelEndcap5D/pixfwd.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixfwdDisks.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixfwdInnerDisk1.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixfwdInnerDisk2.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixfwdInnerDisk3.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixfwdOuterDisk1.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixfwdOuterDisk2.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixfwdOuterDisk3.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixfwdblade1.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixfwdblade2.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixfwdblade3.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixbarmaterial.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixbarladder.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixbarladderfull0.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixbarladderfull1.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixbarladderfull2.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixbarladderfull3.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixbarlayer.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixbarlayer0.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixbarlayer1.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixbarlayer2.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixbarlayer3.xml',
'Geometry/TrackerCommonData/data/PhaseII/BarrelEndcap5D/pixbar.xml',
'Geometry/TrackerCommonData/data/trackermaterial.xml',
'Geometry/TrackerCommonData/data/PhaseII/BarrelEndcap5D/tracker.xml',
'Geometry/TrackerCommonData/data/trackerpixbar.xml',
'Geometry/TrackerCommonData/data/PhaseI/trackerpixfwd.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/ectkcable.xml',
'Geometry/HcalCommonData/data/hcalrotations.xml',
'Geometry/HcalCommonData/data/PhaseII/hcalalgo.xml',
'Geometry/HcalCommonData/data/hcalbarrelalgo.xml',
'Geometry/HcalCommonData/data/hcalcablealgo.xml',
'Geometry/HcalCommonData/data/hcalouteralgo.xml',
'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
'Geometry/HcalCommonData/data/PhaseII/NoHE/hcalSimNumbering.xml',
'Geometry/HcalCommonData/data/PhaseII/NoHE/hcalRecNumbering.xml',
'Geometry/HGCalCommonData/data/hgcal.xml',
'Geometry/HGCalCommonData/data/v2/hgcalEE.xml',
'Geometry/HGCalCommonData/data/v2/hgcalHEgem.xml',
'Geometry/HGCalCommonData/data/v2/hgcalHEsci.xml',
'Geometry/HGCalCommonData/data/v2/hgcalHEsil.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/v7/mf.xml',
'Geometry/MuonCommonData/data/v2/rpcf.xml',
'Geometry/MuonCommonData/data/v2/gemf.xml',
'Geometry/MuonCommonData/data/v5/gem11.xml',
'Geometry/MuonCommonData/data/v6/gem21.xml',
'Geometry/MuonCommonData/data/v2/csc.xml',
'Geometry/MuonCommonData/data/v7/mfshield.xml',
'Geometry/MuonCommonData/data/v7/me0.xml',
'Geometry/ForwardCommonData/data/forward.xml',
'Geometry/ForwardCommonData/data/v2/forwardshield.xml',
'Geometry/ForwardCommonData/data/brmrotations.xml',
'Geometry/ForwardCommonData/data/brm.xml',
'Geometry/ForwardCommonData/data/totemMaterials.xml',
'Geometry/ForwardCommonData/data/totemRotations.xml',
'Geometry/ForwardCommonData/data/totemt1.xml',
'Geometry/ForwardCommonData/data/totemt2.xml',
'Geometry/ForwardCommonData/data/ionpump.xml',
'Geometry/ForwardCommonData/data/castor.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/v7/muonNumbering.xml',
'Geometry/TrackerCommonData/data/PhaseII/BarrelEndcap5D/trackerStructureTopology.xml',
'Geometry/TrackerSimData/data/PhaseII/BarrelEndcap5D/trackersens.xml',
'Geometry/TrackerRecoData/data/PhaseII/BarrelEndcap5D/trackerRecoMaterial.xml',
'Geometry/EcalSimData/data/PhaseII/ecalsens.xml',
'Geometry/HcalCommonData/data/PhaseII/NoHE/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/hgcsens.xml',
'Geometry/HGCalSimData/data/hgccons.xml',
'Geometry/MuonSimData/data/v4/muonSens.xml',
'Geometry/DTGeometryBuilder/data/dtSpecsFilter.xml',
'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',
'Geometry/CSCGeometryBuilder/data/cscSpecs.xml',
'Geometry/RPCGeometryBuilder/data/RPCSpecs.xml',
'Geometry/GEMGeometryBuilder/data/v5/GEMSpecs.xml',
'Geometry/ForwardCommonData/data/brmsens.xml',
'Geometry/ForwardSimData/data/castorsens.xml',
'Geometry/ForwardSimData/data/zdcsens.xml',
'Geometry/HcalSimData/data/HcalProdCuts.xml',
'Geometry/EcalSimData/data/EcalProdCuts.xml',
'Geometry/HGCalSimData/data/hgcProdCuts.xml',
'Geometry/TrackerSimData/data/PhaseII/BarrelEndcap5D/trackerProdCuts.xml',
'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
'Geometry/MuonSimData/data/v2/muonProdCuts.xml',
'Geometry/ForwardSimData/data/CastorProdCuts.xml',
'Geometry/ForwardSimData/data/zdcProdCuts.xml',
'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml',
'Geometry/CMSCommonData/data/FieldParameters.xml'),
rootNodeName = cms.string('cms:OCMS')
)