Skip to content

Commit

Permalink
Merge pull request #12267 from hengne/from-CMSSW_7_1_20_patch2_relval…
Browse files Browse the repository at this point in the history
…_rebase

matrix update for relval after 7_1_20_patch2 gensim
  • Loading branch information
davidlange6 committed Nov 10, 2015
2 parents e354540 + 7527ed1 commit 90c9075
Show file tree
Hide file tree
Showing 10 changed files with 240 additions and 29 deletions.
10 changes: 5 additions & 5 deletions Configuration/AlCa/python/autoCond.py
Expand Up @@ -13,8 +13,8 @@
# then it should point to the GR_H tag and override the connection string and pfnPrefix for use offline
'hltonline' : 'GR_H_V37::All,frontier://FrontierProd/CMS_COND_31X_GLOBALTAG,frontier://FrontierProd/',
# GlobalTag for POSTLS1 upgrade studies:
'upgradePLS1' : 'MCRUN2_71_V1::All',
'upgradePLS150ns' : 'MCRUN2_71_V0::All',
'upgradePLS1' : 'MCRUN2_71_V3::All',
'upgradePLS150ns' : 'MCRUN2_71_V2::All',
'upgrade2017' : 'DES17_70_V2::All', # placeholder (GT not meant for standard RelVal)
'upgrade2019' : 'DES19_70_V2::All', # placeholder (GT not meant for standard RelVal)
'upgradePLS3' : 'POSTLS262_V1::All', # placeholder (GT not meant for standard RelVal)
Expand All @@ -29,11 +29,11 @@
# GlobalTag for MC production (p-Pb collisions) with realistic alignment and calibrations for Run1
'run1_mc_pPb' : 'STARTHI71_V16::All',
# GlobalTag for MC production with perfectly aligned and calibrated detector for Run2
'run2_design' : 'DESRUN2_71_V0::All',
'run2_design' : 'DESRUN2_71_V1::All',
# GlobalTag for MC production with pessimistic alignment and calibrations for Run2
'run2_mc_50ns' : 'MCRUN2_71_V0::All',
'run2_mc_50ns' : 'MCRUN2_71_V2::All',
#GlobalTag for MC production with optimistic alignment and calibrations for Run2
'run2_mc' : 'MCRUN2_71_V1::All',
'run2_mc' : 'MCRUN2_71_V3::All',
# GlobalTag for Run1 data reprocessing
'run1_data' : 'GR_R_71_V7::All',
# GlobalTag for Run2 data reprocessing
Expand Down
@@ -0,0 +1,60 @@
##!!!For BPH Trigger and Generator study only, not ok for physics use.
import FWCore.ParameterSet.Config as cms
from Configuration.Generator.Pythia8CommonSettings_cfi import *
from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import *
from GeneratorInterface.EvtGenInterface.EvtGenSetting_cff import *
generator = cms.EDFilter("Pythia8GeneratorFilter",
pythiaPylistVerbosity = cms.untracked.int32(0),
pythiaHepMCVerbosity = cms.untracked.bool(False),
comEnergy = cms.double(13000.0),
maxEventsToPrint = cms.untracked.int32(0),
ExternalDecays = cms.PSet(
EvtGen130 = cms.untracked.PSet(
decay_table = cms.string('GeneratorInterface/EvtGenInterface/data/DECAY_2010.DEC'),
particle_property_file = cms.FileInPath('GeneratorInterface/EvtGenInterface/data/evt.pdl'),
user_decay_file = cms.vstring('GeneratorInterface/ExternalDecays/data/Bu_Mixing.dec'),
list_forced_decays = cms.vstring('MyB+',
'MyB-'),
operates_on_particles = cms.vint32()
),
parameterSets = cms.vstring('EvtGen130')
),
PythiaParameters = cms.PSet(
pythia8CommonSettingsBlock,
pythia8CUEP8M1SettingsBlock,
processParameters = cms.vstring(
'HardQCD:all = on',
'PhaseSpace:pTHatMin = 8',
),
parameterSets = cms.vstring('pythia8CommonSettings',
'pythia8CUEP8M1Settings',
'processParameters',
)
)
)
generator.PythiaParameters.processParameters.extend(EvtGenExtraParticles)
configurationMetadata = cms.untracked.PSet(
version = cms.untracked.string('$Revision: 1.1 $'),
name = cms.untracked.string('$Source: Configuration/Generator/python/BuToKstarMuMu_forSTEAM_13TeV_TuneCUETP8M1_cfi.py $'),
annotation = cms.untracked.string('Summer14: Pythia8+EvtGen130 generation of Bu --> K* Mu+Mu-, 13TeV, Tune CUETP8M1')
)

