Merge pull request #22 from dildick/from-CMSSW_6_2_X_SLHC_2014-03-08-…

…1400 From cmssw 6 2 x slhc 2014 03 08 1400
slava77 · Mar 10, 2014 · ae4400d · ae4400d
2 parents 3317f4d + 3186510
commit ae4400d
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 109 deletions.
diff --git a/FastSimulation/Configuration/test/TempTest.py b/FastSimulation/Configuration/test/TempTest.py
@@ -236,9 +236,8 @@
 
 #Putting the lines from custom.py here
 
-from RecoMuon.MuonIdentification.me0Customs import customise
-
-process = customise(process)
+from SLHCUpgradeSimulations.Configuration.me0Customs import *
+process = customise_GlobalRecoFull(process)
 
 #print "XXXXXXXXXXXX"
 #print process.famosWithEverything

diff --git a/RecoMuon/MuonIdentification/python/me0Customs.py b/RecoMuon/MuonIdentification/python/me0Customs.py
diff --git a/RecoMuon/MuonIdentification/python/me0FullSimCustoms.py b/RecoMuon/MuonIdentification/python/me0FullSimCustoms.py
diff --git a/RecoMuon/MuonIdentification/test/testME0MuonConverter_cfg.py b/RecoMuon/MuonIdentification/test/testME0MuonConverter_cfg.py
@@ -23,21 +23,11 @@
 )
 process.source = cms.Source("PoolSource",
     fileNames = cms.untracked.vstring('file:///somewhere/simevent.root') ##/somewhere/simevent.root" }
-
-)
-
-process.me0SegmentProducer = cms.EDProducer("EmulatedME0SegmentProducer")
-
-process.me0SegmentMatcher = cms.EDProducer("ME0SegmentMatcher",
-                                           DebugHistos = cms.string('DebugHistos.root'),
-                                           debug = cms.bool(True)
 )
 
-process.me0MuonConverter = cms.EDProducer("ME0MuonConverter")
+process.load('RecoMuon.MuonIdentification.me0MuonReco_cff')
+process.p = cms.Path(process.me0MuonReco)
 
-process.p = cms.Path(process.me0SegmentProducer+
-                     process.me0SegmentMatcher+
-                     process.me0MuonConverter)
 process.PoolSource.fileNames = [
     #'file:/afs/cern.ch/work/d/dnash/PixelProduction/TryFour/CMSSW_6_1_2_SLHC8/src/FastSimulation/Configuration/test/20GeV.root'
     #'file:/afs/cern.ch/work/d/dnash/PixelProduction/ReCheckout/CMSSW_6_1_2_SLHC8/src/FastSimulation/Configuration/test/Zmumu.root'