From c047aeaa12ce2bdbc5d8fc0cd3927c83e8280f64 Mon Sep 17 00:00:00 2001
From: Jens Roggel <jens.roggel@cern.ch>
Date: Tue, 13 Jul 2021 08:47:14 +0200
Subject: [PATCH] fix validation PS JOs [skip modfiles]

---
 .../950184/mc.MGPy8EG_ttbar_CKKWLMerge_Np01_p83_PS_valid.py | 6 +++---
 .../mc.MGPy8EG_Zmumu_CKKWLMerge_Np012_p83_PS_valid.py       | 6 +++---
 .../mc.MGPy8EG_ttbar_CKKWLMerge_Np01_PDGFix_p83_PS_valid.py | 6 +++---
 .../mc.MGPy8EG_MEN30NLO_A14N23LO_tttautau_p83_PS_valid.py   | 1 +
 .../950190/mc.MGPy8EG_MEN30NLO_A14N23LO_ttW_p83_PS_valid.py | 1 +
 .../mc.MGPy8EG_MEN30NLO_A14N23LO_ttZnunu_p83_PS_valid.py    | 1 +
 6 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/950xxx/950184/mc.MGPy8EG_ttbar_CKKWLMerge_Np01_p83_PS_valid.py b/950xxx/950184/mc.MGPy8EG_ttbar_CKKWLMerge_Np01_p83_PS_valid.py
index 7d7ef8cf47..4ac3c40934 100644
--- a/950xxx/950184/mc.MGPy8EG_ttbar_CKKWLMerge_Np01_p83_PS_valid.py
+++ b/950xxx/950184/mc.MGPy8EG_ttbar_CKKWLMerge_Np01_p83_PS_valid.py
@@ -8,9 +8,9 @@ evgenConfig.inputFilesPerJob = 3
 
 PYTHIA8_nJetMax=1
 PYTHIA8_Process='pp>tt~'
-PYTHIA8_Dparameter=settings['dparameter']
-PYTHIA8_TMS=settings['ktdurham']
-PYTHIA8_nQuarksMerge=settings['maxjetflavor']
+PYTHIA8_Dparameter=0.4
+PYTHIA8_TMS=30
+PYTHIA8_nQuarksMerge=5
 include("Pythia8_i/Pythia8_A14_NNPDF23LO_EvtGen_Common.py")
 include("Pythia8_i/Pythia8_MadGraph.py")
 include("Pythia8_i/Pythia8_CKKWL_kTMerge.py")
diff --git a/950xxx/950186/mc.MGPy8EG_Zmumu_CKKWLMerge_Np012_p83_PS_valid.py b/950xxx/950186/mc.MGPy8EG_Zmumu_CKKWLMerge_Np012_p83_PS_valid.py
index f337fd5893..2fd5f7533f 100644
--- a/950xxx/950186/mc.MGPy8EG_Zmumu_CKKWLMerge_Np012_p83_PS_valid.py
+++ b/950xxx/950186/mc.MGPy8EG_Zmumu_CKKWLMerge_Np012_p83_PS_valid.py
@@ -8,9 +8,9 @@ evgenConfig.inputFilesPerJob = 2
 
 PYTHIA8_nJetMax=1
 PYTHIA8_Process='pp>e+e-'
-PYTHIA8_Dparameter=extras['dparameter']
-PYTHIA8_TMS=extras['ktdurham']
-PYTHIA8_nQuarksMerge=extras['maxjetflavor']
+PYTHIA8_Dparameter=0.4
+PYTHIA8_TMS=30
+PYTHIA8_nQuarksMerge=5
 include("Pythia8_i/Pythia8_A14_NNPDF23LO_EvtGen_Common.py")
 include("Pythia8_i/Pythia8_MadGraph.py")
 include("Pythia8_i/Pythia8_CKKWL_kTMerge.py")
diff --git a/950xxx/950188/mc.MGPy8EG_ttbar_CKKWLMerge_Np01_PDGFix_p83_PS_valid.py b/950xxx/950188/mc.MGPy8EG_ttbar_CKKWLMerge_Np01_PDGFix_p83_PS_valid.py
index 38a10d3687..5323256d61 100644
--- a/950xxx/950188/mc.MGPy8EG_ttbar_CKKWLMerge_Np01_PDGFix_p83_PS_valid.py
+++ b/950xxx/950188/mc.MGPy8EG_ttbar_CKKWLMerge_Np01_PDGFix_p83_PS_valid.py
@@ -8,9 +8,9 @@ evgenConfig.inputFilesPerJob = 2
  
 PYTHIA8_nJetMax=1
 PYTHIA8_Process='pp>tt~'
-PYTHIA8_Dparameter=settings['dparameter']
-PYTHIA8_TMS=settings['ktdurham']
-PYTHIA8_nQuarksMerge=settings['maxjetflavor']
+PYTHIA8_Dparameter=0.4
+PYTHIA8_TMS=30
+PYTHIA8_nQuarksMerge=5
 include("Pythia8_i/Pythia8_A14_NNPDF23LO_EvtGen_Common.py")
 include("Pythia8_i/Pythia8_MadGraph.py")
 include("Pythia8_i/Pythia8_CKKWL_kTMerge.py")
diff --git a/950xxx/950189/mc.MGPy8EG_MEN30NLO_A14N23LO_tttautau_p83_PS_valid.py b/950xxx/950189/mc.MGPy8EG_MEN30NLO_A14N23LO_tttautau_p83_PS_valid.py
index 30236dde05..e96cb294ad 100644
--- a/950xxx/950189/mc.MGPy8EG_MEN30NLO_A14N23LO_tttautau_p83_PS_valid.py
+++ b/950xxx/950189/mc.MGPy8EG_MEN30NLO_A14N23LO_tttautau_p83_PS_valid.py
@@ -1,3 +1,4 @@
+from MadGraphControl.MadGraphUtils import *
 
 #### Shower
 evgenConfig.description = 'aMcAtNlo_tttautau_NLO'
diff --git a/950xxx/950190/mc.MGPy8EG_MEN30NLO_A14N23LO_ttW_p83_PS_valid.py b/950xxx/950190/mc.MGPy8EG_MEN30NLO_A14N23LO_ttW_p83_PS_valid.py
index 6619826337..00bc60b84a 100644
--- a/950xxx/950190/mc.MGPy8EG_MEN30NLO_A14N23LO_ttW_p83_PS_valid.py
+++ b/950xxx/950190/mc.MGPy8EG_MEN30NLO_A14N23LO_ttW_p83_PS_valid.py
@@ -1,3 +1,4 @@
+from MadGraphControl.MadGraphUtils import *
 
 #### Shower
 evgenConfig.description = 'aMcAtNlo_ttW_NLO'
diff --git a/950xxx/950191/mc.MGPy8EG_MEN30NLO_A14N23LO_ttZnunu_p83_PS_valid.py b/950xxx/950191/mc.MGPy8EG_MEN30NLO_A14N23LO_ttZnunu_p83_PS_valid.py
index ef63908dae..41c1f80e36 100644
--- a/950xxx/950191/mc.MGPy8EG_MEN30NLO_A14N23LO_ttZnunu_p83_PS_valid.py
+++ b/950xxx/950191/mc.MGPy8EG_MEN30NLO_A14N23LO_ttZnunu_p83_PS_valid.py
@@ -1,3 +1,4 @@
+from MadGraphControl.MadGraphUtils import *
 
 #### Shower
 evgenConfig.description = 'aMcAtNlo_ttZqq_NLO'
-- 
GitLab