mumugenfilter = cms.EDFilter("MCParticlePairFilter",
Status = cms.untracked.vint32(1, 1),
MinPt = cms.untracked.vdouble(0.5, 0.5),
MinP = cms.untracked.vdouble(0., 0.),
MaxEta = cms.untracked.vdouble(2.5, 2.5),
MinEta = cms.untracked.vdouble(-2.5, -2.5),
MinInvMass = cms.untracked.double(2.0),
MaxInvMass = cms.untracked.double(4.0),
ParticleCharge = cms.untracked.int32(-1),
ParticleID1 = cms.untracked.vint32(13),
ParticleID2 = cms.untracked.vint32(13)
)

###########
# Filters #
###########
# Filter only pp events which produce a B+:
bufilter = cms.EDFilter("PythiaFilter", ParticleID = cms.untracked.int32(521))
ProductionFilterSequence = cms.Sequence(generator*bufilter*mumugenfilter)
@@ -0,0 +1,59 @@
# For BPH trigger study only
import FWCore.ParameterSet.Config as cms
from Configuration.Generator.Pythia8CommonSettings_cfi import *
from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import *
generator = cms.EDFilter("Pythia8GeneratorFilter",
maxEventsToPrint = cms.untracked.int32(1),
pythiaPylistVerbosity = cms.untracked.int32(1),
filterEfficiency = cms.untracked.double(1.0),
pythiaHepMCVerbosity = cms.untracked.bool(False),
comEnergy = cms.double(13000.),
PythiaParameters = cms.PSet(
pythia8CommonSettingsBlock,
pythia8CUEP8M1SettingsBlock,
pythiaEtab = cms.vstring(
'Higgs:useBSM = on',
'HiggsBSM:gg2H2 = on',
'HiggsH2:coup2d = 10.0',
'HiggsH2:coup2u = 10.0',
'HiggsH2:coup2Z = 0.0',
'HiggsH2:coup2W = 0.0',
'HiggsA3:coup2H2Z = 0.0',
'HiggsH2:coup2A3A3 = 0.0',
'HiggsH2:coup2H1H1 = 0.0',
'443:onMode = off',
'443:onIfMatch 13 13',
'333:onMode = off',
'333:onIfMatch 13 13',
'553:onMode = off',
'553:onIfMatch 13 13',
############# For Fixed Mass Distribution#############
'35:mMin = 0',
'35:mMax = 50.0',
'35:m0 = 7.0',
'35:mWidth = 0.00',
'35:addChannel 1 1.00 100 443 443',
'35:onMode = off',
'35:onIfMatch 443 443'), ## JpsiJpsi
# This is a vector of ParameterSet names to be read, in this order
parameterSets = cms.vstring('pythia8CommonSettings',
'pythia8CUEP8M1Settings',
'pythiaEtab')
)
)
etafilter = cms.EDFilter("PythiaFilter",
MaxEta = cms.untracked.double(9999.0),
MinEta = cms.untracked.double(-9999.0),
ParticleID = cms.untracked.int32(35)
)
jpsifilter = cms.EDFilter("PythiaDauVFilter",
MotherID = cms.untracked.int32(10551),
verbose = cms.untracked.int32(0),
ParticleID = cms.untracked.int32(443),
MaxEta = cms.untracked.vdouble(2.6, 2.6),
MinEta = cms.untracked.vdouble(-2.6, -2.6),
DaughterIDs = cms.untracked.vint32(13, -13),
MinPt = cms.untracked.vdouble(1.8, 1.8),
NumberDaughters = cms.untracked.int32(2)
)
ProductionFilterSequence = cms.Sequence(generator*etafilter)
@@ -0,0 +1,44 @@
# For BPH Trigger Study Only
import FWCore.ParameterSet.Config as cms
from Configuration.Generator.Pythia8CommonSettings_cfi import *
from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import *

