diff --git a/Configuration/Geometry/python/GeometryExtended2015MuonGEMDevReco_cff.py b/Configuration/Geometry/python/GeometryExtended2015MuonGEMDevReco_cff.py
new file mode 100644
index 0000000000000..fce3784df228e
--- /dev/null
+++ b/Configuration/Geometry/python/GeometryExtended2015MuonGEMDevReco_cff.py
@@ -0,0 +1,9 @@
+import FWCore.ParameterSet.Config as cms
+
+# Ideal geometry, needed for transient ECAL alignement
+from Configuration.Geometry.GeometryExtended2015MuonGEMDev_cff import *
+from Configuration.Geometry.GeometryReco_cff import *
+
+from Geometry.GEMGeometryBuilder.gemGeometry_cfi import *
+from Geometry.GEMGeometryBuilder.me0Geometry_cfi import *
+from Geometry.RPCGeometryBuilder.rpcGeometry_cfi import *
diff --git a/Configuration/Geometry/python/GeometryExtended2015MuonGEMDev_cff.py b/Configuration/Geometry/python/GeometryExtended2015MuonGEMDev_cff.py
new file mode 100644
index 0000000000000..9f9f6fe9b0225
--- /dev/null
+++ b/Configuration/Geometry/python/GeometryExtended2015MuonGEMDev_cff.py
@@ -0,0 +1,9 @@
+import FWCore.ParameterSet.Config as cms
+
+#
+# Geometry master configuration
+#
+# Ideal geometry, needed for simulation
+from Geometry.CMSCommonData.cmsExtendedGeometry2015MuonGEMDevXML_cfi import *
+from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *
+
diff --git a/Fireworks/Geometry/python/dumpRecoGeometry_cfg.py b/Fireworks/Geometry/python/dumpRecoGeometry_cfg.py
index 1350295037743..a6841aa6c9ff1 100644
--- a/Fireworks/Geometry/python/dumpRecoGeometry_cfg.py
+++ b/Fireworks/Geometry/python/dumpRecoGeometry_cfg.py
@@ -71,7 +71,12 @@ def recoGeoLoad(score):
# Automatic addition of the customisation function from SLHCUpgradeSimulations.Configuration.combinedCustoms
#from SLHCUpgradeSimulations.Configuration.combinedCustoms import cust_2023Muon
#call to customisation function cust_2023Muon imported from SLHCUpgradeSimulations.Configuration.combinedCustoms
- # process = cust_2023Muon(process)
+ #process = cust_2023Muon(process)
+
+ elif score == "GEMDev":
+ from Configuration.AlCa.autoCond import autoCond
+ process.GlobalTag.globaltag = autoCond['mc']
+ process.load('Configuration.Geometry.GeometryExtended2015MuonGEMDevReco_cff')
elif score == "SLHCDB": # orig dumpFWRecoSLHCGeometry_cfg.py
process.GlobalTag.globaltag = 'DESIGN42_V17::All'
diff --git a/Geometry/CMSCommonData/data/PhaseII/cms.xml b/Geometry/CMSCommonData/data/PhaseII/cms.xml
new file mode 100644
index 0000000000000..523845b9a6a9a
--- /dev/null
+++ b/Geometry/CMSCommonData/data/PhaseII/cms.xml
@@ -0,0 +1,117 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Geometry/CMSCommonData/data/PhaseII/muonBase.xml b/Geometry/CMSCommonData/data/PhaseII/muonBase.xml
new file mode 100644
index 0000000000000..c04581e2c2c4c
--- /dev/null
+++ b/Geometry/CMSCommonData/data/PhaseII/muonBase.xml
@@ -0,0 +1,79 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2015MuonGEMDevXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2015MuonGEMDevXML_cfi.py
new file mode 100644
index 0000000000000..6cf62eb1b9af3
--- /dev/null
+++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2015MuonGEMDevXML_cfi.py
@@ -0,0 +1,311 @@
+import FWCore.ParameterSet.Config as cms
+
+## Everything that is currently in the PostLS1 geometry (rpc,csc,beampipe)
+## with full Muon Upgrade for Phase-2 :: ME0, GE1/1, GE2/1, RE3/1, RE4/1
+
+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/cms.xml', # Phase-1 Muon
+ 'Geometry/CMSCommonData/data/PhaseII/cms.xml', # Phase-2 Muon
+ 'Geometry/CMSCommonData/data/eta3/etaMax.xml', # Phase-2 Muon
+ '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', # Phase-1 Muon
+ 'Geometry/CMSCommonData/data/PhaseII/muonBase.xml', # Phase-2 Muon
+ '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/trackerParameters.xml',
+ 'Geometry/TrackerCommonData/data/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/Pilot/pixfwdPilotBlade.xml',
+ 'Geometry/TrackerCommonData/data/Pilot/pixfwdDisk.xml',
+ 'Geometry/TrackerCommonData/data/Pilot/pixfwdCylinder.xml',
+ 'Geometry/TrackerCommonData/data/Pilot/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',
+ '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/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/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',
+
+ # --- Muon ------------------------------------------------------------
+ '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', # Phase-1 Muon
+ # 'Geometry/MuonCommonData/data/v2/rpcf.xml', # Phase-1 Muon
+ 'Geometry/MuonCommonData/data/PhaseII/mf.xml', # Phase-2 Muon
+ 'Geometry/MuonCommonData/data/PhaseII/rpcf.xml', # Phase-2 Muon
+ 'Geometry/MuonCommonData/data/v2/gemf.xml', # Phase-2 Muon
+ 'Geometry/MuonCommonData/data/v7/gem11.xml', # Phase-2 Muon
+ 'Geometry/MuonCommonData/data/v6/gem21.xml', # Phase-2 Muon
+ 'Geometry/MuonCommonData/data/v2/csc.xml',
+ # 'Geometry/MuonCommonData/data/v2/mfshield.xml', # Phase-1 Muon
+ 'Geometry/MuonCommonData/data/PhaseII/mfshield.xml', # Phase-2 Muon
+ 'Geometry/MuonCommonData/data/PhaseII/me0.xml', # Phase-2 Muon
+ # --- Muon ------------------------------------------------------------
+
+ '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/ForwardCommonData/data/bhm.xml',
+ ##'Geometry/ForwardCommonData/data/bhmsens.xml', #not needed for geomtery purposes only
+ 'Geometry/ForwardCommonData/data/pltbcm.xml',
+ 'Geometry/ForwardCommonData/data/bcm1f.xml',
+ 'Geometry/ForwardSimData/data/bcm1fsens.xml',
+ 'Geometry/ForwardCommonData/data/plt.xml',
+ 'Geometry/TrackerCommonData/data/trackerStructureTopology.xml',
+ 'Geometry/TrackerSimData/data/trackersens.xml',
+ 'Geometry/TrackerRecoData/data/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',
+
+ # --- Muon ------------------------------------------------------------
+ # 'Geometry/MuonCommonData/data/v2/muonNumbering.xml', # Phase-1 Muon
+ 'Geometry/MuonCommonData/data/PhaseII/muonNumbering.xml', # Phase-2 Muon
+ # 'Geometry/MuonSimData/data/muonSens.xml', # Phase-1 Muon
+ 'Geometry/MuonSimData/data/PhaseII/muonSens.xml', # Phase-2 Muon
+ 'Geometry/DTGeometryBuilder/data/dtSpecsFilter.xml',
+ 'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',
+ 'Geometry/CSCGeometryBuilder/data/cscSpecs.xml',
+ # 'Geometry/RPCGeometryBuilder/data/RPCSpecs.xml', # Phase-1 Muon
+ 'Geometry/RPCGeometryBuilder/data/PhaseII/RPCSpecs.xml', # Phase-2 Muon
+ 'Geometry/GEMGeometryBuilder/data/v5/GEMSpecs.xml', # Phase-2 Muon
+ # 'Geometry/MuonSimData/data/muonProdCuts.xml', # Phase-1 Muon
+ 'Geometry/MuonSimData/data/PhaseII/muonProdCuts.xml', # Phase-2 Muon
+ # --- Muon ------------------------------------------------------------
+
+ '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/trackerProdCuts.xml',
+ 'Geometry/TrackerSimData/data/trackerProdCutsBEAM.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')
+)
+
+
diff --git a/Geometry/MuonCommonData/data/PhaseII/mf.xml b/Geometry/MuonCommonData/data/PhaseII/mf.xml
index 40c32283a4621..eacd00faea5ee 100644
--- a/Geometry/MuonCommonData/data/PhaseII/mf.xml
+++ b/Geometry/MuonCommonData/data/PhaseII/mf.xml
@@ -1,7 +1,8 @@
-
+
+
diff --git a/RecoLocalMuon/GEMRecHit/test/SingleMuPt100_cfi_GEM-SIM-DIGI_Extended2015Muon_cfg.py b/RecoLocalMuon/GEMRecHit/test/SingleMuPt100_cfi_GEM-SIM-DIGI_Extended2015Muon_cfg.py
new file mode 100644
index 0000000000000..c60384411b963
--- /dev/null
+++ b/RecoLocalMuon/GEMRecHit/test/SingleMuPt100_cfi_GEM-SIM-DIGI_Extended2015Muon_cfg.py
@@ -0,0 +1,144 @@
+# Auto generated configuration file
+# using:
+# Revision: 1.19
+# Source: /local/reps/CMSSW/CMSSW/Configuration/Applications/python/ConfigBuilder.py,v
+# with command line options: SingleMuPt100_cfi -s GEN,SIM,DIGI --conditions auto:run2_mc --magField 38T_PostLS1 --datatier GEN-SIM-DIGI --geometry Extended2015Muon,Extended2015MuonReco --eventcontent FEVTDEBUGHLT --era Run2_25ns --customise=SimMuon/GEMDigitizer/customizeGEMDigi.customize_digi_addGEM_muon_only,SLHCUpgradeSimulations/Configuration/fixMissingUpgradeGTPayloads.fixRPCConditions,SLHCUpgradeSimulations/Configuration/me0Customs.customize_Digi -n 100 --no_exec --fileout out_digi.root --python_filename SingleMuPt100_cfi_GEM-SIM-DIGI_Extended2015Muon_cfg.py
+import FWCore.ParameterSet.Config as cms
+
+from Configuration.StandardSequences.Eras import eras
+
+process = cms.Process('DIGI',eras.Run2_25ns)
+
+# import of standard configurations
+process.load('Configuration.StandardSequences.Services_cff')
+process.load('SimGeneral.HepPDTESSource.pythiapdt_cfi')
+process.load('FWCore.MessageService.MessageLogger_cfi')
+process.load('Configuration.EventContent.EventContent_cff')
+process.load('SimGeneral.MixingModule.mixNoPU_cfi')
+process.load('Configuration.Geometry.GeometryExtended2015MuonReco_cff')
+process.load('Configuration.Geometry.GeometryExtended2015Muon_cff')
+process.load('Configuration.StandardSequences.MagneticField_38T_PostLS1_cff')
+process.load('Configuration.StandardSequences.Generator_cff')
+process.load('IOMC.EventVertexGenerators.VtxSmearedNominalCollision2015_cfi')
+process.load('GeneratorInterface.Core.genFilterSummary_cff')
+process.load('Configuration.StandardSequences.SimIdeal_cff')
+process.load('Configuration.StandardSequences.Digi_cff')
+process.load('Configuration.StandardSequences.EndOfProcess_cff')
+process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff')
+
+process.maxEvents = cms.untracked.PSet(
+ input = cms.untracked.int32(100)
+)
+
+# Input source
+process.source = cms.Source("EmptySource")
+process.options = cms.untracked.PSet()
+
+# Production Info
+process.configurationMetadata = cms.untracked.PSet(
+ annotation = cms.untracked.string('SingleMuPt100_cfi nevts:100'),
+ name = cms.untracked.string('Applications'),
+ version = cms.untracked.string('$Revision: 1.19 $')
+)
+
+# Output definition
+process.FEVTDEBUGHLToutput = cms.OutputModule("PoolOutputModule",
+ SelectEvents = cms.untracked.PSet(
+ SelectEvents = cms.vstring('generation_step')
+ ),
+ dataset = cms.untracked.PSet(
+ dataTier = cms.untracked.string('GEN-SIM-DIGI'),
+ filterName = cms.untracked.string('')
+ ),
+ eventAutoFlushCompressedSize = cms.untracked.int32(1048576),
+ fileName = cms.untracked.string('out_digi.root'),
+ outputCommands = process.FEVTDEBUGHLTEventContent.outputCommands,
+ splitLevel = cms.untracked.int32(0)
+)
+
+# Additional output definition
+
+### TO ACTIVATE LogDebug NEED TO COMPILE IT WITH:
+### --------------------------------------------------------------
+### --> scram b -j8 USER_CXXFLAGS="-DEDM_ML_DEBUG"
+### Make sure that you first cleaned your CMSSW version:
+### --> scram b clean
+### before issuing the scram command above
+### --------------------------------------------------------------
+### LogDebug output goes to cout; all other output to "junk.log"
+### Code/Configuration with thanks to Tim Cox
+##################################################################
+process.load("FWCore.MessageLogger.MessageLogger_cfi")
+process.MessageLogger.categories.append("GEMGeometryBuilderFromDDD")
+process.MessageLogger.categories.append("ME0GeometryBuilderFromDDD")
+process.MessageLogger.categories.append("RPCGeometryBuilderFromDDD")
+process.MessageLogger.debugModules = cms.untracked.vstring("*")
+process.MessageLogger.destinations = cms.untracked.vstring("cout","junk")
+process.MessageLogger.cout = cms.untracked.PSet(
+ threshold = cms.untracked.string("DEBUG"),
+ default = cms.untracked.PSet( limit = cms.untracked.int32(0) ),
+ FwkReport = cms.untracked.PSet( limit = cms.untracked.int32(-1) ),
+ GEMGeometryBuilderFromDDD = cms.untracked.PSet( limit = cms.untracked.int32(-1) ),
+ ME0GeometryBuilderFromDDD = cms.untracked.PSet( limit = cms.untracked.int32(-1) ),
+ RPCGeometryBuilderFromDDD = cms.untracked.PSet( limit = cms.untracked.int32(-1) ),
+)
+##################################################################
+
+# Other statements
+process.genstepfilter.triggerConditions=cms.vstring("generation_step")
+from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag
+process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:run2_mc', '')
+
+process.generator = cms.EDProducer("FlatRandomPtGunProducer",
+ AddAntiParticle = cms.bool(True),
+ PGunParameters = cms.PSet(
+ MaxEta = cms.double(2.5),
+ MaxPhi = cms.double(3.14159265359),
+ MaxPt = cms.double(100.01),
+ MinEta = cms.double(-2.5),
+ MinPhi = cms.double(-3.14159265359),
+ MinPt = cms.double(99.99),
+ PartID = cms.vint32(-13)
+ ),
+ Verbosity = cms.untracked.int32(0),
+ firstRun = cms.untracked.uint32(1),
+ psethack = cms.string('single mu pt 100')
+)
+
+
+# Path and EndPath definitions
+process.generation_step = cms.Path(process.pgen)
+process.simulation_step = cms.Path(process.psim)
+process.digitisation_step = cms.Path(process.pdigi)
+process.genfiltersummary_step = cms.EndPath(process.genFilterSummary)
+process.endjob_step = cms.EndPath(process.endOfProcess)
+process.FEVTDEBUGHLToutput_step = cms.EndPath(process.FEVTDEBUGHLToutput)
+
+# Schedule definition
+process.schedule = cms.Schedule(process.generation_step,process.genfiltersummary_step,process.simulation_step,process.digitisation_step,process.endjob_step,process.FEVTDEBUGHLToutput_step)
+# filter all path with the production filter sequence
+for path in process.paths:
+ getattr(process,path)._seq = process.generator * getattr(process,path)._seq
+
+# customisation of the process.
+
+# Automatic addition of the customisation function from SimMuon.GEMDigitizer.customizeGEMDigi
+from SimMuon.GEMDigitizer.customizeGEMDigi import customize_digi_addGEM_muon_only
+
+#call to customisation function customize_digi_addGEM_muon_only imported from SimMuon.GEMDigitizer.customizeGEMDigi
+process = customize_digi_addGEM_muon_only(process)
+
+# Automatic addition of the customisation function from SLHCUpgradeSimulations.Configuration.fixMissingUpgradeGTPayloads
+from SLHCUpgradeSimulations.Configuration.fixMissingUpgradeGTPayloads import fixRPCConditions
+
+#call to customisation function fixRPCConditions imported from SLHCUpgradeSimulations.Configuration.fixMissingUpgradeGTPayloads
+process = fixRPCConditions(process)
+
+# Automatic addition of the customisation function from SLHCUpgradeSimulations.Configuration.me0Customs
+from SLHCUpgradeSimulations.Configuration.me0Customs import customise_Digi
+
+#call to customisation function customise_Digi imported from SLHCUpgradeSimulations.Configuration.me0Customs
+process = customise_Digi(process)
+
+# End of customisation functions
+
diff --git a/RecoLocalMuon/GEMRecHit/test/SingleMuPt100_cfi_GEM-SIM_Extended2015Muon_cfg.py b/RecoLocalMuon/GEMRecHit/test/SingleMuPt100_cfi_GEM-SIM_Extended2015Muon_cfg.py
new file mode 100644
index 0000000000000..bfc99fe1cc2f7
--- /dev/null
+++ b/RecoLocalMuon/GEMRecHit/test/SingleMuPt100_cfi_GEM-SIM_Extended2015Muon_cfg.py
@@ -0,0 +1,99 @@
+# Auto generated configuration file
+# using:
+# Revision: 1.19
+# Source: /local/reps/CMSSW/CMSSW/Configuration/Applications/python/ConfigBuilder.py,v
+# with command line options: SingleMuPt100_cfi -s GEN,SIM --conditions auto:run2_mc --magField 38T_PostLS1 --datatier GEN-SIM --geometry Extended2015Muon,Extended2015MuonReco --eventcontent FEVTDEBUGHLT --era Run2_25ns -n 100 --no_exec --fileout out_sim.root --python_filename SingleMuPt100_cfi_GEM-SIM_Extended2015Muon_cfg.py
+import FWCore.ParameterSet.Config as cms
+
+from Configuration.StandardSequences.Eras import eras
+
+process = cms.Process('SIM',eras.Run2_25ns)
+
+# import of standard configurations
+process.load('Configuration.StandardSequences.Services_cff')
+process.load('SimGeneral.HepPDTESSource.pythiapdt_cfi')
+process.load('FWCore.MessageService.MessageLogger_cfi')
+process.load('Configuration.EventContent.EventContent_cff')
+process.load('SimGeneral.MixingModule.mixNoPU_cfi')
+process.load('Configuration.Geometry.GeometryExtended2015MuonReco_cff')
+process.load('Configuration.Geometry.GeometryExtended2015Muon_cff')
+process.load('Configuration.StandardSequences.MagneticField_38T_PostLS1_cff')
+process.load('Configuration.StandardSequences.Generator_cff')
+process.load('IOMC.EventVertexGenerators.VtxSmearedNominalCollision2015_cfi')
+process.load('GeneratorInterface.Core.genFilterSummary_cff')
+process.load('Configuration.StandardSequences.SimIdeal_cff')
+process.load('Configuration.StandardSequences.EndOfProcess_cff')
+process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff')
+
+process.maxEvents = cms.untracked.PSet(
+ input = cms.untracked.int32(100)
+)
+
+# Input source
+process.source = cms.Source("EmptySource")
+
+process.options = cms.untracked.PSet(
+
+)
+
+# Production Info
+process.configurationMetadata = cms.untracked.PSet(
+ annotation = cms.untracked.string('SingleMuPt100_cfi nevts:100'),
+ name = cms.untracked.string('Applications'),
+ version = cms.untracked.string('$Revision: 1.19 $')
+)
+
+# Output definition
+
+process.FEVTDEBUGHLToutput = cms.OutputModule("PoolOutputModule",
+ SelectEvents = cms.untracked.PSet(
+ SelectEvents = cms.vstring('generation_step')
+ ),
+ dataset = cms.untracked.PSet(
+ dataTier = cms.untracked.string('GEN-SIM'),
+ filterName = cms.untracked.string('')
+ ),
+ eventAutoFlushCompressedSize = cms.untracked.int32(1048576),
+ fileName = cms.untracked.string('out_sim.root'),
+ outputCommands = process.FEVTDEBUGHLTEventContent.outputCommands,
+ splitLevel = cms.untracked.int32(0)
+)
+
+# Additional output definition
+
+# Other statements
+process.genstepfilter.triggerConditions=cms.vstring("generation_step")
+from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag
+process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:run2_mc', '')
+
+process.generator = cms.EDProducer("FlatRandomPtGunProducer",
+ AddAntiParticle = cms.bool(True),
+ PGunParameters = cms.PSet(
+ MaxEta = cms.double(2.5),
+ MaxPhi = cms.double(3.14159265359),
+ MaxPt = cms.double(100.01),
+ MinEta = cms.double(-2.5),
+ MinPhi = cms.double(-3.14159265359),
+ MinPt = cms.double(99.99),
+ PartID = cms.vint32(-13)
+ ),
+ Verbosity = cms.untracked.int32(0),
+ firstRun = cms.untracked.uint32(1),
+ psethack = cms.string('single mu pt 100')
+)
+
+
+# Path and EndPath definitions
+process.generation_step = cms.Path(process.pgen)
+process.simulation_step = cms.Path(process.psim)
+process.genfiltersummary_step = cms.EndPath(process.genFilterSummary)
+process.endjob_step = cms.EndPath(process.endOfProcess)
+process.FEVTDEBUGHLToutput_step = cms.EndPath(process.FEVTDEBUGHLToutput)
+
+# Schedule definition
+process.schedule = cms.Schedule(process.generation_step,process.genfiltersummary_step,process.simulation_step,process.endjob_step,process.FEVTDEBUGHLToutput_step)
+# filter all path with the production filter sequence
+for path in process.paths:
+ getattr(process,path)._seq = process.generator * getattr(process,path)._seq
+
+
diff --git a/SLHCUpgradeSimulations/Configuration/python/gemCustom.py b/SLHCUpgradeSimulations/Configuration/python/gemCustom.py
index 2d36b9b064c06..183ef39730786 100644
--- a/SLHCUpgradeSimulations/Configuration/python/gemCustom.py
+++ b/SLHCUpgradeSimulations/Configuration/python/gemCustom.py
@@ -11,9 +11,10 @@ def customise_digitization(process):
from SimMuon.GEMDigitizer.customizeGEMDigi import customize_digi_addGEM_muon_only
process = customize_digi_addGEM_muon_only(process)
process.simMuonGEMDigis.mixLabel = cms.string("mix")
- #process.simMuonRPCDigis.digiModel = cms.string('RPCSimParam')
- #process.simMuonME0Digis.mixLabel = cms.string("mix")
- process.digitisation_step.remove(process.simMuonRPCDigis)
+ process.simMuonME0Digis.mixLabel = cms.string("mix")
+ # process.digitisation_step.remove(process.simMuonRPCDigis)
+ # process.simMuonRPCDigis.digiModel = cms.string('RPCSimParam')
+ process.simMuonRPCDigis.digiModel = cms.string('RPCSimAverageNoiseEff')
return process
def customise_Validation(process):
diff --git a/SLHCUpgradeSimulations/Configuration/python/me0Customs.py b/SLHCUpgradeSimulations/Configuration/python/me0Customs.py
new file mode 100644
index 0000000000000..242d28e1fabe6
--- /dev/null
+++ b/SLHCUpgradeSimulations/Configuration/python/me0Customs.py
@@ -0,0 +1,106 @@
+import FWCore.ParameterSet.Config as cms
+
+def customise(process):
+ if hasattr(process,'digitisation_step'):
+ process=customise_Digi(process)
+ if hasattr(process,'L1simulation_step'):
+ process=customise_L1Emulator(process)
+ if hasattr(process,'DigiToRaw'):
+ process=customise_DigiToRaw(process)
+ if hasattr(process,'RawToDigi'):
+ process=customise_RawToDigi(process)
+ if hasattr(process,'reconstruction'):
+ process=customise_RecoFull(process)
+ if hasattr(process,'famosWithEverything'):
+ process=customise_RecoFast(process)
+ if hasattr(process,'dqmoffline_step'):
+ process=customise_DQM(process)
+ if hasattr(process,'dqmHarvesting'):
+ process=customise_harvesting(process)
+ if hasattr(process,'validation_step'):
+ process=customise_Validation(process)
+ return process
+
+def customise_Digi(process):
+ process.RandomNumberGeneratorService.simMuonME0Digis = cms.PSet(
+ initialSeed = cms.untracked.uint32(1234567),
+ engineName = cms.untracked.string('HepJamesRandom')
+ )
+ process.mix.mixObjects.mixSH.crossingFrames.append('MuonME0Hits')
+ process.mix.mixObjects.mixSH.input.append(cms.InputTag("g4SimHits","MuonME0Hits"))
+ process.mix.mixObjects.mixSH.subdets.append('MuonME0Hits')
+ process.load('SimMuon.GEMDigitizer.muonME0DigisPreReco_cfi')
+ process.muonDigi += process.simMuonME0Digis
+ process=outputCustoms(process)
+ return process
+
+def customise_L1Emulator(process):
+ return process
+
+def customise_DigiToRaw(process):
+ return process
+
+def customise_RawToDigi(process):
+ return process
+
+def customise_LocalReco(process):
+ process.load('RecoLocalMuon.GEMRecHit.me0LocalReco_cff')
+ process.muonlocalreco += process.me0LocalReco
+ process=outputCustoms(process)
+ return process
+
+def customise_GlobalRecoInclude(process):
+ process.load("TrackPropagation.SteppingHelixPropagator.SteppingHelixPropagatorAlong_cfi")
+ process.load("TrackPropagation.SteppingHelixPropagator.SteppingHelixPropagatorOpposite_cfi")
+ process.load("TrackPropagation.SteppingHelixPropagator.SteppingHelixPropagatorAny_cfi")
+ return process
+
+def customise_GlobalRecoFast(process):
+ customise_GlobalRecoInclude(process)
+ process.load('RecoMuon.MuonIdentification.me0MuonReco_cff')
+ process.reconstructionWithFamos += process.me0MuonReco
+ return process
+
+def customise_GlobalRecoFull(process):
+ customise_GlobalRecoInclude(process)
+ process.load('RecoMuon.MuonIdentification.me0MuonReco_cff')
+ process.muonGlobalReco += process.me0MuonReco
+ return process
+
+def customise_RecoFast(process):
+ process=customise_LocalReco(process)
+ process=customise_GlobalRecoFast(process)
+ process=outputCustoms(process)
+ return process
+
+def customise_RecoFull(process):
+ process=customise_LocalReco(process)
+ process=customise_GlobalRecoFull(process)
+ process=outputCustoms(process)
+ return process
+
+def customise_Validation(process):
+ process.load('Validation.Configuration.gemSimValid_cff')
+ process.genvalid_all += process.me0SimValid
+ return process
+
+def customise_DQM(process):
+ return process
+
+def customise_harvesting(process):
+ return process
+
+def outputCustoms(process):
+ alist=['AODSIM','RECOSIM','FEVTSIM','FEVTDEBUG','FEVTDEBUGHLT','RECODEBUG','RAWRECOSIMHLT','RAWRECODEBUGHLT']
+ for a in alist:
+ b=a+'output'
+ if hasattr(process,b):
+ getattr(process,b).outputCommands.append('keep *_simMuonME0Digis_*_*')
+ getattr(process,b).outputCommands.append('keep *_me0RecHits_*_*')
+ getattr(process,b).outputCommands.append('keep *_me0Segments_*_*')
+ getattr(process,b).outputCommands.append('keep *_me0SegmentProducer_*_*')
+ getattr(process,b).outputCommands.append('drop *_me0SegmentMatcher_*_*')
+ getattr(process,b).outputCommands.append('drop *_me0MuonConverter_*_*')
+ getattr(process,b).outputCommands.append('keep *_me0SegmentMatching_*_*')
+ getattr(process,b).outputCommands.append('keep *_me0MuonConverting_*_*')
+ return process
diff --git a/SimG4Core/Application/plugins/OscarMTProducer.cc b/SimG4Core/Application/plugins/OscarMTProducer.cc
index ec7b7fef110cb..01ccbb0725f57 100644
--- a/SimG4Core/Application/plugins/OscarMTProducer.cc
+++ b/SimG4Core/Application/plugins/OscarMTProducer.cc
@@ -101,6 +101,7 @@ OscarMTProducer::OscarMTProducer(edm::ParameterSet const & p, const OscarMTMaste
produces("MuonCSCHits");
produces("MuonRPCHits");
produces("MuonGEMHits");
+ produces("MuonME0Hits");
produces("CastorPL");
produces("CastorFI");
produces("CastorBU");
diff --git a/SimG4Core/Application/plugins/OscarProducer.cc b/SimG4Core/Application/plugins/OscarProducer.cc
index 989b40891ca52..02cdfcedd1a5c 100644
--- a/SimG4Core/Application/plugins/OscarProducer.cc
+++ b/SimG4Core/Application/plugins/OscarProducer.cc
@@ -102,6 +102,7 @@ OscarProducer::OscarProducer(edm::ParameterSet const & p)
produces("MuonCSCHits");
produces("MuonRPCHits");
produces("MuonGEMHits");
+ produces("MuonME0Hits");
produces("CastorPL");
produces("CastorFI");
produces("CastorBU");
diff --git a/SimMuon/GEMDigitizer/python/muonME0DigisPreReco_cfi.py b/SimMuon/GEMDigitizer/python/muonME0DigisPreReco_cfi.py
index e8db6bd8b1fc6..dbfd9e02e5a5a 100644
--- a/SimMuon/GEMDigitizer/python/muonME0DigisPreReco_cfi.py
+++ b/SimMuon/GEMDigitizer/python/muonME0DigisPreReco_cfi.py
@@ -2,20 +2,21 @@
# Module to create simulated ME0 Pre Reco digis.
simMuonME0Digis = cms.EDProducer("ME0DigiPreRecoProducer",
+ mixLabel = cms.string('mix'),
inputCollection = cms.string('g4SimHitsMuonME0Hits'),
digiPreRecoModelString = cms.string('PreRecoGaussian'),
- timeResolution = cms.double(0.001), # in ns
- phiResolution = cms.double(0.05), # in cm average resoltion along local x in case of no correlation
- etaResolution = cms.double(1.),# in cm average resoltion along local y in case of no correlation
+ timeResolution = cms.double(0.010), # [in ns] => for now at 10ps
+ phiResolution = cms.double(0.05), # [in cm] average resolution along local x in case of no correlation
+ etaResolution = cms.double(1.), # [in cm] average resolution along local y in case of no correlation
useCorrelation = cms.bool(False),
useEtaProjectiveGEO = cms.bool(False),
averageEfficiency = cms.double(0.98),
- doBkgNoise = cms.bool(False), #False == No background simulation
+ doBkgNoise = cms.bool(False), # False => No background noise simulation
digitizeOnlyMuons = cms.bool(False),
simulateIntrinsicNoise = cms.bool(False),
- simulateElectronBkg = cms.bool(False), #True - will simulate electron background
- averageNoiseRate = cms.double(0.001), #intrinsic noise
+ simulateElectronBkg = cms.bool(False), # True => will simulate electron background
+ averageNoiseRate = cms.double(0.001), # simulation of intrinsic noise
bxwidth = cms.int32(25),
- minBunch = cms.int32(-5), ## in terms of 25 ns
+ minBunch = cms.int32(-5), # in bx-units (x 25 ns)
maxBunch = cms.int32(3)
)