diff --git a/Configuration/Geometry/python/GeometryExtended2017devReco_cff.py b/Configuration/Geometry/python/GeometryExtended2017devReco_cff.py
new file mode 100644
index 0000000000000..097cd15558d09
--- /dev/null
+++ b/Configuration/Geometry/python/GeometryExtended2017devReco_cff.py
@@ -0,0 +1,33 @@
+import FWCore.ParameterSet.Config as cms
+
+# Ideal geometry, needed for transient ECAL alignement
+from Configuration.Geometry.GeometryExtended2017dev_cff import *
+
+
+# Reconstruction geometry services
+#  Tracking Geometry
+#bah - well, this is not a cfi!
+from Geometry.CommonDetUnit.globalTrackingGeometry_cfi import *
+
+#Tracker
+from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import *
+from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *
+
+#Muon
+from Geometry.MuonNumbering.muonNumberingInitialization_cfi import *
+from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import *
+
+#  Alignment
+from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *
+from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import *
+from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import *
+trackerGeometry.applyAlignment = cms.bool(False)
+
+#  Calorimeters
+from Geometry.CaloEventSetup.CaloTopology_cfi import *
+from Geometry.CaloEventSetup.CaloGeometry_cff import *
+from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import *
+from Geometry.EcalMapping.EcalMapping_cfi import *
+from Geometry.EcalMapping.EcalMappingRecord_cfi import *
+from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import *
+from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import *
diff --git a/Configuration/Geometry/python/GeometryExtended2017dev_cff.py b/Configuration/Geometry/python/GeometryExtended2017dev_cff.py
new file mode 100644
index 0000000000000..8ce9396b0e9b3
--- /dev/null
+++ b/Configuration/Geometry/python/GeometryExtended2017dev_cff.py
@@ -0,0 +1,11 @@
+import FWCore.ParameterSet.Config as cms
+
+#
+# Geometry master configuration
+#
+# Ideal geometry, needed for simulation
+from Geometry.CMSCommonData.cmsExtendedGeometry2017devXML_cfi import *
+from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *
+from Geometry.HcalCommonData.hcalParameters_cfi      import *
+from Geometry.HcalCommonData.hcalDDDSimConstants_cfi import *
+
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2017XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2017XML_cfi.py
index 232311468ad25..0f09504fbfc22 100644
--- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2017XML_cfi.py
+++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2017XML_cfi.py
@@ -215,15 +215,14 @@
         'Geometry/EcalCommonData/data/eeB.xml',
         'Geometry/EcalCommonData/data/ectkcable.xml',
         'Geometry/HcalCommonData/data/hcalrotations.xml',
-        'Geometry/HcalCommonData/data/PhaseI/hcalalgo.xml',
-        'Geometry/HcalCommonData/data/hcalcablealgo.xml',
+        'Geometry/HcalCommonData/data/hcalalgo.xml',
         'Geometry/HcalCommonData/data/hcalbarrelalgo.xml',
-        'Geometry/HcalCommonData/data/PhaseI/hcalendcapalgo.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/Run2/hcalSimNumbering17.xml', 
-        'Geometry/HcalCommonData/data/Run2/hcalRecNumbering17.xml', 
+        'Geometry/HcalCommonData/data/Run2/hcalSimNumbering.xml', 
+        'Geometry/HcalCommonData/data/Run2/hcalRecNumbering.xml', 
         'Geometry/MuonCommonData/data/v1/mbCommon.xml',
         'Geometry/MuonCommonData/data/v1/mb1.xml',
         'Geometry/MuonCommonData/data/v1/mb2.xml',
@@ -256,7 +255,7 @@
         'Geometry/TrackerSimData/data/PhaseI/trackersens.xml',
         'Geometry/TrackerRecoData/data/PhaseI/trackerRecoMaterial.xml',
         'Geometry/EcalSimData/data/ecalsens.xml',
