diff --git a/FastSimulation/Configuration/test/TempTest.py b/FastSimulation/Configuration/test/TempTest.py index eed301b5d5596..9636a1e584c93 100644 --- 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 deleted file mode 100644 index aab09b1ab256d..0000000000000 --- a/RecoMuon/MuonIdentification/python/me0Customs.py +++ /dev/null @@ -1,47 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -def customise(process): - #if hasattr(process,'famosMuonSequence'): - #if hasattr(process,'globalMuons'): - if hasattr(process,'famosWithEverything'): - process=customise_AssumeOneCustomiseStep(process) - return process - -def customise_AssumeOneCustomiseStep(process): - #from PhysicsTools.HepMCCandAlgos.genParticles_cfi import * - - #process.load("Configuration.StandardSequences.GeometryRecoDB_cff") - - process.load("TrackPropagation.SteppingHelixPropagator.SteppingHelixPropagatorAlong_cfi") - process.load("TrackPropagation.SteppingHelixPropagator.SteppingHelixPropagatorOpposite_cfi") - process.load("TrackPropagation.SteppingHelixPropagator.SteppingHelixPropagatorAny_cfi") - - process.load('FastSimulation.Muons.me0SegmentProducer_cfi') - process.load('RecoMuon.MuonIdentification.me0SegmentMatcher_cfi') - process.load('RecoMuon.MuonIdentification.me0MuonConverter_cfi') - - #process.famosMuonSequence += process.me0SegmentProducer - #process.famosMuonSequence += process.me0SegmentMatcher - #process.famosMuonSequence += process.me0MuonConverter - - process.reconstructionWithFamos += process.me0SegmentProducer - process.reconstructionWithFamos += process.me0SegmentMatcher - process.reconstructionWithFamos += process.me0MuonConverter - process=outputCustoms(process) - - - - return process - - -def outputCustoms(process): - alist=['AODSIM','RECOSIM','FEVTSIM','FEVTDEBUG','FEVTDEBUGHLT','RECODEBUG','RAWRECOSIMHLT','RAWRECODEBUGHLT'] - for a in alist: - b=a+'output' - #Not entirely sure what the purpose of this is, but maybe I should include the processes that were put in above? - if hasattr(process,b): - getattr(process,b).outputCommands.append('keep *_me0SegmentProducer_*_*') - getattr(process,b).outputCommands.append('keep *_me0SegmentMatcher_*_*') - getattr(process,b).outputCommands.append('keep *_me0MuonConverter_*_*') - - return process diff --git a/RecoMuon/MuonIdentification/python/me0FullSimCustoms.py b/RecoMuon/MuonIdentification/python/me0FullSimCustoms.py deleted file mode 100644 index d0e56980d11b7..0000000000000 --- a/RecoMuon/MuonIdentification/python/me0FullSimCustoms.py +++ /dev/null @@ -1,47 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -def customise(process): - #if hasattr(process,'famosMuonSequence'): - #if hasattr(process,'globalMuons'): - if hasattr(process,'reconstruction'): - process=customise_AssumeOneCustomiseStep(process) - return process - -def customise_AssumeOneCustomiseStep(process): - #from PhysicsTools.HepMCCandAlgos.genParticles_cfi import * - - #process.load("Configuration.StandardSequences.GeometryRecoDB_cff") - - process.load("TrackPropagation.SteppingHelixPropagator.SteppingHelixPropagatorAlong_cfi") - process.load("TrackPropagation.SteppingHelixPropagator.SteppingHelixPropagatorOpposite_cfi") - process.load("TrackPropagation.SteppingHelixPropagator.SteppingHelixPropagatorAny_cfi") - - process.load('FastSimulation.Muons.me0SegmentProducer_cfi') - process.load('RecoMuon.MuonIdentification.me0SegmentMatcher_cfi') - process.load('RecoMuon.MuonIdentification.me0MuonConverter_cfi') - - #process.famosMuonSequence += process.me0SegmentProducer - #process.famosMuonSequence += process.me0SegmentMatcher - #process.famosMuonSequence += process.me0MuonConverter - - process.reconstruction += process.me0SegmentProducer - process.reconstruction += process.me0SegmentMatcher - process.reconstruction += process.me0MuonConverter - process=outputCustoms(process) - - - - return process - - -def outputCustoms(process): - alist=['AODSIM','RECOSIM','FEVTSIM','FEVTDEBUG','FEVTDEBUGHLT','RECODEBUG','RAWRECOSIMHLT','RAWRECODEBUGHLT'] - for a in alist: - b=a+'output' - #Not entirely sure what the purpose of this is, but maybe I should include the processes that were put in above? - if hasattr(process,b): - getattr(process,b).outputCommands.append('keep *_me0SegmentProducer_*_*') - getattr(process,b).outputCommands.append('keep *_me0SegmentMatcher_*_*') - getattr(process,b).outputCommands.append('keep *_me0MuonConverter_*_*') - - return process diff --git a/RecoMuon/MuonIdentification/test/testME0MuonConverter_cfg.py b/RecoMuon/MuonIdentification/test/testME0MuonConverter_cfg.py index 9a391710cc69a..8845f3d9fb4a7 100644 --- 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'