From c30cf44c2807ebae7be26f03ac4c5d29cf4c3658 Mon Sep 17 00:00:00 2001 From: Yetkin Yilmaz Date: Fri, 13 Nov 2009 10:45:11 +0000 Subject: [PATCH] --- yaml --- r: 77835 b: "refs/heads/CMSSW_7_1_X" c: f107ae0f1e186ce97e27ae760f723d76d80e4c54 h: "refs/heads/CMSSW_7_1_X" i: 77833: 2f0fc587c38bbc51c7bac12121e7efc2ba9214dc 77831: 48edaf26b99b36d22b1bcb367ceab24145d8bcc3 v: v3 --- [refs] | 2 +- .../python/ecalTrigSettings_cff.py | 86 ------------------- .../python/pyquenEcalTrig_cfi.py | 2 +- 3 files changed, 2 insertions(+), 88 deletions(-) delete mode 100644 trunk/GeneratorInterface/PyquenInterface/python/ecalTrigSettings_cff.py diff --git a/[refs] b/[refs] index 0b022216aa4a8..b501b45e02954 100644 --- a/[refs] +++ b/[refs] @@ -1,3 +1,3 @@ --- refs/heads/gh-pages: 09c786f70121f131b3715aaf3464996502bbeb7e -"refs/heads/CMSSW_7_1_X": 57e118cff55d47cb4e5023997ea41ffe8c80a423 +"refs/heads/CMSSW_7_1_X": f107ae0f1e186ce97e27ae760f723d76d80e4c54 diff --git a/trunk/GeneratorInterface/PyquenInterface/python/ecalTrigSettings_cff.py b/trunk/GeneratorInterface/PyquenInterface/python/ecalTrigSettings_cff.py deleted file mode 100644 index 9bd397af04937..0000000000000 --- a/trunk/GeneratorInterface/PyquenInterface/python/ecalTrigSettings_cff.py +++ /dev/null @@ -1,86 +0,0 @@ - -import FWCore.ParameterSet.Config as cms - -ecalTrigCommon = cms.PSet(filterType = cms.untracked.string("EcalGenEvtSelector"), - etaMax = cms.double(3), - partons = cms.vint32(1,2,3,4,5,6,21,22), - partonStatus = cms.vint32(2,2,2,2,2,2,2,1), - particleStatus = cms.vint32(2, 2, 2, 2, 2, - 2, 1, 1, 2, 2, - 1, 1, 1), - particles = cms.vint32(221, -221, # eta - 331, -331, # eta' - 223, -223, # omega - 211, -211, # pi - 111, # pi0 - 311, # K0 - 11, -11, # e - 22 # gamma - ) - - ) - -ecalTrigPt20 = cms.PSet(ecalTrigCommon, - partonPt = cms.vdouble(38.5,38.5,38.5,38.5,38.5,38.5,38.5,38.5), - particlePt = cms.vdouble(17.5, 17.5, # eta - 16., 16., # eta' - 18., 18., # omega - 14.5, 14.5, # pi - 17.5, # pi0 - 15, # K0 - 17.5, 17.5, # e - 38.5 # gamma - ) - ) - - -ecalTrigPt40 = cms.PSet(ecalTrigCommon, - partonPt = cms.vdouble(38.5,38.5,38.5,38.5,38.5,38.5,38.5,38.5), - particlePt = cms.vdouble(17.5, 17.5, # eta - 16., 16., # eta' - 18., 18., # omega - 14.5, 14.5, # pi - 17.5, # pi0 - 15, # K0 - 17.5, 17.5, # e - 38.5 # gamma - ) - ) - -ecalTrigPt70 = cms.PSet(ecalTrigCommon, - partonPt = cms.vdouble(38.5,38.5,38.5,38.5,38.5,38.5,38.5,38.5), - particlePt = cms.vdouble(17.5, 17.5, # eta - 16., 16., # eta' - 18., 18., # omega - 14.5, 14.5, # pi - 17.5, # pi0 - 15, # K0 - 17.5, 17.5, # e - 38.5 # gamma - ) - ) - - - -ecalTrigPt100 = cms.PSet(ecalTrigCommon, - partonPt = cms.vdouble(38.5,38.5,38.5,38.5,38.5,38.5,38.5,38.5), - particlePt = cms.vdouble(36.125, 36.125, # eta - 35.25, 35.25, # eta' - 34.75, 34.75, # omega - 32.25, 32.25, # pi - 32.25, # pi0 - 31.5, # K0 - 38.75, 38.75, # e - 71.625 # gamma - ) - ) - - - - - - - - - - diff --git a/trunk/GeneratorInterface/PyquenInterface/python/pyquenEcalTrig_cfi.py b/trunk/GeneratorInterface/PyquenInterface/python/pyquenEcalTrig_cfi.py index f8d4e8ec30fc1..3dbe294e52812 100644 --- a/trunk/GeneratorInterface/PyquenInterface/python/pyquenEcalTrig_cfi.py +++ b/trunk/GeneratorInterface/PyquenInterface/python/pyquenEcalTrig_cfi.py @@ -3,7 +3,7 @@ import FWCore.ParameterSet.Config as cms from GeneratorInterface.PyquenInterface.pyquenPythiaDefault_cff import * -from GeneratorInterface.PyquenInterface.ecalTrigSettings_cff import * +from GeneratorInterface.HiGenCommon.ecalTrigSettings_cff import * generator = cms.EDFilter("PyquenGeneratorFilter", ecalTrigPt100,