generator = cms.EDFilter("Pythia8GeneratorFilter",
maxEventsToPrint = cms.untracked.int32(1),
pythiaPylistVerbosity = cms.untracked.int32(1),
filterEfficiency = cms.untracked.double(1.0),
pythiaHepMCVerbosity = cms.untracked.bool(False),
comEnergy = cms.double(13000.),
PythiaParameters = cms.PSet(
pythia8CommonSettingsBlock,
pythia8CUEP8M1SettingsBlock,
pythiaPhi = cms.vstring(
'SoftQCD:nonDiffractive = on',
'SoftQCD:singleDiffractive = on',
'SoftQCD:doubleDiffractive = on',
'333:onMode = off',
'333:onIfMatch 13 13'),
parameterSets = cms.vstring('pythia8CommonSettings',
'pythia8CUEP8M1Settings',
'pythiaPhi')
)
)

phifilter = cms.EDFilter("PythiaFilter",
Status = cms.untracked.int32(2),
MaxEta = cms.untracked.double(1000.0),
MinEta = cms.untracked.double(-1000.0),
MinPt = cms.untracked.double(-1.0),
ParticleID = cms.untracked.int32(333)
)

mumugenfilter = cms.EDFilter("MCParticlePairFilter",
Status = cms.untracked.vint32(1, 1),
MinPt = cms.untracked.vdouble(0.0, 0.0),
MaxEta = cms.untracked.vdouble(2.5, 2.5),
MinEta = cms.untracked.vdouble(-2.5, -2.5),
ParticleCharge = cms.untracked.int32(-1),
ParticleID1 = cms.untracked.vint32(13),
ParticleID2 = cms.untracked.vint32(13)
)
ProductionFilterSequence = cms.Sequence(generator*phifilter*mumugenfilter)
4 changes: 2 additions & 2 deletions Configuration/PyReleaseValidation/python/relval_pileup.py
Expand Up @@ -31,7 +31,7 @@
workflows[50200]=['',['ZEE_13','DIGIUP15_PU50','RECOUP15_PU50','HARVEST','MINIAODMC50']]
workflows[50201]=['',['ZmumuJets_Pt_20_300_13','DIGIUP15_PU50','RECOUP15_PU50','HARVEST','MINIAODMC50']]
workflows[50202]=['',['TTbar_13','DIGIUP15_PU50','RECOUP15_PU50','HARVEST','MINIAODMC50']]
workflows[50203]=['',['H130GGgluonfusion_13','DIGIUP15_PU50','RECOUP15_PU50','HARVEST','MINIAODMC50']]
workflows[50203]=['',['H125GGgluonfusion_13','DIGIUP15_PU50','RECOUP15_PU50','HARVEST','MINIAODMC50']]
workflows[50204]=['',['QQH1352T_13','DIGIUP15_PU50','RECOUP15_PU50','HARVEST','MINIAODMC50']]
workflows[50205]=['',['ZTT_13','DIGIUP15_PU50','RECOUP15_PU50','HARVEST','MINIAODMC50']]

Expand All @@ -42,7 +42,7 @@
workflows[25201]=['',['ZmumuJets_Pt_20_300_13','DIGIUP15_PU25','RECOUP15_PU25','HARVEST','MINIAODMC']]
# cannot be recycled => GEN SIM NEEDED!
workflows[25202]=['',['TTbar_13','DIGIUP15_PU25','RECOUP15_PU25','HARVEST','MINIAODMC']]
workflows[25203]=['',['H130GGgluonfusion_13','DIGIUP15_PU25','RECOUP15_PU25','HARVEST','MINIAODMC']]
workflows[25203]=['',['H125GGgluonfusion_13','DIGIUP15_PU25','RECOUP15_PU25','HARVEST','MINIAODMC']]
workflows[25204]=['',['QQH1352T_13','DIGIUP15_PU25','RECOUP15_PU25','HARVEST','MINIAODMC']]
workflows[25205]=['',['ZTT_13','DIGIUP15_PU25','RECOUP15_PU25','HARVEST','MINIAODMC']]

