Forgot to commit the python

cms-sw · Mar 30, 2016 · 0c7b20c · 0c7b20c
1 parent 0b1f0f8
commit 0c7b20c
Showing 1 changed file with 17 additions and 16 deletions.
diff --git a/Geometry/HGCalCommonData/python/testHGCalXML_cfi.py b/Geometry/HGCalCommonData/python/testHGCalXML_cfi.py
@@ -3,24 +3,24 @@
 ## 2015 + new phase 1 pixel detector
 
 XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource",
-    geomXMLFiles = cms.vstring('Geometry/CMSCommonData/data/materials.xml',
+    geomXMLFiles = cms.vstring('Geometry/CMSCommonData/data/PhaseII/materials.xml',
         'Geometry/CMSCommonData/data/rotations.xml',
         'Geometry/CMSCommonData/data/extend/cmsextent.xml',
         'Geometry/CMSCommonData/data/PhaseI/cms.xml',
-        'Geometry/CMSCommonData/data/eta3/etaMax.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/PhaseII/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/trackerParameters.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/trackerParameters.xml',
         'Geometry/TrackerCommonData/data/PhaseI/pixfwdMaterials.xml',
         'Geometry/TrackerCommonData/data/pixfwdCommon.xml',
         'Geometry/TrackerCommonData/data/PhaseI/pixfwdCylinder.xml', 
@@ -210,18 +210,19 @@
         'Geometry/EcalCommonData/data/PhaseII/escon.xml',
         'Geometry/EcalCommonData/data/PhaseII/esalgo.xml',
         'Geometry/HcalCommonData/data/hcalrotations.xml',
-        'Geometry/HcalCommonData/data/PhaseII/NoHE/hcalalgo.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/NoHE/hcalSimNumbering.xml',
-        'Geometry/HcalCommonData/data/PhaseII/NoHE/hcalRecNumbering.xml',
+        'Geometry/HcalCommonData/data/PhaseII/hcalSimNumbering.xml',
+        'Geometry/HcalCommonData/data/PhaseII/hcalRecNumberingRebuild.xml',
         'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
-        'Geometry/HGCalCommonData/data/v5/hgcal.xml',
-        'Geometry/HGCalCommonData/data/v5/hgcalEE.xml',
-        'Geometry/HGCalCommonData/data/v5/hgcalHEsil.xml',
-        'Geometry/HGCalCommonData/data/v5/hgcalHEsci.xml',
-        'Geometry/HGCalCommonData/data/v5/hgcalCons.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',
@@ -231,7 +232,7 @@
         'Geometry/MuonCommonData/data/PhaseII/mf.xml',
         'Geometry/MuonCommonData/data/PhaseII/rpcf.xml',
         'Geometry/MuonCommonData/data/v2/gemf.xml',
-        'Geometry/MuonCommonData/data/v4/gem11.xml',
+        'Geometry/MuonCommonData/data/v7/gem11.xml',
         'Geometry/MuonCommonData/data/v7/gem21.xml',
         'Geometry/MuonCommonData/data/v2/csc.xml',
         'Geometry/MuonCommonData/data/PhaseII/mfshield.xml',
@@ -258,19 +259,19 @@
         'Geometry/TrackerSimData/data/PhaseI/trackersens.xml',
         'Geometry/TrackerRecoData/data/PhaseI/trackerRecoMaterial.xml',
         'Geometry/EcalSimData/data/PhaseII/ecalsens.xml',
-        'Geometry/HcalCommonData/data/PhaseII/NoHE/hcalsenspmf.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/hgcsens.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/RPCSpecs.xml',
+        'Geometry/RPCGeometryBuilder/data/PhaseII/RPCSpecs.xml',
         'Geometry/GEMGeometryBuilder/data/v5/GEMSpecs.xml',
         'Geometry/ForwardCommonData/data/brmsens.xml',
         'Geometry/ForwardSimData/data/castorsens.xml',