From 64e81351de72aeaf8639f9af3b6581e171992cce Mon Sep 17 00:00:00 2001 From: Vladimir Date: Wed, 22 Feb 2017 16:50:24 +0100 Subject: [PATCH 1/4] remove Cond import --- SimMuon/Configuration/python/SimMuon_cff.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/SimMuon/Configuration/python/SimMuon_cff.py b/SimMuon/Configuration/python/SimMuon_cff.py index c32f388860ad9..46bb1de38af1d 100644 --- a/SimMuon/Configuration/python/SimMuon_cff.py +++ b/SimMuon/Configuration/python/SimMuon_cff.py @@ -14,8 +14,6 @@ from SimMuon.RPCDigitizer.muonrpcdigi_cfi import * muonDigi = cms.Sequence(simMuonCSCDigis+simMuonDTDigis+simMuonRPCDigis) -from CondCore.DBCommon.CondDBCommon_cfi import * - from SimMuon.GEMDigitizer.muonGEMDigi_cff import * from SimMuon.GEMDigitizer.muonME0Digi_cff import * From 540df2f524c00eac683d5b716c3b350ae4dc6701 Mon Sep 17 00:00:00 2001 From: Vladimir Date: Mon, 27 Feb 2017 11:49:03 +0100 Subject: [PATCH 2/4] remove CondDB tails --- SimMuon/Configuration/python/SimMuon_cff.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/SimMuon/Configuration/python/SimMuon_cff.py b/SimMuon/Configuration/python/SimMuon_cff.py index 46bb1de38af1d..ab945dde9cb06 100644 --- a/SimMuon/Configuration/python/SimMuon_cff.py +++ b/SimMuon/Configuration/python/SimMuon_cff.py @@ -14,6 +14,8 @@ from SimMuon.RPCDigitizer.muonrpcdigi_cfi import * muonDigi = cms.Sequence(simMuonCSCDigis+simMuonDTDigis+simMuonRPCDigis) +#from CondCore.CondDB.CondDB_cfi import * + from SimMuon.GEMDigitizer.muonGEMDigi_cff import * from SimMuon.GEMDigitizer.muonME0Digi_cff import * @@ -25,7 +27,7 @@ def _modifySimMuonForPhase2( theProcess ): theProcess.rpcphase2recovery_essource = cms.ESSource("PoolDBESSource", - CondDBCommon, + # CondDBCommon, # using CondDBSetup toGet = cms.VPSet(cms.PSet( record = cms.string("RPCStripNoisesRcd"), From c55a3b105e297afc614b887ff3621119c54b424c Mon Sep 17 00:00:00 2001 From: Vladimir Date: Mon, 27 Feb 2017 11:56:54 +0100 Subject: [PATCH 3/4] remove CondDB tails --- SimMuon/Configuration/python/SimMuon_cff.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/SimMuon/Configuration/python/SimMuon_cff.py b/SimMuon/Configuration/python/SimMuon_cff.py index ab945dde9cb06..4e015848038b1 100644 --- a/SimMuon/Configuration/python/SimMuon_cff.py +++ b/SimMuon/Configuration/python/SimMuon_cff.py @@ -14,8 +14,6 @@ from SimMuon.RPCDigitizer.muonrpcdigi_cfi import * muonDigi = cms.Sequence(simMuonCSCDigis+simMuonDTDigis+simMuonRPCDigis) -#from CondCore.CondDB.CondDB_cfi import * - from SimMuon.GEMDigitizer.muonGEMDigi_cff import * from SimMuon.GEMDigitizer.muonME0Digi_cff import * @@ -27,8 +25,6 @@ def _modifySimMuonForPhase2( theProcess ): theProcess.rpcphase2recovery_essource = cms.ESSource("PoolDBESSource", - # CondDBCommon, - # using CondDBSetup toGet = cms.VPSet(cms.PSet( record = cms.string("RPCStripNoisesRcd"), tag = cms.string("RPC_testCondition_192Strips_mc"), From 7ff62da6aed4996f7f7e905fbcd56afc51b3f21b Mon Sep 17 00:00:00 2001 From: bapavlov Date: Tue, 25 Apr 2017 14:29:39 +0300 Subject: [PATCH 4/4] Update SimMuon_cff.py Now the conditions are in the Global tag and the hard-coded one could be removed --- SimMuon/Configuration/python/SimMuon_cff.py | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/SimMuon/Configuration/python/SimMuon_cff.py b/SimMuon/Configuration/python/SimMuon_cff.py index 4e015848038b1..bda663c141dd8 100644 --- a/SimMuon/Configuration/python/SimMuon_cff.py +++ b/SimMuon/Configuration/python/SimMuon_cff.py @@ -23,23 +23,7 @@ _phase2_muonDigi = _run3_muonDigi.copy() _phase2_muonDigi += muonME0Digi -def _modifySimMuonForPhase2( theProcess ): - theProcess.rpcphase2recovery_essource = cms.ESSource("PoolDBESSource", - toGet = cms.VPSet(cms.PSet( - record = cms.string("RPCStripNoisesRcd"), - tag = cms.string("RPC_testCondition_192Strips_mc"), - connect = cms.string("frontier://FrontierProd/CMS_CONDITIONS") - ), - cms.PSet(record = cms.string("RPCClusterSizeRcd"), - tag = cms.string("RPCClusterSize_PhaseII_mc"), - connect = cms.string("frontier://FrontierProd/CMS_CONDITIONS") - ) - ) - ) - theProcess.rpcphase2recovery_esprefer = cms.ESPrefer("PoolDBESSource","rpcphase2recovery_essource") - from Configuration.Eras.Modifier_run3_GEM_cff import run3_GEM run3_GEM.toReplaceWith( muonDigi, _run3_muonDigi ) from Configuration.Eras.Modifier_phase2_muon_cff import phase2_muon phase2_muon.toReplaceWith( muonDigi, _phase2_muonDigi ) -modifyConfigurationStandardSequencesSimMuonPhase2_ = phase2_muon.makeProcessModifier( _modifySimMuonForPhase2 )