From 8cebe8ac79c42206caeeb66ab68201e68f9d6ccb Mon Sep 17 00:00:00 2001 From: Ianna Osborne Date: Thu, 4 Oct 2012 09:08:58 +0000 Subject: [PATCH] --- yaml --- r: 120886 b: "refs/heads/CMSSW_7_0_X" c: 0b1b14fea02561961f53bbfd4ac8ae9c12faf4eb h: "refs/heads/CMSSW_7_0_X" v: v3 --- [refs] | 2 +- .../cmsExtendedGeometryPostLS1XML_cfi.py | 10 +-- .../cmsExtendedGeometryPostLS2XML_cfi.py | 74 ++++++++++--------- 3 files changed, 44 insertions(+), 42 deletions(-) diff --git a/[refs] b/[refs] index c5aa4774b327c..b0e4cf571d8aa 100644 --- a/[refs] +++ b/[refs] @@ -2,4 +2,4 @@ "refs/heads/hi_d20131223": d7335b053d7fe03e98f9f59af6a20004362628e8 refs/heads/gh-pages: a3d9046c56a3ca3dc64ad63f7295276c81ac876a "refs/heads/analysis_53X_01": 3019419e9784b2b092fc6b5c503b2e0177cbe926 -"refs/heads/CMSSW_7_0_X": 5651169e756d5f9c0f8de440e7b380531188f3d9 +"refs/heads/CMSSW_7_0_X": 0b1b14fea02561961f53bbfd4ac8ae9c12faf4eb diff --git a/trunk/Geometry/CMSCommonData/python/cmsExtendedGeometryPostLS1XML_cfi.py b/trunk/Geometry/CMSCommonData/python/cmsExtendedGeometryPostLS1XML_cfi.py index 81011bcee8c55..3ec93fb538298 100644 --- a/trunk/Geometry/CMSCommonData/python/cmsExtendedGeometryPostLS1XML_cfi.py +++ b/trunk/Geometry/CMSCommonData/python/cmsExtendedGeometryPostLS1XML_cfi.py @@ -214,11 +214,11 @@ 'Geometry/HcalCommonData/data/hcalouteralgo.xml', 'Geometry/HcalCommonData/data/hcalforwardalgo.xml', 'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml', - 'Geometry/MuonCommonData/data/mbCommon.xml', - 'Geometry/MuonCommonData/data/mb1.xml', - 'Geometry/MuonCommonData/data/mb2.xml', - 'Geometry/MuonCommonData/data/mb3.xml', - 'Geometry/MuonCommonData/data/mb4.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', diff --git a/trunk/Geometry/CMSCommonData/python/cmsExtendedGeometryPostLS2XML_cfi.py b/trunk/Geometry/CMSCommonData/python/cmsExtendedGeometryPostLS2XML_cfi.py index 76c427348131a..d74533adee2b4 100644 --- a/trunk/Geometry/CMSCommonData/python/cmsExtendedGeometryPostLS2XML_cfi.py +++ b/trunk/Geometry/CMSCommonData/python/cmsExtendedGeometryPostLS2XML_cfi.py @@ -1,10 +1,10 @@ import FWCore.ParameterSet.Config as cms XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource", - geomXMLFiles = cms.vstring('Geometry/CMSCommonData/data/materials.xml', + geomXMLFiles = cms.vstring('SLHCUpgradeSimulations/Geometry/data/PhaseI/materials.xml', 'Geometry/CMSCommonData/data/rotations.xml', 'Geometry/CMSCommonData/data/extend/cmsextent.xml', - 'Geometry/CMSCommonData/data/cms.xml', + 'SLHCUpgradeSimulations/Geometry/data/PhaseI/cms.xml', 'Geometry/CMSCommonData/data/cmsMother.xml', 'Geometry/CMSCommonData/data/cmsTracker.xml', 'Geometry/CMSCommonData/data/caloBase.xml', @@ -17,30 +17,32 @@ 'Geometry/CMSCommonData/data/muonMB.xml', 'Geometry/CMSCommonData/data/muonMagnet.xml', 'Geometry/CMSCommonData/data/cavern.xml', - 'Geometry/TrackerCommonData/data/pixfwdMaterials.xml', + 'SLHCUpgradeSimulations/Geometry/data/PhaseI/pixfwdMaterials.xml', 'Geometry/TrackerCommonData/data/pixfwdCommon.xml', - 'Geometry/TrackerCommonData/data/pixfwdPlaq.xml', - 'Geometry/TrackerCommonData/data/pixfwdPlaq1x2.xml', - 'Geometry/TrackerCommonData/data/pixfwdPlaq1x5.xml', - 'Geometry/TrackerCommonData/data/pixfwdPlaq2x3.xml', - 'Geometry/TrackerCommonData/data/pixfwdPlaq2x4.xml', - 'Geometry/TrackerCommonData/data/pixfwdPlaq2x5.xml', - 'Geometry/TrackerCommonData/data/pixfwdPanelBase.xml', - 'Geometry/TrackerCommonData/data/pixfwdPanel.xml', - 'Geometry/TrackerCommonData/data/pixfwdBlade.xml', - 'Geometry/TrackerCommonData/data/pixfwdNipple.xml', - 'Geometry/TrackerCommonData/data/pixfwdDisk.xml', - 'Geometry/TrackerCommonData/data/pixfwdCylinder.xml', - 'Geometry/TrackerCommonData/data/pixfwd.xml', - 'Geometry/TrackerCommonData/data/pixbarmaterial.xml', - 'Geometry/TrackerCommonData/data/pixbarladder.xml', - 'Geometry/TrackerCommonData/data/pixbarladderfull.xml', - 'Geometry/TrackerCommonData/data/pixbarladderhalf.xml', - 'Geometry/TrackerCommonData/data/pixbarlayer.xml', - 'Geometry/TrackerCommonData/data/pixbarlayer0.xml', - 'Geometry/TrackerCommonData/data/pixbarlayer1.xml', - 'Geometry/TrackerCommonData/data/pixbarlayer2.xml', - 'Geometry/TrackerCommonData/data/pixbar.xml', + 'SLHCUpgradeSimulations/Geometry/data/PhaseI/pixfwdCylinder.xml', + 'SLHCUpgradeSimulations/Geometry/data/PhaseI/pixfwd.xml', + 'SLHCUpgradeSimulations/Geometry/data/PhaseI/pixfwdDisks.xml', + 'SLHCUpgradeSimulations/Geometry/data/PhaseI/pixfwdInnerDisk1.xml', + 'SLHCUpgradeSimulations/Geometry/data/PhaseI/pixfwdInnerDisk2.xml', + 'SLHCUpgradeSimulations/Geometry/data/PhaseI/pixfwdInnerDisk3.xml', + 'SLHCUpgradeSimulations/Geometry/data/PhaseI/pixfwdOuterDisk1.xml', + 'SLHCUpgradeSimulations/Geometry/data/PhaseI/pixfwdOuterDisk2.xml', + 'SLHCUpgradeSimulations/Geometry/data/PhaseI/pixfwdOuterDisk3.xml', + 'SLHCUpgradeSimulations/Geometry/data/PhaseI/pixfwdblade1.xml', + 'SLHCUpgradeSimulations/Geometry/data/PhaseI/pixfwdblade2.xml', + 'SLHCUpgradeSimulations/Geometry/data/PhaseI/pixfwdblade3.xml', + 'SLHCUpgradeSimulations/Geometry/data/PhaseI/pixbarmaterial.xml', + 'SLHCUpgradeSimulations/Geometry/data/PhaseI/pixbarladder.xml', + 'SLHCUpgradeSimulations/Geometry/data/PhaseI/pixbarladderfull0.xml', + 'SLHCUpgradeSimulations/Geometry/data/PhaseI/pixbarladderfull1.xml', + 'SLHCUpgradeSimulations/Geometry/data/PhaseI/pixbarladderfull2.xml', + 'SLHCUpgradeSimulations/Geometry/data/PhaseI/pixbarladderfull3.xml', + 'SLHCUpgradeSimulations/Geometry/data/PhaseI/pixbarlayer.xml', + 'SLHCUpgradeSimulations/Geometry/data/PhaseI/pixbarlayer0.xml', + 'SLHCUpgradeSimulations/Geometry/data/PhaseI/pixbarlayer1.xml', + 'SLHCUpgradeSimulations/Geometry/data/PhaseI/pixbarlayer2.xml', + 'SLHCUpgradeSimulations/Geometry/data/PhaseI/pixbarlayer3.xml', + 'SLHCUpgradeSimulations/Geometry/data/PhaseI/pixbar.xml', 'Geometry/TrackerCommonData/data/tibtidcommonmaterial.xml', 'Geometry/TrackerCommonData/data/tibmaterial.xml', 'Geometry/TrackerCommonData/data/tibmodpar.xml', @@ -187,7 +189,7 @@ 'Geometry/TrackerCommonData/data/trackermaterial.xml', 'Geometry/TrackerCommonData/data/tracker.xml', 'Geometry/TrackerCommonData/data/trackerpixbar.xml', - 'Geometry/TrackerCommonData/data/trackerpixfwd.xml', + 'SLHCUpgradeSimulations/Geometry/data/PhaseI/trackerpixfwd.xml', 'Geometry/TrackerCommonData/data/trackertibtidservices.xml', 'Geometry/TrackerCommonData/data/trackertib.xml', 'Geometry/TrackerCommonData/data/trackertid.xml', @@ -214,12 +216,12 @@ 'Geometry/HcalCommonData/data/hcalouteralgo.xml', 'Geometry/HcalCommonData/data/hcalforwardalgo.xml', 'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml', - 'Geometry/MuonCommonData/data/mbCommon.xml', - 'Geometry/MuonCommonData/data/mb1.xml', - 'Geometry/MuonCommonData/data/mb2.xml', - 'Geometry/MuonCommonData/data/mb3.xml', - 'Geometry/MuonCommonData/data/mb4.xml', - 'Geometry/MuonCommonData/data/muonYoke.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', @@ -242,9 +244,9 @@ 'Geometry/ForwardCommonData/data/zdclumi.xml', 'Geometry/ForwardCommonData/data/cmszdc.xml')+cms.vstring( 'Geometry/MuonCommonData/data/muonNumbering.xml', - 'Geometry/TrackerCommonData/data/trackerStructureTopology.xml', - 'Geometry/TrackerSimData/data/trackersens.xml', - 'Geometry/TrackerRecoData/data/trackerRecoMaterial.xml', + 'SLHCUpgradeSimulations/Geometry/data/PhaseI/trackerStructureTopology.xml', + 'SLHCUpgradeSimulations/Geometry/data/PhaseI/trackersens.xml', + 'SLHCUpgradeSimulations/Geometry/data/PhaseI/trackerRecoMaterial.xml', 'Geometry/EcalSimData/data/ecalsens.xml', 'Geometry/HcalCommonData/data/hcalsenspmf.xml', 'Geometry/HcalSimData/data/hf.xml', @@ -262,7 +264,7 @@ 'Geometry/HcalSimData/data/HcalProdCuts.xml', 'Geometry/EcalSimData/data/EcalProdCuts.xml', 'Geometry/EcalSimData/data/ESProdCuts.xml', - 'Geometry/TrackerSimData/data/trackerProdCuts.xml', + 'SLHCUpgradeSimulations/Geometry/data/PhaseI/trackerProdCuts.xml', 'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml', 'Geometry/MuonSimData/data/muonProdCuts.xml', 'Geometry/ForwardSimData/data/CastorProdCuts.xml',