Merge pull request #9052 from ianna/tracker-reco-material-update-run2

Tracker Reco Material Update for Run 2
cms-sw · May 19, 2015 · ad32706 · ad32706
2 parents 10584ba + 90f558f
commit ad32706
Show file tree

Hide file tree

Showing 3 changed files with 684 additions and 2 deletions.
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2015devXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2015devXML_cfi.py
@@ -257,7 +257,7 @@
         'Geometry/MuonCommonData/data/v2/muonNumbering.xml',
         'Geometry/TrackerCommonData/data/trackerStructureTopology.xml',
         'Geometry/TrackerSimData/data/trackersens.xml',
-        'Geometry/TrackerRecoData/data/trackerRecoMaterial.xml',
+        'Geometry/TrackerRecoData/data/2015dev/trackerRecoMaterial.xml',
         'Geometry/EcalSimData/data/ecalsens.xml',
         'Geometry/HcalCommonData/data/hcalsenspmf.xml',
         'Geometry/HcalSimData/data/hf.xml',

diff --git a/Geometry/CMSCommonData/python/cmsIdealGeometry2015devXML_cfi.py b/Geometry/CMSCommonData/python/cmsIdealGeometry2015devXML_cfi.py
@@ -239,7 +239,7 @@
         'Geometry/MuonCommonData/data/v2/muonNumbering.xml',
         'Geometry/TrackerCommonData/data/trackerStructureTopology.xml',
         'Geometry/TrackerSimData/data/trackersens.xml',
-        'Geometry/TrackerRecoData/data/trackerRecoMaterial.xml',
+        'Geometry/TrackerRecoData/data/2015dev/trackerRecoMaterial.xml',
         'Geometry/EcalSimData/data/ecalsens.xml',
         'Geometry/HcalCommonData/data/hcalsenspmf.xml',
         'Geometry/HcalSimData/data/hf.xml',