From 2e975ebf924fb05fb9d513a2bfec446ae4f783bb Mon Sep 17 00:00:00 2001 From: Andreas Hinzmann Date: Wed, 10 Jul 2019 14:52:09 +0200 Subject: [PATCH] update to latest rivet --- FlatQCD-Herwig7-13000GeV_cfg_default.py | 2 +- FlatQCD-TuneCP5-Pythia8-13000GeV_cfg_A14-CR1.py | 2 +- FlatQCD-TuneCP5-Pythia8-13000GeV_cfg_A14-CR2.py | 2 +- FlatQCD-TuneCP5-Pythia8-13000GeV_cfg_A14.py | 2 +- FlatQCD-TuneCP5-Pythia8-13000GeV_cfg_CP1.py | 2 +- FlatQCD-TuneCP5-Pythia8-13000GeV_cfg_CP5-CR1.py | 2 +- FlatQCD-TuneCP5-Pythia8-13000GeV_cfg_CP5-CR2o.py | 2 +- FlatQCD-TuneCP5-Pythia8-13000GeV_cfg_CP5.py | 2 +- FlatQCD-TuneCP5-Pythia8-13000GeV_cfg_CUETP8M1.py | 2 +- FlatQCD-TuneCP5-Pythia8-13000GeV_cfg_FSR.py | 2 +- FlatQCD-TuneCP5-Pythia8-13000GeV_cfg_FSRalphaS.py | 2 +- FlatQCD-TuneCP5-Pythia8-13000GeV_cfg_FSRpTmin.py | 2 +- FlatQCD-TuneCP5-Pythia8-13000GeV_cfg_ISRalphaS.py | 2 +- TTbar-TuneCP5-Pythia8-13000GeV_cfg_A14-CR1.py | 2 +- TTbar-TuneCP5-Pythia8-13000GeV_cfg_A14-CR2.py | 2 +- TTbar-TuneCP5-Pythia8-13000GeV_cfg_A14.py | 2 +- TTbar-TuneCP5-Pythia8-13000GeV_cfg_AllCR0.py | 2 +- TTbar-TuneCP5-Pythia8-13000GeV_cfg_AllCR1.py | 2 +- TTbar-TuneCP5-Pythia8-13000GeV_cfg_CP1.py | 2 +- TTbar-TuneCP5-Pythia8-13000GeV_cfg_CP5-CR1.py | 2 +- TTbar-TuneCP5-Pythia8-13000GeV_cfg_CP5-CR2o.py | 2 +- TTbar-TuneCP5-Pythia8-13000GeV_cfg_CP5.py | 2 +- TTbar-TuneCP5-Pythia8-13000GeV_cfg_CUETP8M1.py | 2 +- TTbar-TuneCP5-Pythia8-13000GeV_cfg_ColorReconnection.py | 2 +- TTbar-TuneCP5-Pythia8-13000GeV_cfg_FSR.py | 2 +- TTbar-TuneCP5-Pythia8-13000GeV_cfg_FSRalphaS.py | 2 +- TTbar-TuneCP5-Pythia8-13000GeV_cfg_FSRpTmin.py | 2 +- TTbar-TuneCP5-Pythia8-13000GeV_cfg_ISRalphaS.py | 2 +- analyse.py | 3 ++- renormalize.py | 2 +- submit_mcpoint_checkifexist_lxplus.py | 1 + 31 files changed, 32 insertions(+), 30 deletions(-) diff --git a/FlatQCD-Herwig7-13000GeV_cfg_default.py b/FlatQCD-Herwig7-13000GeV_cfg_default.py index b76f456..c3aa169 100755 --- a/FlatQCD-Herwig7-13000GeV_cfg_default.py +++ b/FlatQCD-Herwig7-13000GeV_cfg_default.py @@ -167,7 +167,7 @@ def customise(process): process.load('GeneratorInterface.RivetInterface.rivetAnalyzer_cfi') - process.rivetAnalyzer.AnalysisNames = cms.vstring('CMS_2018_SMP_16_010','CMS_2016_I1459051') + process.rivetAnalyzer.AnalysisNames = cms.vstring('CMS_2018_I1682495','CMS_2016_I1459051') process.rivetAnalyzer.CrossSection = cms.double(1.0) process.rivetAnalyzer.OutputFile = cms.string('H7-QCD-13TeV.yoda') process.rivetAnalyzer.UseExternalWeight = cms.bool(True) diff --git a/FlatQCD-TuneCP5-Pythia8-13000GeV_cfg_A14-CR1.py b/FlatQCD-TuneCP5-Pythia8-13000GeV_cfg_A14-CR1.py index 5abcdf5..0c62c5d 100644 --- a/FlatQCD-TuneCP5-Pythia8-13000GeV_cfg_A14-CR1.py +++ b/FlatQCD-TuneCP5-Pythia8-13000GeV_cfg_A14-CR1.py @@ -133,7 +133,7 @@ def customise(process): process.load('GeneratorInterface.RivetInterface.rivetAnalyzer_cfi') - process.rivetAnalyzer.AnalysisNames = cms.vstring('CMS_2018_SMP_16_010','CMS_2016_I1459051') + process.rivetAnalyzer.AnalysisNames = cms.vstring('CMS_2018_I1682495','CMS_2016_I1459051') process.rivetAnalyzer.CrossSection = cms.double(1.0) process.rivetAnalyzer.OutputFile = cms.string('QCD-13TeV.yoda') process.rivetAnalyzer.UseExternalWeight = cms.bool(True) diff --git a/FlatQCD-TuneCP5-Pythia8-13000GeV_cfg_A14-CR2.py b/FlatQCD-TuneCP5-Pythia8-13000GeV_cfg_A14-CR2.py index 0663fc8..9f6c1d7 100644 --- a/FlatQCD-TuneCP5-Pythia8-13000GeV_cfg_A14-CR2.py +++ b/FlatQCD-TuneCP5-Pythia8-13000GeV_cfg_A14-CR2.py @@ -133,7 +133,7 @@ def customise(process): process.load('GeneratorInterface.RivetInterface.rivetAnalyzer_cfi') - process.rivetAnalyzer.AnalysisNames = cms.vstring('CMS_2018_SMP_16_010','CMS_2016_I1459051') + process.rivetAnalyzer.AnalysisNames = cms.vstring('CMS_2018_I1682495','CMS_2016_I1459051') process.rivetAnalyzer.CrossSection = cms.double(1.0) process.rivetAnalyzer.OutputFile = cms.string('QCD-13TeV.yoda') process.rivetAnalyzer.UseExternalWeight = cms.bool(True) diff --git a/FlatQCD-TuneCP5-Pythia8-13000GeV_cfg_A14.py b/FlatQCD-TuneCP5-Pythia8-13000GeV_cfg_A14.py index 877f47e..0c8d194 100644 --- a/FlatQCD-TuneCP5-Pythia8-13000GeV_cfg_A14.py +++ b/FlatQCD-TuneCP5-Pythia8-13000GeV_cfg_A14.py @@ -126,7 +126,7 @@ def customise(process): process.load('GeneratorInterface.RivetInterface.rivetAnalyzer_cfi') - process.rivetAnalyzer.AnalysisNames = cms.vstring('CMS_2018_SMP_16_010','CMS_2016_I1459051') + process.rivetAnalyzer.AnalysisNames = cms.vstring('CMS_2018_I1682495','CMS_2016_I1459051') process.rivetAnalyzer.CrossSection = cms.double(1.0) process.rivetAnalyzer.OutputFile = cms.string('QCD-13TeV.yoda') process.rivetAnalyzer.UseExternalWeight = cms.bool(True) diff --git a/FlatQCD-TuneCP5-Pythia8-13000GeV_cfg_CP1.py b/FlatQCD-TuneCP5-Pythia8-13000GeV_cfg_CP1.py index 783f2bc..eb8b657 100644 --- a/FlatQCD-TuneCP5-Pythia8-13000GeV_cfg_CP1.py +++ b/FlatQCD-TuneCP5-Pythia8-13000GeV_cfg_CP1.py @@ -136,7 +136,7 @@ def customise(process): process.load('GeneratorInterface.RivetInterface.rivetAnalyzer_cfi') - process.rivetAnalyzer.AnalysisNames = cms.vstring('CMS_2018_SMP_16_010','CMS_2016_I1459051') + process.rivetAnalyzer.AnalysisNames = cms.vstring('CMS_2018_I1682495','CMS_2016_I1459051') process.rivetAnalyzer.CrossSection = cms.double(1.0) process.rivetAnalyzer.OutputFile = cms.string('QCD-13TeV.yoda') process.rivetAnalyzer.UseExternalWeight = cms.bool(True) diff --git a/FlatQCD-TuneCP5-Pythia8-13000GeV_cfg_CP5-CR1.py b/FlatQCD-TuneCP5-Pythia8-13000GeV_cfg_CP5-CR1.py index 2753de9..6ab580c 100644 --- a/FlatQCD-TuneCP5-Pythia8-13000GeV_cfg_CP5-CR1.py +++ b/FlatQCD-TuneCP5-Pythia8-13000GeV_cfg_CP5-CR1.py @@ -149,7 +149,7 @@ def customise(process): process.load('GeneratorInterface.RivetInterface.rivetAnalyzer_cfi') - process.rivetAnalyzer.AnalysisNames = cms.vstring('CMS_2018_SMP_16_010','CMS_2016_I1459051') + process.rivetAnalyzer.AnalysisNames = cms.vstring('CMS_2018_I1682495','CMS_2016_I1459051') process.rivetAnalyzer.CrossSection = cms.double(1.0) process.rivetAnalyzer.OutputFile = cms.string('QCD-13TeV.yoda') process.rivetAnalyzer.UseExternalWeight = cms.bool(True) diff --git a/FlatQCD-TuneCP5-Pythia8-13000GeV_cfg_CP5-CR2o.py b/FlatQCD-TuneCP5-Pythia8-13000GeV_cfg_CP5-CR2o.py index 6f25cc8..7451c68 100644 --- a/FlatQCD-TuneCP5-Pythia8-13000GeV_cfg_CP5-CR2o.py +++ b/FlatQCD-TuneCP5-Pythia8-13000GeV_cfg_CP5-CR2o.py @@ -144,7 +144,7 @@ def customise(process): process.load('GeneratorInterface.RivetInterface.rivetAnalyzer_cfi') - process.rivetAnalyzer.AnalysisNames = cms.vstring('CMS_2018_SMP_16_010','CMS_2016_I1459051') + process.rivetAnalyzer.AnalysisNames = cms.vstring('CMS_2018_I1682495','CMS_2016_I1459051') process.rivetAnalyzer.CrossSection = cms.double(1.0) process.rivetAnalyzer.OutputFile = cms.string('QCD-13TeV.yoda') process.rivetAnalyzer.UseExternalWeight = cms.bool(True) diff --git a/FlatQCD-TuneCP5-Pythia8-13000GeV_cfg_CP5.py b/FlatQCD-TuneCP5-Pythia8-13000GeV_cfg_CP5.py index 42d1869..8b1cbc4 100644 --- a/FlatQCD-TuneCP5-Pythia8-13000GeV_cfg_CP5.py +++ b/FlatQCD-TuneCP5-Pythia8-13000GeV_cfg_CP5.py @@ -145,7 +145,7 @@ def customise(process): process.load('GeneratorInterface.RivetInterface.rivetAnalyzer_cfi') - process.rivetAnalyzer.AnalysisNames = cms.vstring('CMS_2018_SMP_16_010','CMS_2016_I1459051') + process.rivetAnalyzer.AnalysisNames = cms.vstring('CMS_2018_I1682495','CMS_2016_I1459051') process.rivetAnalyzer.CrossSection = cms.double(1.0) process.rivetAnalyzer.OutputFile = cms.string('QCD-13TeV.yoda') process.rivetAnalyzer.UseExternalWeight = cms.bool(True) diff --git a/FlatQCD-TuneCP5-Pythia8-13000GeV_cfg_CUETP8M1.py b/FlatQCD-TuneCP5-Pythia8-13000GeV_cfg_CUETP8M1.py index ccd45cb..348ba21 100644 --- a/FlatQCD-TuneCP5-Pythia8-13000GeV_cfg_CUETP8M1.py +++ b/FlatQCD-TuneCP5-Pythia8-13000GeV_cfg_CUETP8M1.py @@ -126,7 +126,7 @@ def customise(process): process.load('GeneratorInterface.RivetInterface.rivetAnalyzer_cfi') - process.rivetAnalyzer.AnalysisNames = cms.vstring('CMS_2018_SMP_16_010','CMS_2016_I1459051') + process.rivetAnalyzer.AnalysisNames = cms.vstring('CMS_2018_I1682495','CMS_2016_I1459051') process.rivetAnalyzer.CrossSection = cms.double(1.0) process.rivetAnalyzer.OutputFile = cms.string('QCD-13TeV.yoda') process.rivetAnalyzer.UseExternalWeight = cms.bool(True) diff --git a/FlatQCD-TuneCP5-Pythia8-13000GeV_cfg_FSR.py b/FlatQCD-TuneCP5-Pythia8-13000GeV_cfg_FSR.py index 842ae31..373e151 100644 --- a/FlatQCD-TuneCP5-Pythia8-13000GeV_cfg_FSR.py +++ b/FlatQCD-TuneCP5-Pythia8-13000GeV_cfg_FSR.py @@ -145,7 +145,7 @@ def customise(process): process.load('GeneratorInterface.RivetInterface.rivetAnalyzer_cfi') - process.rivetAnalyzer.AnalysisNames = cms.vstring('CMS_2018_SMP_16_010','CMS_2016_I1459051') + process.rivetAnalyzer.AnalysisNames = cms.vstring('CMS_2018_I1682495','CMS_2016_I1459051') process.rivetAnalyzer.CrossSection = cms.double(1.0) process.rivetAnalyzer.OutputFile = cms.string('QCD-13TeV.yoda') process.rivetAnalyzer.UseExternalWeight = cms.bool(True) diff --git a/FlatQCD-TuneCP5-Pythia8-13000GeV_cfg_FSRalphaS.py b/FlatQCD-TuneCP5-Pythia8-13000GeV_cfg_FSRalphaS.py index db0cbda..c1b2ac6 100644 --- a/FlatQCD-TuneCP5-Pythia8-13000GeV_cfg_FSRalphaS.py +++ b/FlatQCD-TuneCP5-Pythia8-13000GeV_cfg_FSRalphaS.py @@ -145,7 +145,7 @@ def customise(process): process.load('GeneratorInterface.RivetInterface.rivetAnalyzer_cfi') - process.rivetAnalyzer.AnalysisNames = cms.vstring('CMS_2018_SMP_16_010','CMS_2016_I1459051') + process.rivetAnalyzer.AnalysisNames = cms.vstring('CMS_2018_I1682495','CMS_2016_I1459051') process.rivetAnalyzer.CrossSection = cms.double(1.0) process.rivetAnalyzer.OutputFile = cms.string('QCD-13TeV.yoda') process.rivetAnalyzer.UseExternalWeight = cms.bool(True) diff --git a/FlatQCD-TuneCP5-Pythia8-13000GeV_cfg_FSRpTmin.py b/FlatQCD-TuneCP5-Pythia8-13000GeV_cfg_FSRpTmin.py index c55868a..584fc0e 100644 --- a/FlatQCD-TuneCP5-Pythia8-13000GeV_cfg_FSRpTmin.py +++ b/FlatQCD-TuneCP5-Pythia8-13000GeV_cfg_FSRpTmin.py @@ -145,7 +145,7 @@ def customise(process): process.load('GeneratorInterface.RivetInterface.rivetAnalyzer_cfi') - process.rivetAnalyzer.AnalysisNames = cms.vstring('CMS_2018_SMP_16_010','CMS_2016_I1459051') + process.rivetAnalyzer.AnalysisNames = cms.vstring('CMS_2018_I1682495','CMS_2016_I1459051') process.rivetAnalyzer.CrossSection = cms.double(1.0) process.rivetAnalyzer.OutputFile = cms.string('QCD-13TeV.yoda') process.rivetAnalyzer.UseExternalWeight = cms.bool(True) diff --git a/FlatQCD-TuneCP5-Pythia8-13000GeV_cfg_ISRalphaS.py b/FlatQCD-TuneCP5-Pythia8-13000GeV_cfg_ISRalphaS.py index 2b6a2cc..c937d20 100644 --- a/FlatQCD-TuneCP5-Pythia8-13000GeV_cfg_ISRalphaS.py +++ b/FlatQCD-TuneCP5-Pythia8-13000GeV_cfg_ISRalphaS.py @@ -145,7 +145,7 @@ def customise(process): process.load('GeneratorInterface.RivetInterface.rivetAnalyzer_cfi') - process.rivetAnalyzer.AnalysisNames = cms.vstring('CMS_2018_SMP_16_010','CMS_2016_I1459051') + process.rivetAnalyzer.AnalysisNames = cms.vstring('CMS_2018_I1682495','CMS_2016_I1459051') process.rivetAnalyzer.CrossSection = cms.double(1.0) process.rivetAnalyzer.OutputFile = cms.string('QCD-13TeV.yoda') process.rivetAnalyzer.UseExternalWeight = cms.bool(True) diff --git a/TTbar-TuneCP5-Pythia8-13000GeV_cfg_A14-CR1.py b/TTbar-TuneCP5-Pythia8-13000GeV_cfg_A14-CR1.py index 5148610..8b700e3 100644 --- a/TTbar-TuneCP5-Pythia8-13000GeV_cfg_A14-CR1.py +++ b/TTbar-TuneCP5-Pythia8-13000GeV_cfg_A14-CR1.py @@ -130,7 +130,7 @@ def customise(process): process.load('GeneratorInterface.RivetInterface.rivetAnalyzer_cfi') - process.rivetAnalyzer.AnalysisNames = cms.vstring('CMS_2017_PAS_TOP_17_013') + process.rivetAnalyzer.AnalysisNames = cms.vstring('CMS_2018_I1690148') process.rivetAnalyzer.CrossSection = cms.double(1.0) process.rivetAnalyzer.OutputFile = cms.string('TTbar-13TeV.yoda') process.generation_step+=process.rivetAnalyzer diff --git a/TTbar-TuneCP5-Pythia8-13000GeV_cfg_A14-CR2.py b/TTbar-TuneCP5-Pythia8-13000GeV_cfg_A14-CR2.py index 2c939b4..5c2e736 100644 --- a/TTbar-TuneCP5-Pythia8-13000GeV_cfg_A14-CR2.py +++ b/TTbar-TuneCP5-Pythia8-13000GeV_cfg_A14-CR2.py @@ -130,7 +130,7 @@ def customise(process): process.load('GeneratorInterface.RivetInterface.rivetAnalyzer_cfi') - process.rivetAnalyzer.AnalysisNames = cms.vstring('CMS_2017_PAS_TOP_17_013') + process.rivetAnalyzer.AnalysisNames = cms.vstring('CMS_2018_I1690148') process.rivetAnalyzer.CrossSection = cms.double(1.0) process.rivetAnalyzer.OutputFile = cms.string('TTbar-13TeV.yoda') process.generation_step+=process.rivetAnalyzer diff --git a/TTbar-TuneCP5-Pythia8-13000GeV_cfg_A14.py b/TTbar-TuneCP5-Pythia8-13000GeV_cfg_A14.py index 0c144ea..6789f53 100644 --- a/TTbar-TuneCP5-Pythia8-13000GeV_cfg_A14.py +++ b/TTbar-TuneCP5-Pythia8-13000GeV_cfg_A14.py @@ -123,7 +123,7 @@ def customise(process): process.load('GeneratorInterface.RivetInterface.rivetAnalyzer_cfi') - process.rivetAnalyzer.AnalysisNames = cms.vstring('CMS_2017_PAS_TOP_17_013') + process.rivetAnalyzer.AnalysisNames = cms.vstring('CMS_2018_I1690148') process.rivetAnalyzer.CrossSection = cms.double(1.0) process.rivetAnalyzer.OutputFile = cms.string('TTbar-13TeV.yoda') process.generation_step+=process.rivetAnalyzer diff --git a/TTbar-TuneCP5-Pythia8-13000GeV_cfg_AllCR0.py b/TTbar-TuneCP5-Pythia8-13000GeV_cfg_AllCR0.py index 4f5f329..a3bd21c 100644 --- a/TTbar-TuneCP5-Pythia8-13000GeV_cfg_AllCR0.py +++ b/TTbar-TuneCP5-Pythia8-13000GeV_cfg_AllCR0.py @@ -142,7 +142,7 @@ def customise(process): process.load('GeneratorInterface.RivetInterface.rivetAnalyzer_cfi') - process.rivetAnalyzer.AnalysisNames = cms.vstring('CMS_2017_PAS_TOP_17_013') + process.rivetAnalyzer.AnalysisNames = cms.vstring('CMS_2018_I1690148') process.rivetAnalyzer.CrossSection = cms.double(1.0) process.rivetAnalyzer.OutputFile = cms.string('TTbar-13TeV.yoda') process.generation_step+=process.rivetAnalyzer diff --git a/TTbar-TuneCP5-Pythia8-13000GeV_cfg_AllCR1.py b/TTbar-TuneCP5-Pythia8-13000GeV_cfg_AllCR1.py index d20ade1..fa94e97 100644 --- a/TTbar-TuneCP5-Pythia8-13000GeV_cfg_AllCR1.py +++ b/TTbar-TuneCP5-Pythia8-13000GeV_cfg_AllCR1.py @@ -142,7 +142,7 @@ def customise(process): process.load('GeneratorInterface.RivetInterface.rivetAnalyzer_cfi') - process.rivetAnalyzer.AnalysisNames = cms.vstring('CMS_2017_PAS_TOP_17_013') + process.rivetAnalyzer.AnalysisNames = cms.vstring('CMS_2018_I1690148') process.rivetAnalyzer.CrossSection = cms.double(1.0) process.rivetAnalyzer.OutputFile = cms.string('TTbar-13TeV.yoda') process.generation_step+=process.rivetAnalyzer diff --git a/TTbar-TuneCP5-Pythia8-13000GeV_cfg_CP1.py b/TTbar-TuneCP5-Pythia8-13000GeV_cfg_CP1.py index 927be70..666afb4 100644 --- a/TTbar-TuneCP5-Pythia8-13000GeV_cfg_CP1.py +++ b/TTbar-TuneCP5-Pythia8-13000GeV_cfg_CP1.py @@ -133,7 +133,7 @@ def customise(process): process.load('GeneratorInterface.RivetInterface.rivetAnalyzer_cfi') - process.rivetAnalyzer.AnalysisNames = cms.vstring('CMS_2017_PAS_TOP_17_013') + process.rivetAnalyzer.AnalysisNames = cms.vstring('CMS_2018_I1690148') process.rivetAnalyzer.CrossSection = cms.double(1.0) process.rivetAnalyzer.OutputFile = cms.string('TTbar-13TeV.yoda') process.generation_step+=process.rivetAnalyzer diff --git a/TTbar-TuneCP5-Pythia8-13000GeV_cfg_CP5-CR1.py b/TTbar-TuneCP5-Pythia8-13000GeV_cfg_CP5-CR1.py index abfcc15..aacfbd8 100644 --- a/TTbar-TuneCP5-Pythia8-13000GeV_cfg_CP5-CR1.py +++ b/TTbar-TuneCP5-Pythia8-13000GeV_cfg_CP5-CR1.py @@ -146,7 +146,7 @@ def customise(process): process.load('GeneratorInterface.RivetInterface.rivetAnalyzer_cfi') - process.rivetAnalyzer.AnalysisNames = cms.vstring('CMS_2017_PAS_TOP_17_013') + process.rivetAnalyzer.AnalysisNames = cms.vstring('CMS_2018_I1690148') process.rivetAnalyzer.CrossSection = cms.double(1.0) process.rivetAnalyzer.OutputFile = cms.string('TTbar-13TeV.yoda') process.generation_step+=process.rivetAnalyzer diff --git a/TTbar-TuneCP5-Pythia8-13000GeV_cfg_CP5-CR2o.py b/TTbar-TuneCP5-Pythia8-13000GeV_cfg_CP5-CR2o.py index 5cd1d20..a2b0a18 100644 --- a/TTbar-TuneCP5-Pythia8-13000GeV_cfg_CP5-CR2o.py +++ b/TTbar-TuneCP5-Pythia8-13000GeV_cfg_CP5-CR2o.py @@ -141,7 +141,7 @@ def customise(process): process.load('GeneratorInterface.RivetInterface.rivetAnalyzer_cfi') - process.rivetAnalyzer.AnalysisNames = cms.vstring('CMS_2017_PAS_TOP_17_013') + process.rivetAnalyzer.AnalysisNames = cms.vstring('CMS_2018_I1690148') process.rivetAnalyzer.CrossSection = cms.double(1.0) process.rivetAnalyzer.OutputFile = cms.string('TTbar-13TeV.yoda') process.generation_step+=process.rivetAnalyzer diff --git a/TTbar-TuneCP5-Pythia8-13000GeV_cfg_CP5.py b/TTbar-TuneCP5-Pythia8-13000GeV_cfg_CP5.py index 62254e0..2bb82a4 100644 --- a/TTbar-TuneCP5-Pythia8-13000GeV_cfg_CP5.py +++ b/TTbar-TuneCP5-Pythia8-13000GeV_cfg_CP5.py @@ -142,7 +142,7 @@ def customise(process): process.load('GeneratorInterface.RivetInterface.rivetAnalyzer_cfi') - process.rivetAnalyzer.AnalysisNames = cms.vstring('CMS_2017_PAS_TOP_17_013') + process.rivetAnalyzer.AnalysisNames = cms.vstring('CMS_2018_I1690148') process.rivetAnalyzer.CrossSection = cms.double(1.0) process.rivetAnalyzer.OutputFile = cms.string('TTbar-13TeV.yoda') process.generation_step+=process.rivetAnalyzer diff --git a/TTbar-TuneCP5-Pythia8-13000GeV_cfg_CUETP8M1.py b/TTbar-TuneCP5-Pythia8-13000GeV_cfg_CUETP8M1.py index a54cab9..d6fb4fd 100644 --- a/TTbar-TuneCP5-Pythia8-13000GeV_cfg_CUETP8M1.py +++ b/TTbar-TuneCP5-Pythia8-13000GeV_cfg_CUETP8M1.py @@ -123,7 +123,7 @@ def customise(process): process.load('GeneratorInterface.RivetInterface.rivetAnalyzer_cfi') - process.rivetAnalyzer.AnalysisNames = cms.vstring('CMS_2017_PAS_TOP_17_013') + process.rivetAnalyzer.AnalysisNames = cms.vstring('CMS_2018_I1690148') process.rivetAnalyzer.CrossSection = cms.double(1.0) process.rivetAnalyzer.OutputFile = cms.string('TTbar-13TeV.yoda') process.generation_step+=process.rivetAnalyzer diff --git a/TTbar-TuneCP5-Pythia8-13000GeV_cfg_ColorReconnection.py b/TTbar-TuneCP5-Pythia8-13000GeV_cfg_ColorReconnection.py index c00a1b0..088cd89 100644 --- a/TTbar-TuneCP5-Pythia8-13000GeV_cfg_ColorReconnection.py +++ b/TTbar-TuneCP5-Pythia8-13000GeV_cfg_ColorReconnection.py @@ -157,7 +157,7 @@ def customise(process): process.load('GeneratorInterface.RivetInterface.rivetAnalyzer_cfi') - process.rivetAnalyzer.AnalysisNames = cms.vstring('CMS_2017_PAS_TOP_17_013') + process.rivetAnalyzer.AnalysisNames = cms.vstring('CMS_2018_I1690148') process.rivetAnalyzer.CrossSection = cms.double(1.0) process.rivetAnalyzer.OutputFile = cms.string('TTbar-13TeV.yoda') process.generation_step+=process.rivetAnalyzer diff --git a/TTbar-TuneCP5-Pythia8-13000GeV_cfg_FSR.py b/TTbar-TuneCP5-Pythia8-13000GeV_cfg_FSR.py index cf67cdd..b8a0439 100644 --- a/TTbar-TuneCP5-Pythia8-13000GeV_cfg_FSR.py +++ b/TTbar-TuneCP5-Pythia8-13000GeV_cfg_FSR.py @@ -142,7 +142,7 @@ def customise(process): process.load('GeneratorInterface.RivetInterface.rivetAnalyzer_cfi') - process.rivetAnalyzer.AnalysisNames = cms.vstring('CMS_2017_PAS_TOP_17_013') + process.rivetAnalyzer.AnalysisNames = cms.vstring('CMS_2018_I1690148') process.rivetAnalyzer.CrossSection = cms.double(1.0) process.rivetAnalyzer.OutputFile = cms.string('TTbar-13TeV.yoda') process.generation_step+=process.rivetAnalyzer diff --git a/TTbar-TuneCP5-Pythia8-13000GeV_cfg_FSRalphaS.py b/TTbar-TuneCP5-Pythia8-13000GeV_cfg_FSRalphaS.py index 38bd0a5..f1c2394 100644 --- a/TTbar-TuneCP5-Pythia8-13000GeV_cfg_FSRalphaS.py +++ b/TTbar-TuneCP5-Pythia8-13000GeV_cfg_FSRalphaS.py @@ -142,7 +142,7 @@ def customise(process): process.load('GeneratorInterface.RivetInterface.rivetAnalyzer_cfi') - process.rivetAnalyzer.AnalysisNames = cms.vstring('CMS_2017_PAS_TOP_17_013') + process.rivetAnalyzer.AnalysisNames = cms.vstring('CMS_2018_I1690148') process.rivetAnalyzer.CrossSection = cms.double(1.0) process.rivetAnalyzer.OutputFile = cms.string('TTbar-13TeV.yoda') process.generation_step+=process.rivetAnalyzer diff --git a/TTbar-TuneCP5-Pythia8-13000GeV_cfg_FSRpTmin.py b/TTbar-TuneCP5-Pythia8-13000GeV_cfg_FSRpTmin.py index 71b9b7d..dc31860 100644 --- a/TTbar-TuneCP5-Pythia8-13000GeV_cfg_FSRpTmin.py +++ b/TTbar-TuneCP5-Pythia8-13000GeV_cfg_FSRpTmin.py @@ -142,7 +142,7 @@ def customise(process): process.load('GeneratorInterface.RivetInterface.rivetAnalyzer_cfi') - process.rivetAnalyzer.AnalysisNames = cms.vstring('CMS_2017_PAS_TOP_17_013') + process.rivetAnalyzer.AnalysisNames = cms.vstring('CMS_2018_I1690148') process.rivetAnalyzer.CrossSection = cms.double(1.0) process.rivetAnalyzer.OutputFile = cms.string('TTbar-13TeV.yoda') process.generation_step+=process.rivetAnalyzer diff --git a/TTbar-TuneCP5-Pythia8-13000GeV_cfg_ISRalphaS.py b/TTbar-TuneCP5-Pythia8-13000GeV_cfg_ISRalphaS.py index 9dcc347..d8eb6d0 100644 --- a/TTbar-TuneCP5-Pythia8-13000GeV_cfg_ISRalphaS.py +++ b/TTbar-TuneCP5-Pythia8-13000GeV_cfg_ISRalphaS.py @@ -142,7 +142,7 @@ def customise(process): process.load('GeneratorInterface.RivetInterface.rivetAnalyzer_cfi') - process.rivetAnalyzer.AnalysisNames = cms.vstring('CMS_2017_PAS_TOP_17_013') + process.rivetAnalyzer.AnalysisNames = cms.vstring('CMS_2018_I1690148') process.rivetAnalyzer.CrossSection = cms.double(1.0) process.rivetAnalyzer.OutputFile = cms.string('TTbar-13TeV.yoda') process.generation_step+=process.rivetAnalyzer diff --git a/analyse.py b/analyse.py index 0fff13e..331ba0b 100644 --- a/analyse.py +++ b/analyse.py @@ -30,6 +30,8 @@ #print "sed -i -e 's/2.5.2\"/2.5.2-njopjo\"/g' /afs/cern.ch/user/h/hinzmann/stable_13TeV/Rivet/CMSSW_9_2_6/config/toolbox/slc6_amd64_gcc530/tools/selected/rivet.xml" #print "scram setup rivet" print "ln -s ../GeneratorInterface/RivetInterface/data ref" + print "export RIVET_DATA_PATH=/afs/cern.ch/user/h/hinzmann/stable_13TeV/Rivet100/CMSSW_10_0_0/src/SubstructureProfessor/ref" + for tune,number in scenarios: name=tune+version print "prof-runcombs --mc mcruns_"+name+"/mc -c 0:1 -o runcombs_"+name+".dat --weights "+weights @@ -63,7 +65,6 @@ print "prof-ipolhistos --datadir . --runs runcombs_A14-CR1.dat --mcdir mcruns_A14-CR1/mc --weights "+weights+" --ipol=linear --ipoldir=out_A14-CR1"+weights.replace("weights","")+"/ipol/ --outdir=out_A14-CR1"+weights.replace("weights","")+" --params=ColourReconnection:mode=1" print "prof-ipolhistos --datadir . --runs runcombs_A14-CR2.dat --mcdir mcruns_A14-CR2/mc --weights "+weights+" --ipol=linear --ipoldir=out_A14-CR2"+weights.replace("weights","")+"/ipol/ --outdir=out_A14-CR2"+weights.replace("weights","")+" --params=ColourReconnection:mode=2" print "prof-ipolhistos --datadir . --runs runcombs_default.dat --mcdir mcruns_default/mc --weights "+weights+" --ipol=linear --ipoldir=out_default"+weights.replace("weights","")+"/ipol/ --outdir=out_default"+weights.replace("weights","")+" --params=ColourReconnection:mode=0" - print "export RIVET_DATA_PATH=/afs/cern.ch/user/h/hinzmann/stable_13TeV/Rivet/CMSSW_9_2_6/src/Professor/ref" print "python renormalize.py out_CP1"+weights.replace("weights","")+"/ipolhistos/000/histo-000.yoda" print "python renormalize.py out_CP5"+weights.replace("weights","")+"/ipolhistos/000/histo-000.yoda" print "python renormalize.py out_CP5-CR1"+weights.replace("weights","")+"/ipolhistos/000/histo-000.yoda" diff --git a/renormalize.py b/renormalize.py index 6825edb..6fee55b 100644 --- a/renormalize.py +++ b/renormalize.py @@ -7,7 +7,7 @@ for l in inf.readlines(): split=l.split(" ") if "YODA_SCATTER2D" in l: correct=False - if "CMS_2018_SMP_16_010" in l: correct=True + if "CMS_2018_I1682495" in l: correct=True if len(split)==6 and not "val" in l and correct: #if "5.000000e-01 5.000000e-01 5.000000e-01" in l: continue #if "3.000000e+00 2.000000e+00 2.000000e+00" in l: continue diff --git a/submit_mcpoint_checkifexist_lxplus.py b/submit_mcpoint_checkifexist_lxplus.py index c6ac39a..b76ac65 100755 --- a/submit_mcpoint_checkifexist_lxplus.py +++ b/submit_mcpoint_checkifexist_lxplus.py @@ -90,6 +90,7 @@ def build(self): infile += 'echo $pwd\n' infile += 'cd '+cmsswbase+'/src\n' infile += 'eval `scram runtime -sh`\n' + infile += 'source Rivet/rivetSetup.sh\n' infile += 'cd '+fulldir+'\n' infile += 'cmsRun ' + self._configfile + ' >& log_GEN_'+self._name+"_"+self._yodaout.strip(".yoda")+'.txt\n' #changed &> to >& infile += 'ls\n'