Expand Down
4 changes: 2 additions & 2 deletions Configuration/PyReleaseValidation/python/relval_premix.py
Expand Up @@ -18,7 +18,7 @@
workflows[250200]=['',['ZEE_13','DIGIPRMXUP15_PU25','RECOPRMXUP15_PU25','HARVEST']]
workflows[250201]=['',['ZmumuJets_Pt_20_300_13','DIGIPRMXUP15_PU25','RECOPRMXUP15_PU25','HARVEST']]
workflows[250202]=['',['TTbar_13','DIGIPRMXUP15_PU25','RECOPRMXUP15_PU25','HARVEST']]
workflows[250203]=['',['H130GGgluonfusion_13','DIGIPRMXUP15_PU25','RECOPRMXUP15_PU25','HARVEST']]
workflows[250203]=['',['H125GGgluonfusion_13','DIGIPRMXUP15_PU25','RECOPRMXUP15_PU25','HARVEST']]
workflows[250204]=['',['QQH1352T_13','DIGIPRMXUP15_PU25','RECOPRMXUP15_PU25','HARVEST']]
workflows[250205]=['',['ZTT_13','DIGIPRMXUP15_PU25','RECOPRMXUP15_PU25','HARVEST']]

Expand All @@ -27,7 +27,7 @@
workflows[500200]=['',['ZEE_13','DIGIPRMXUP15_PU50','RECOPRMXUP15_PU50','HARVEST']]
workflows[500201]=['',['ZmumuJets_Pt_20_300_13','DIGIPRMXUP15_PU50','RECOPRMXUP15_PU50','HARVEST']]
workflows[500202]=['',['TTbar_13','DIGIPRMXUP15_PU50','RECOPRMXUP15_PU50','HARVEST']]
workflows[500203]=['',['H130GGgluonfusion_13','DIGIPRMXUP15_PU50','RECOPRMXUP15_PU50','HARVEST']]
workflows[500203]=['',['H125GGgluonfusion_13','DIGIPRMXUP15_PU50','RECOPRMXUP15_PU50','HARVEST']]
workflows[500204]=['',['QQH1352T_13','DIGIPRMXUP15_PU50','RECOPRMXUP15_PU50','HARVEST']]
workflows[500205]=['',['ZTT_13','DIGIPRMXUP15_PU50','RECOPRMXUP15_PU50','HARVEST']]

Expand Down
13 changes: 5 additions & 8 deletions Configuration/PyReleaseValidation/python/relval_standard.py
Expand Up @@ -118,7 +118,7 @@
workflows[135.5] = ['ZTT_13',['ZTTFS_13','HARVESTUP15FS']]

workflows[135.6] = ['QCD_FlatPt_15_3000_13', ['QCDFlatPt153000FS_13','HARVESTUP15FS']]
workflows[135.7] = ['H130GGgluonfusion_13', ['H130GGgluonfusionFS_13','HARVESTUP15FS']]
workflows[135.7] = ['H125GGgluonfusion_13', ['H125GGgluonfusionFS_13','HARVESTUP15FS']]

### MinBias fastsim_13 TeV for mixing ###
workflows[135.8] = ['',['MinBiasFS_13_ForMixing']]
Expand Down Expand Up @@ -188,7 +188,6 @@
workflows[1324] = ['', ['TTbarLepton_13','DIGIUP15','RECOUP15','HARVESTUP15']]
workflows[1335] = ['', ['Wjet_Pt_80_120_13','DIGIUP15','RECOUP15','HARVESTUP15']]
workflows[1336] = ['', ['Wjet_Pt_3000_3500_13','DIGIUP15','RECOUP15','HARVESTUP15']]
#workflows[1337] = ['', ['LM1_sfts_13','DIGIUP15','RECOUP15','HARVESTUP15']]
workflows[1337] = ['', ['SMS-T1tttt_mGl-1500_mLSP-100_13','DIGIUP15','RECOUP15','HARVESTUP15']]
workflows[1338] = ['', ['QCD_FlatPt_15_3000HS_13','DIGIUP15','RECOUP15','HARVESTUP15']]

