From 37becd40b6d94d0f4e8755752f4ea3930dc085ac Mon Sep 17 00:00:00 2001 From: Geonmo Date: Mon, 4 May 2015 10:09:31 +0200 Subject: [PATCH] Add sven's patch for digi step. --- .../python/fixMissingUpgradeGTPayloads.py | 10 +++++----- .../Configuration/python/gemCustom.py | 6 ------ Validation/MuonGEMHits/test/Generate.sh | 2 +- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/SLHCUpgradeSimulations/Configuration/python/fixMissingUpgradeGTPayloads.py b/SLHCUpgradeSimulations/Configuration/python/fixMissingUpgradeGTPayloads.py index 3c207a8906b7f..6584c683139d3 100644 --- a/SLHCUpgradeSimulations/Configuration/python/fixMissingUpgradeGTPayloads.py +++ b/SLHCUpgradeSimulations/Configuration/python/fixMissingUpgradeGTPayloads.py @@ -7,11 +7,11 @@ def fixRPCConditions(process): process.GlobalTag.toGet.extend( cms.VPSet( cms.PSet(record = cms.string("RPCStripNoisesRcd"), tag = cms.string("RPC_testCondition_192Strips_mc"), - connect = cms.untracked.string("frontier://FrontierProd/CMS_COND_31X_RPC") + connect = cms.string("frontier://FrontierProd/CMS_COND_31X_RPC") ), cms.PSet(record = cms.string("RPCClusterSizeRcd"), tag = cms.string("RPCClusterSize_PhaseII_mc"), - connect = cms.untracked.string("frontier://FrontierProd/CMS_COND_36X_RPC") + connect = cms.string("frontier://FrontierProd/CMS_COND_36X_RPC") ) ) ) @@ -23,14 +23,14 @@ def fixDTAlignmentConditions(process): process.GlobalTag.toGet.extend( cms.VPSet( cms.PSet(record = cms.string("DTAlignmentErrorExtendedRcd"), tag = cms.string("MuonDTAPEObjectsExtended_v0_mc"), - connect = cms.untracked.string("frontier://FrontierProd/CMS_COND_ALIGN_000") + connect = cms.string("frontier://FrontierProd/CMS_COND_ALIGN_000") ) ) ), process.GlobalTag.toGet.extend( cms.VPSet( cms.PSet(record = cms.string("DTRecoUncertaintiesRcd"), tag = cms.string("DTRecoUncertainties_True_v0"), - connect = cms.untracked.string("frontier://FrontierProd/CMS_COND_DT_000") + connect = cms.string("frontier://FrontierProd/CMS_COND_DT_000") ) ) ), @@ -42,7 +42,7 @@ def fixCSCAlignmentConditions(process): process.GlobalTag.toGet.extend( cms.VPSet( cms.PSet(record = cms.string("CSCAlignmentErrorExtendedRcd"), tag = cms.string("MuonCSCAPEObjectsExtended_v0_mc"), - connect = cms.untracked.string("frontier://FrontierProd/CMS_COND_ALIGN_000") + connect = cms.string("frontier://FrontierProd/CMS_COND_ALIGN_000") ) ) ), diff --git a/SLHCUpgradeSimulations/Configuration/python/gemCustom.py b/SLHCUpgradeSimulations/Configuration/python/gemCustom.py index 7cc330d3d7d07..b2bb86d9fa01b 100644 --- a/SLHCUpgradeSimulations/Configuration/python/gemCustom.py +++ b/SLHCUpgradeSimulations/Configuration/python/gemCustom.py @@ -11,12 +11,6 @@ def customise2023(process): return process 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) return process def customise_Validation(process): diff --git a/Validation/MuonGEMHits/test/Generate.sh b/Validation/MuonGEMHits/test/Generate.sh index 80773a08a97cc..d02f56c06f268 100755 --- a/Validation/MuonGEMHits/test/Generate.sh +++ b/Validation/MuonGEMHits/test/Generate.sh @@ -5,7 +5,7 @@ #!/bin/bash -cmsDriver.py SingleMuPt40Fwd_cfi -s GEN,SIM,DIGI,L1 --conditions auto:run1_mc --datatier GEN-SIM-DIGI --geometry Extended2023 --evt_type Validation/MuonGEMHits/SingleMuPt40Fwd_cfi --eventcontent FEVTDEBUG -n 1000 --no_exec --fileout out_digi.root --customise SLHCUpgradeSimulations/Configuration/gemCustom.customise2023 --python_filename=gen_sim_digi_cfg.py +cmsDriver.py SingleMuPt40Fwd_cfi -s GEN,SIM,DIGI,L1 --conditions auto:run1_mc --datatier GEN-SIM-DIGI --geometry Extended2023 --evt_type Validation/MuonGEMHits/SingleMuPt40Fwd_cfi --eventcontent FEVTDEBUG -n 1000 --no_exec --fileout out_digi.root --customise SLHCUpgradeSimulations/Configuration/gemCustom.customise2023,SLHCUpgradeSimulations/Configuration/fixMissingUpgradeGTPayloads.fixRPCConditions,SLHCUpgradeSimulations/Configuration/fixMissingUpgradeGTPayloads.fixCSCAlignmentConditions,SimMuon/GEMDigitizer/customizeGEMDigi.customize_digi_addGEM_muon_only --python_filename=gen_sim_digi_cfg.py cmsDriver.py validation --conditions auto:run1_mc -n 1000 --eventcontent FEVTDEBUGHLT -s VALIDATION:genvalid_all --customise SLHCUpgradeSimulations/Configuration/gemCustom.customise2023 --datatier GEN-SIM-DIGI --geometry Extended2023 --no_exec --filein file:out_digi.root --fileout file:out_valid.root --python_filename=valid_cfg.py