-        'Geometry/HcalCommonData/data/Phase0/hcalsenspmf.xml',
+        'Geometry/HcalCommonData/data/hcalsenspmf.xml',
         'Geometry/HcalSimData/data/hf.xml',
         'Geometry/HcalSimData/data/hfpmt.xml',
         'Geometry/HcalSimData/data/hffibrebundle.xml',
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2017devXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2017devXML_cfi.py
new file mode 100644
index 0000000000000..232311468ad25
--- /dev/null
+++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2017devXML_cfi.py
@@ -0,0 +1,285 @@
+import FWCore.ParameterSet.Config as cms
+
+## 2015 + new phase 1 pixel detector
+
+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/eta3/etaMax.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/PhaseI/trackerParameters.xml',
+        'Geometry/TrackerCommonData/data/PhaseI/pixfwdMaterials.xml',
+        'Geometry/TrackerCommonData/data/pixfwdCommon.xml',
+        'Geometry/TrackerCommonData/data/PhaseI/pixfwdCylinder.xml', 
+        'Geometry/TrackerCommonData/data/PhaseI/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/PhaseI/pixbar.xml', 
+        'Geometry/TrackerCommonData/data/tibtidcommonmaterial.xml',
+        'Geometry/TrackerCommonData/data/tibmaterial.xml',
+        'Geometry/TrackerCommonData/data/tibmodpar.xml',
+        'Geometry/TrackerCommonData/data/tibmodule0.xml',
+        'Geometry/TrackerCommonData/data/tibmodule0a.xml',
+        'Geometry/TrackerCommonData/data/tibmodule0b.xml',
+        'Geometry/TrackerCommonData/data/tibmodule2.xml',
+        'Geometry/TrackerCommonData/data/tibstringpar.xml',
+        'Geometry/TrackerCommonData/data/tibstring0ll.xml',
+        'Geometry/TrackerCommonData/data/tibstring0lr.xml',
+        'Geometry/TrackerCommonData/data/tibstring0ul.xml',
+        'Geometry/TrackerCommonData/data/tibstring0ur.xml',
+        'Geometry/TrackerCommonData/data/tibstring0.xml',
+        'Geometry/TrackerCommonData/data/tibstring1ll.xml',
+        'Geometry/TrackerCommonData/data/tibstring1lr.xml',
+        'Geometry/TrackerCommonData/data/tibstring1ul.xml',
+        'Geometry/TrackerCommonData/data/tibstring1ur.xml',
+        'Geometry/TrackerCommonData/data/tibstring1.xml',
+        'Geometry/TrackerCommonData/data/tibstring2ll.xml',
+        'Geometry/TrackerCommonData/data/tibstring2lr.xml',
+        'Geometry/TrackerCommonData/data/tibstring2ul.xml',
+        'Geometry/TrackerCommonData/data/tibstring2ur.xml',
+        'Geometry/TrackerCommonData/data/tibstring2.xml',
+        'Geometry/TrackerCommonData/data/tibstring3ll.xml',
+        'Geometry/TrackerCommonData/data/tibstring3lr.xml',
+        'Geometry/TrackerCommonData/data/tibstring3ul.xml',
+        'Geometry/TrackerCommonData/data/tibstring3ur.xml',
+        'Geometry/TrackerCommonData/data/tibstring3.xml',
+        'Geometry/TrackerCommonData/data/tiblayerpar.xml',
+        'Geometry/TrackerCommonData/data/tiblayer0.xml',
+        'Geometry/TrackerCommonData/data/tiblayer1.xml',
+        'Geometry/TrackerCommonData/data/tiblayer2.xml',
+        'Geometry/TrackerCommonData/data/tiblayer3.xml',
+        'Geometry/TrackerCommonData/data/tib.xml',
+        'Geometry/TrackerCommonData/data/tidmaterial.xml',
+        'Geometry/TrackerCommonData/data/tidmodpar.xml',
+        'Geometry/TrackerCommonData/data/tidmodule0.xml',
+        'Geometry/TrackerCommonData/data/tidmodule0r.xml',
+        'Geometry/TrackerCommonData/data/tidmodule0l.xml',
+        'Geometry/TrackerCommonData/data/tidmodule1.xml',
+        'Geometry/TrackerCommonData/data/tidmodule1r.xml',
+        'Geometry/TrackerCommonData/data/tidmodule1l.xml',
+        'Geometry/TrackerCommonData/data/tidmodule2.xml',
+        'Geometry/TrackerCommonData/data/tidringpar.xml',
+        'Geometry/TrackerCommonData/data/tidring0.xml',
+        'Geometry/TrackerCommonData/data/tidring0f.xml',
+        'Geometry/TrackerCommonData/data/tidring0b.xml',
+        'Geometry/TrackerCommonData/data/tidring1.xml',
+        'Geometry/TrackerCommonData/data/tidring1f.xml',
+        'Geometry/TrackerCommonData/data/tidring1b.xml',
+        'Geometry/TrackerCommonData/data/tidring2.xml',
+        'Geometry/TrackerCommonData/data/tid.xml',
+        'Geometry/TrackerCommonData/data/tidf.xml',
+        'Geometry/TrackerCommonData/data/tidb.xml',
+        'Geometry/TrackerCommonData/data/tibtidservices.xml',
+        'Geometry/TrackerCommonData/data/tibtidservicesf.xml',
+        'Geometry/TrackerCommonData/data/tibtidservicesb.xml',
+        'Geometry/TrackerCommonData/data/tobmaterial.xml',
+        'Geometry/TrackerCommonData/data/tobmodpar.xml',
+        'Geometry/TrackerCommonData/data/tobmodule0.xml',
+        'Geometry/TrackerCommonData/data/tobmodule2.xml',
+        'Geometry/TrackerCommonData/data/tobmodule4.xml',
+        'Geometry/TrackerCommonData/data/tobrodpar.xml',
+        'Geometry/TrackerCommonData/data/tobrod0c.xml',
+        'Geometry/TrackerCommonData/data/tobrod0l.xml',
+        'Geometry/TrackerCommonData/data/tobrod0h.xml',
+        'Geometry/TrackerCommonData/data/tobrod0.xml',
+        'Geometry/TrackerCommonData/data/tobrod1l.xml',
+        'Geometry/TrackerCommonData/data/tobrod1h.xml',
+        'Geometry/TrackerCommonData/data/tobrod1.xml',
+        'Geometry/TrackerCommonData/data/tobrod2c.xml',
+        'Geometry/TrackerCommonData/data/tobrod2l.xml',
+        'Geometry/TrackerCommonData/data/tobrod2h.xml',
+        'Geometry/TrackerCommonData/data/tobrod2.xml',
+        'Geometry/TrackerCommonData/data/tobrod3l.xml',
+        'Geometry/TrackerCommonData/data/tobrod3h.xml',
+        'Geometry/TrackerCommonData/data/tobrod3.xml',
+        'Geometry/TrackerCommonData/data/tobrod4c.xml',
+        'Geometry/TrackerCommonData/data/tobrod4l.xml',
+        'Geometry/TrackerCommonData/data/tobrod4h.xml',
+        'Geometry/TrackerCommonData/data/tobrod4.xml',
+        'Geometry/TrackerCommonData/data/tobrod5l.xml',
+        'Geometry/TrackerCommonData/data/tobrod5h.xml',
+        'Geometry/TrackerCommonData/data/tobrod5.xml',
+        'Geometry/TrackerCommonData/data/tob.xml',
+        'Geometry/TrackerCommonData/data/tecmaterial.xml',
+        'Geometry/TrackerCommonData/data/tecmodpar.xml',
+        'Geometry/TrackerCommonData/data/tecmodule0.xml',
+        'Geometry/TrackerCommonData/data/tecmodule0r.xml',
+        'Geometry/TrackerCommonData/data/tecmodule0s.xml',
+        'Geometry/TrackerCommonData/data/tecmodule1.xml',
+        'Geometry/TrackerCommonData/data/tecmodule1r.xml',
+        'Geometry/TrackerCommonData/data/tecmodule1s.xml',
+        'Geometry/TrackerCommonData/data/tecmodule2.xml',
+        'Geometry/TrackerCommonData/data/tecmodule3.xml',
+        'Geometry/TrackerCommonData/data/tecmodule4.xml',
+        'Geometry/TrackerCommonData/data/tecmodule4r.xml',
+        'Geometry/TrackerCommonData/data/tecmodule4s.xml',
+        'Geometry/TrackerCommonData/data/tecmodule5.xml',
+        'Geometry/TrackerCommonData/data/tecmodule6.xml',
+        'Geometry/TrackerCommonData/data/tecpetpar.xml',
+        'Geometry/TrackerCommonData/data/tecring0.xml',
+        'Geometry/TrackerCommonData/data/tecring1.xml',
+        'Geometry/TrackerCommonData/data/tecring2.xml',
+        'Geometry/TrackerCommonData/data/tecring3.xml',
+        'Geometry/TrackerCommonData/data/tecring4.xml',
+        'Geometry/TrackerCommonData/data/tecring5.xml',
+        'Geometry/TrackerCommonData/data/tecring6.xml',
+        'Geometry/TrackerCommonData/data/tecring0f.xml',
+        'Geometry/TrackerCommonData/data/tecring1f.xml',
+        'Geometry/TrackerCommonData/data/tecring2f.xml',
+        'Geometry/TrackerCommonData/data/tecring3f.xml',
+        'Geometry/TrackerCommonData/data/tecring4f.xml',
+        'Geometry/TrackerCommonData/data/tecring5f.xml',
+        'Geometry/TrackerCommonData/data/tecring6f.xml',
+        'Geometry/TrackerCommonData/data/tecring0b.xml',
+        'Geometry/TrackerCommonData/data/tecring1b.xml',
+        'Geometry/TrackerCommonData/data/tecring2b.xml',
+        'Geometry/TrackerCommonData/data/tecring3b.xml',
+        'Geometry/TrackerCommonData/data/tecring4b.xml',
+        'Geometry/TrackerCommonData/data/tecring5b.xml',
+        'Geometry/TrackerCommonData/data/tecring6b.xml',
+        'Geometry/TrackerCommonData/data/tecpetalf.xml',
+        'Geometry/TrackerCommonData/data/tecpetalb.xml',
+        'Geometry/TrackerCommonData/data/tecpetal0.xml',
+        'Geometry/TrackerCommonData/data/tecpetal0f.xml',
+        'Geometry/TrackerCommonData/data/tecpetal0b.xml',
+        'Geometry/TrackerCommonData/data/tecpetal3.xml',
+        'Geometry/TrackerCommonData/data/tecpetal3f.xml',
+        'Geometry/TrackerCommonData/data/tecpetal3b.xml',
+        'Geometry/TrackerCommonData/data/tecpetal6f.xml',
+        'Geometry/TrackerCommonData/data/tecpetal6b.xml',
+        'Geometry/TrackerCommonData/data/tecpetal8f.xml',
+        'Geometry/TrackerCommonData/data/tecpetal8b.xml',
+        'Geometry/TrackerCommonData/data/tecwheel.xml',
+        'Geometry/TrackerCommonData/data/tecwheela.xml',
+        'Geometry/TrackerCommonData/data/tecwheelb.xml',
+        'Geometry/TrackerCommonData/data/tecwheelc.xml',
+        'Geometry/TrackerCommonData/data/tecwheeld.xml',
+        'Geometry/TrackerCommonData/data/tecwheel6.xml',
+        'Geometry/TrackerCommonData/data/tecservices.xml',
+        'Geometry/TrackerCommonData/data/tecbackplate.xml',
+        'Geometry/TrackerCommonData/data/tec.xml',
+        'Geometry/TrackerCommonData/data/trackermaterial.xml',
+        'Geometry/TrackerCommonData/data/tracker.xml',
+        'Geometry/TrackerCommonData/data/trackerpixbar.xml',
+        'Geometry/TrackerCommonData/data/PhaseI/trackerpixfwd.xml',
+        'Geometry/TrackerCommonData/data/trackertibtidservices.xml',
+        'Geometry/TrackerCommonData/data/trackertib.xml',
+        'Geometry/TrackerCommonData/data/trackertid.xml',
+        'Geometry/TrackerCommonData/data/trackertob.xml',
+        'Geometry/TrackerCommonData/data/trackertec.xml',
+        'Geometry/TrackerCommonData/data/trackerbulkhead.xml',
+        'Geometry/TrackerCommonData/data/trackerother.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/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/EcalCommonData/data/ectkcable.xml',
+        'Geometry/HcalCommonData/data/hcalrotations.xml',
+        'Geometry/HcalCommonData/data/PhaseI/hcalalgo.xml',
+        'Geometry/HcalCommonData/data/hcalcablealgo.xml',
+        'Geometry/HcalCommonData/data/hcalbarrelalgo.xml',
+        'Geometry/HcalCommonData/data/PhaseI/hcalendcapalgo.xml',
+        'Geometry/HcalCommonData/data/hcalouteralgo.xml',
+        'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
+        'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
+        'Geometry/HcalCommonData/data/Run2/hcalSimNumbering17.xml', 
+        'Geometry/HcalCommonData/data/Run2/hcalRecNumbering17.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/PhaseI/trackerStructureTopology.xml',
+        'Geometry/TrackerSimData/data/PhaseI/trackersens.xml',
+        'Geometry/TrackerRecoData/data/PhaseI/trackerRecoMaterial.xml',
+        'Geometry/EcalSimData/data/ecalsens.xml',
+        'Geometry/HcalCommonData/data/Phase0/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/PhaseI/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')
+)
+
+