Expand All @@ -199,18 +198,17 @@
workflows[1326] = ['', ['WE_13','DIGIUP15','RECOUP15','HARVESTUP15']]
workflows[1329] = ['', ['ZEE_13','DIGIUP15','RECOUP15','HARVESTUP15','ALCAELE']]
workflows[1331] = ['', ['ZTT_13','DIGIUP15','RECOUP15','HARVESTUP15']]
workflows[1332] = ['', ['H130GGgluonfusion_13','DIGIUP15','RECOUP15','HARVESTUP15']]
workflows[1332] = ['', ['H125GGgluonfusion_13','DIGIUP15','RECOUP15','HARVESTUP15']]
workflows[1333] = ['', ['PhotonJets_Pt_10_13','DIGIUP15','RECOUP15','HARVESTUP15']]
workflows[1334] = ['', ['QQH1352T_13','DIGIUP15','RECOUP15','HARVESTUP15']]
workflows[1346] = ['', ['ZmumuJets_Pt_20_300_13']]

workflows[1347] = ['', ['Upsilon1SToMuMu_13','DIGIUP15','RECOUP15','HARVESTUP15']]
workflows[1348] = ['', ['BuToKstarMuMu_13','DIGIUP15','RECOUP15','HARVESTUP15']]
workflows[1348] = ['', ['EtaBToJpsiJpsi_13','DIGIUP15','RECOUP15','HARVESTUP15']]
workflows[1349] = ['', ['BsToMuMu_13','DIGIUP15','RECOUP15','HARVESTUP15']]
workflows[1350] = ['', ['JpsiMuMu_Pt-15','DIGIUP15','RECOUP15','HARVESTUP15']]
workflows[1351] = ['', ['BuToKstarPsi2S_13','DIGIUP15','RECOUP15','HARVESTUP15']]
workflows[1351] = ['', ['BuMixing_13','DIGIUP15','RECOUP15','HARVESTUP15']]

#workflows[1307] = ['', ['Cosmics_UP15','DIGIHAL','RECOHAL','ALCAHAL','HARVESTHAL']]
workflows[1307] = ['', ['CosmicsSPLoose_UP15','DIGIHAL','RECOHAL','ALCAHAL','HARVESTHAL']]
workflows[1308] = ['', ['BeamHalo_13','DIGIHAL','RECOHAL','ALCAHAL','HARVESTHAL']]
workflows[1311] = ['', ['MinBias_13','DIGIUP15','RECOMINUP15','HARVESTUP15','ALCAMIN']]
Expand All @@ -222,7 +220,7 @@
workflows[1312] = ['', ['ZpMM_13','DIGIUP15','RECOUP15','HARVESTUP15']]
workflows[1314] = ['', ['WpM_13','DIGIUP15','RECOUP15','HARVESTUP15']]

workflows[1340] = ['', ['BuJpsiK_13','DIGIUP15','RECOUP15','HARVESTUP15']]
workflows[1340] = ['', ['PhiToMuMu_13','DIGIUP15','RECOUP15','HARVESTUP15']]
workflows[1341] = ['', ['RSKKGluon_m3000GeV_13','DIGIUP15','RECOUP15','HARVESTUP15']]

workflows[1343] = ['', ['ZpMM_2250_13','DIGIUP15','RECOUP15','HARVESTUP15']]
Expand All @@ -234,7 +232,6 @@

workflows[1355] = ['', ['DisplacedSUSY_stopToBottom_M_300_1000mm_13','DIGIUP15','RECOUP15','HARVESTUP15']]


### HI test ###
workflows[140] = ['',['HydjetQ_MinBias_2760GeV','DIGIHI','RECOHI','HARVESTHI']]
workflows[141] = ['',['HydjetQ_B0_2760GeV','DIGIHI','RECOHI','HARVESTHI']]
Expand Down

0 comments on commit 90c9075

Please sign in to comment.