Skip to content

Commit

Permalink
Merge pull request #6354 from boudoul/synch_xml
Browse files Browse the repository at this point in the history 
Synch xmls between 62XSLHC dev and 73X (upgrade phase1 and phase2 Tracker)
  • Loading branch information
@cmsbuild
cmsbuild committed Nov 12, 2014
2 parents 971dae8 + b3b4d9f commit b6387d3
Show file tree
Hide file tree
Showing 52 changed files with 10,323 additions and 32,729 deletions.
4 changes: 2 additions & 2 deletions ...hon/GeometryExtendedPhase2TkBEReco_cff.py → ...ryExtendedPhase2TkBE5DPixel10DReco_cff.py
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import FWCore.ParameterSet.Config as cms

# Ideal geometry, needed for transient ECAL alignement
from Configuration.Geometry.GeometryExtendedPhase2TkBE_cff import *
from Configuration.Geometry.GeometryExtendedPhase2TkBE5DPixel10D_cff import *



Expand Down Expand Up @@ -30,4 +30,4 @@
from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import *
from Geometry.EcalMapping.EcalMapping_cfi import *
from Geometry.EcalMapping.EcalMappingRecord_cfi import *

from Geometry.HcalCommonData.hcalRecNumberingInitialization_cfi import *
3 changes: 2 additions & 1 deletion ...thon/GeometryExtendedPhase2TkLB6PS_cff.py → ...ometryExtendedPhase2TkBE5DPixel10D_cff.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@
# Geometry master configuration
#
# Ideal geometry, needed for simulation
from Geometry.CMSCommonData.cmsExtendedGeometryPhase2TkLB6PSXML_cfi import *
from Geometry.CMSCommonData.cmsExtendedGeometryPhase2TkBE5DPixel10DXML_cfi import *
from Geometry.TrackerNumberingBuilder.trackerNumberingSLHCGeometry_cfi import *
from Geometry.HcalCommonData.hcalSimNumberingInitialization_cfi import *
8 changes: 0 additions & 8 deletions Configuration/Geometry/python/GeometryExtendedPhase2TkBE_cff.py
View file

This file was deleted.

33 changes: 0 additions & 33 deletions Configuration/Geometry/python/GeometryExtendedPhase2TkLB4LPS_2L2SReco_cff.py
View file

This file was deleted.

8 changes: 0 additions & 8 deletions Configuration/Geometry/python/GeometryExtendedPhase2TkLB4LPS_2L2S_cff.py
View file

This file was deleted.

33 changes: 0 additions & 33 deletions Configuration/Geometry/python/GeometryExtendedPhase2TkLB6PSReco_cff.py
View file

This file was deleted.

32 changes: 0 additions & 32 deletions Configuration/Geometry/python/GeometryExtendedPhaseIIPixelForwardReco_cff.py
View file

This file was deleted.

9 changes: 0 additions & 9 deletions Configuration/Geometry/python/GeometryExtendedPhaseIIPixelForward_cff.py
View file

This file was deleted.

153 changes: 153 additions & 0 deletions Geometry/CMSCommonData/python/cmsExtendedGeometryPhase2TkBE5DPixel10DXML_cfi.py
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,153 @@
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/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/PhaseII/Pixel10D/pixfwdMaterials.xml',
'Geometry/TrackerCommonData/data/pixfwdCommon.xml',
'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdCylinder.xml',
'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwd.xml',
'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdDisks.xml',
'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdInnerDisk1.xml',
'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdInnerDisk2.xml',
'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdInnerDisk3.xml',
'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdInnerDisk4.xml',
'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdInnerDisk5.xml',
'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdInnerDisk6.xml',
'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdInnerDisk7.xml',
# 'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdInnerDisk8.xml',
# 'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdInnerDisk9.xml',
# 'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdInnerDisk10.xml',
'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk1.xml',
'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk2.xml',
'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk3.xml',
'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk4.xml',
'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk5.xml',
'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk6.xml',
'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk7.xml',
'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk8.xml',
'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk9.xml',
'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk10.xml',
'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdblade1.xml',
'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdblade2.xml',
'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdblade3.xml',
'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdblade4.xml',
'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdblade5.xml',
'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdblade6.xml',
'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdblade7.xml',
'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdblade8.xml',
'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdblade9.xml',
'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdblade10.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/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/EcalCommonData/data/eefixed.xml',
'Geometry/EcalCommonData/data/eehier.xml',
'Geometry/EcalCommonData/data/eealgo.xml',
'Geometry/EcalCommonData/data/escon.xml',
'Geometry/EcalCommonData/data/esalgo.xml',
'Geometry/EcalCommonData/data/eeF.xml',
'Geometry/EcalCommonData/data/eeB.xml',
'Geometry/HcalCommonData/data/hcalrotations.xml',
'Geometry/HcalCommonData/data/hcalalgo.xml',
'Geometry/HcalCommonData/data/hcalbarrelalgo.xml',
'Geometry/HcalCommonData/data/hcalendcapalgo.xml',
'Geometry/HcalCommonData/data/hcalouteralgo.xml',
'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
'Geometry/HcalCommonData/data/Phase0/hcalSimNumbering.xml',
'Geometry/HcalCommonData/data/Phase0/hcalRecNumbering.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/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/muonNumbering.xml',
'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/trackerStructureTopology.xml',
'Geometry/TrackerSimData/data/PhaseII/Pixel10D/trackersens.xml',
'Geometry/TrackerRecoData/data/PhaseII/Pixel10D/trackerRecoMaterial.xml',
'Geometry/EcalSimData/data/ecalsens.xml',
'Geometry/HcalCommonData/data/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/muonSens.xml',
'Geometry/DTGeometryBuilder/data/dtSpecsFilter.xml',
'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',
'Geometry/CSCGeometryBuilder/data/cscSpecs.xml',
'Geometry/RPCGeometryBuilder/data/RPCSpecs.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/EcalSimData/data/ESProdCuts.xml',
'Geometry/TrackerSimData/data/PhaseII/Pixel10D/trackerProdCuts.xml',
'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
'Geometry/MuonSimData/data/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 comments on commit b6387d3

Please sign in to comment.