diff --git a/Generators/Pythia8B_i/share/common/Pythia8B_A14_CTEQ6L1_Common.py b/Generators/Pythia8B_i/share/common/Pythia8B_A14_CTEQ6L1_Common.py
index 082c3923884e83e707dc03e70deabefac2abaa96..d045726eccbee627678ac50c0ab956d781c9eae0 100644
--- a/Generators/Pythia8B_i/share/common/Pythia8B_A14_CTEQ6L1_Common.py
+++ b/Generators/Pythia8B_i/share/common/Pythia8B_A14_CTEQ6L1_Common.py
@@ -1,27 +1,7 @@
## Config for Py8B tune A14 with CTEQ6L1
include("Pythia8B_i/Pythia8B_Base_Fragment.py")
-ver = os.popen("cmt show versions External/Pythia8").read()
-print "Pythia8 version: " + ver
-if 'Pythia8-01' in ver[:50]:
- genSeq.Pythia8B.Commands += [
- "Tune:ee = 7",
- "Tune:pp = 14",
- "PDF:useLHAPDF = on",
- "PDF:LHAPDFset = cteq6ll",
- "SpaceShower:rapidityOrder = on",
- "SigmaProcess:alphaSvalue = 0.144",
- "SpaceShower:pT0Ref = 1.30",
- "SpaceShower:pTmaxFudge = 0.95",
- "SpaceShower:pTdampFudge = 1.21",
- "SpaceShower:alphaSvalue = 0.125",
- "TimeShower:alphaSvalue = 0.126",
- "BeamRemnants:primordialKThard = 1.72",
- "MultipartonInteractions:pT0Ref = 1.98",
- "MultipartonInteractions:alphaSvalue = 0.118",
- "BeamRemnants:reconnectRange = 2.08"]
-else:
- genSeq.Pythia8B.Commands += [
+genSeq.Pythia8B.Commands += [
"Tune:ee = 7",
"Tune:pp = 14",
"PDF:pSet=LHAPDF6:cteq6l1",
diff --git a/Generators/Pythia8B_i/share/common/Pythia8B_A14_NNPDF23LO_Common.py b/Generators/Pythia8B_i/share/common/Pythia8B_A14_NNPDF23LO_Common.py
index f46bd11440b282c9c391251bd1ad0ceca9406bf2..f367cb51bd711af95c2851a0777dff04142866de 100644
--- a/Generators/Pythia8B_i/share/common/Pythia8B_A14_NNPDF23LO_Common.py
+++ b/Generators/Pythia8B_i/share/common/Pythia8B_A14_NNPDF23LO_Common.py
@@ -4,28 +4,7 @@
include("Pythia8B_i/Pythia8B_Base_Fragment.py")
-# todo - replace BeamRemnants with new ColourReconnection syntax once Pythia 8.201 is in place
-ver = os.popen("cmt show versions External/Pythia8").read()
-print "Pythia8 version: " + ver
-if 'Pythia8-01' in ver[:50]:
- genSeq.Pythia8B.Commands += [
- "Tune:ee = 7",
- "Tune:pp = 14",
- "PDF:useLHAPDF = on",
- "PDF:LHAPDFset = NNPDF23_lo_as_0130_qed",
- "SpaceShower:rapidityOrder = on",
- "SigmaProcess:alphaSvalue = 0.140",
- "SpaceShower:pT0Ref = 1.56",
- "SpaceShower:pTmaxFudge = 0.91",
- "SpaceShower:pTdampFudge = 1.05",
- "SpaceShower:alphaSvalue = 0.127",
- "TimeShower:alphaSvalue = 0.127",
- "BeamRemnants:primordialKThard = 1.88",
- "MultipartonInteractions:pT0Ref = 2.09",
- "MultipartonInteractions:alphaSvalue = 0.126",
- "BeamRemnants:reconnectRange = 1.71"]
-else:
- genSeq.Pythia8B.Commands += [
+genSeq.Pythia8B.Commands += [
"Tune:ee = 7",
"Tune:pp = 14",
"PDF:pSet=LHAPDF6:NNPDF23_lo_as_0130_qed",
diff --git a/Generators/Pythia8_i/share/common/Pythia8_A14_CTEQ6L1_Common.py b/Generators/Pythia8_i/share/common/Pythia8_A14_CTEQ6L1_Common.py
index 803a9fdd3b314b880a80d011b7be56c4212f4d17..1b569627e6267b16be19eaa2f9f6c308e0f9413e 100644
--- a/Generators/Pythia8_i/share/common/Pythia8_A14_CTEQ6L1_Common.py
+++ b/Generators/Pythia8_i/share/common/Pythia8_A14_CTEQ6L1_Common.py
@@ -21,16 +21,6 @@ genSeq.Pythia8.Commands += [
rel = os.popen("echo $AtlasVersion").read()
-if rel[:2].isdigit() and int(rel[:2])<20:
- ver = os.popen("cmt show versions External/Pythia8").read()
- print ("Pythia8 version: " + ver)
- if ('Pythia8-01' in ver[:50]) or ('Pythia8_i-00-11' in ver):
- genSeq.Pythia8.Commands += [
- "PDF:useLHAPDF = on",
- "PDF:LHAPDFset = cteq6ll" ]
- else:
- genSeq.Pythia8.Commands += ["PDF:pSet=LHAPDF6:cteq6l1"]
-else:
- genSeq.Pythia8.Commands += ["PDF:pSet=LHAPDF6:cteq6l1"]
+genSeq.Pythia8.Commands += ["PDF:pSet=LHAPDF6:cteq6l1"]
evgenConfig.tune = "A14 CTEQ6L1"
diff --git a/Generators/Pythia8_i/share/common/Pythia8_A14_MSTW2008LO_Common.py b/Generators/Pythia8_i/share/common/Pythia8_A14_MSTW2008LO_Common.py
index 2c4914c60227d2d32133d5c1570413507b3c56f8..bd5fc04f82ce14b2b4242af21194eb158f3d63a6 100644
--- a/Generators/Pythia8_i/share/common/Pythia8_A14_MSTW2008LO_Common.py
+++ b/Generators/Pythia8_i/share/common/Pythia8_A14_MSTW2008LO_Common.py
@@ -18,19 +18,7 @@ genSeq.Pythia8.Commands += [
rel = os.popen("echo $AtlasVersion").read()
-if rel[:2].isdigit() and int(rel[:2])<20:
- ver = os.popen("cmt show versions External/Pythia8").read()
- print ("Pythia8 version: " + ver)
- if ('Pythia8-01' in ver[:50]) or ('Pythia8_i-00-11' in ver):
- genSeq.Pythia8.Commands += [
- "PDF:useLHAPDF = on",
- "PDF:LHAPDFset = MSTW2008lo68cl",
- "BeamRemnants:reconnectRange = 1.87" ]
- else:
- genSeq.Pythia8.Commands += ["PDF:pSet=LHAPDF6:MSTW2008lo68cl",
- "ColourReconnection:range = 1.87"]
-else:
- genSeq.Pythia8.Commands += ["PDF:pSet=LHAPDF6:MSTW2008lo68cl",
+genSeq.Pythia8.Commands += ["PDF:pSet=LHAPDF6:MSTW2008lo68cl",
"ColourReconnection:range = 1.87"]
evgenConfig.tune = "A14 MSTW2008LO"
diff --git a/Generators/Pythia8_i/share/common/Pythia8_A14_NNPDF23LO_Common.py b/Generators/Pythia8_i/share/common/Pythia8_A14_NNPDF23LO_Common.py
index af7fd5f3e4cb5d0ea1c3df98a542733b115c2452..f79eb330f4eb8c1c173ecd1fe2dd469737136ced 100644
--- a/Generators/Pythia8_i/share/common/Pythia8_A14_NNPDF23LO_Common.py
+++ b/Generators/Pythia8_i/share/common/Pythia8_A14_NNPDF23LO_Common.py
@@ -21,19 +21,7 @@ genSeq.Pythia8.Commands += [
rel = os.popen("echo $AtlasVersion").read()
-if rel[:2].isdigit() and int(rel[:2])<20:
- ver = os.popen("cmt show versions External/Pythia8").read()
- print ("Pythia8 version: " + ver)
- if ('Pythia8-01' in ver[:50]) or ('Pythia8_i-00-11' in ver):
- genSeq.Pythia8.Commands += [
- "PDF:useLHAPDF = on",
- "PDF:LHAPDFset = NNPDF23_lo_as_0130_qed",
- "BeamRemnants:reconnectRange = 1.71" ]
- else:
- genSeq.Pythia8.Commands += ["PDF:pSet=LHAPDF6:NNPDF23_lo_as_0130_qed",
- "ColourReconnection:range = 1.71"]
-else:
- genSeq.Pythia8.Commands += ["PDF:pSet=LHAPDF6:NNPDF23_lo_as_0130_qed",
+genSeq.Pythia8.Commands += ["PDF:pSet=LHAPDF6:NNPDF23_lo_as_0130_qed",
"ColourReconnection:range = 1.71"]
include("Pythia8_i/Pythia8_RapidityOrderMPI.py")
diff --git a/Generators/Pythia8_i/share/common/Pythia8_A2_MSTW2008LO_Common.py b/Generators/Pythia8_i/share/common/Pythia8_A2_MSTW2008LO_Common.py
index f1f35fd7f6faa59d584b50fbe6f830eeea1f2f42..d4a4075f5573245a8d5e76484eafdde6d7f6cc13 100644
--- a/Generators/Pythia8_i/share/common/Pythia8_A2_MSTW2008LO_Common.py
+++ b/Generators/Pythia8_i/share/common/Pythia8_A2_MSTW2008LO_Common.py
@@ -16,20 +16,7 @@ genSeq.Pythia8.Commands += [
rel = os.popen("echo $AtlasVersion").read()
-if rel[:2].isdigit() and int(rel[:2])<20:
- ver = os.popen("cmt show versions External/Pythia8").read()
- print ("Pythia8 version: " + ver)
-# ver = os.popen("acmake.py show_versions Generators/Pythia8_i").read()
- if ('Pythia8-01' in ver[:50]) or ('Pythia8_i-00-11' in ver):
- genSeq.Pythia8.Commands += [
- "PDF:useLHAPDF = on",
- "PDF:LHAPDFset = MSTW2008lo68cl.LHgrid",
- "BeamRemnants:reconnectRange = 2.28"]
- else:
- genSeq.Pythia8.Commands += ["PDF:pSet=LHAPDF6:MSTW2008lo68cl",
- "ColourReconnection:range=2.28"]
-else:
- genSeq.Pythia8.Commands += ["PDF:pSet=LHAPDF6:MSTW2008lo68cl",
+genSeq.Pythia8.Commands += ["PDF:pSet=LHAPDF6:MSTW2008lo68cl",
"ColourReconnection:range=2.28"]
include("Pythia8_i/Pythia8_RapidityOrderMPI.py")
diff --git a/Generators/Pythia8_i/share/common/Pythia8_A3_ALT_NNPDF23LO_Common.py b/Generators/Pythia8_i/share/common/Pythia8_A3_ALT_NNPDF23LO_Common.py
index e177ff274161b55d7ba58fd7fa30677ef7ba973f..7bcd5d34941a38f4ec426e2b9963869ea2fdc2e6 100644
--- a/Generators/Pythia8_i/share/common/Pythia8_A3_ALT_NNPDF23LO_Common.py
+++ b/Generators/Pythia8_i/share/common/Pythia8_A3_ALT_NNPDF23LO_Common.py
@@ -21,20 +21,7 @@ genSeq.Pythia8.Commands += [
rel = os.popen("echo $AtlasVersion").read()
-if rel[:2].isdigit() and int(rel[:2])<20:
-# todo - replace BeamRemnants with new ColourReconnection syntax once Pythia 8.201 is in place
- ver = os.popen("cmt show versions External/Pythia8").read()
- print ("Pythia8 version: " + ver)
- if 'Pythia8-01' in ver[:50]:
- genSeq.Pythia8.Commands += [
- "PDF:useLHAPDF = on",
- "PDF:LHAPDFset = NNPDF23_lo_as_0130_qed",
- "BeamRemnants:reconnectRange = 1.8"]
- else:
- genSeq.Pythia8.Commands += ["PDF:pSet=LHAPDF6:NNPDF23_lo_as_0130_qed",
- "ColourReconnection:range = 1.8"]
-else:
- genSeq.Pythia8.Commands += ["PDF:pSet=LHAPDF6:NNPDF23_lo_as_0130_qed",
+genSeq.Pythia8.Commands += ["PDF:pSet=LHAPDF6:NNPDF23_lo_as_0130_qed",
"ColourReconnection:range = 1.8"]
evgenConfig.tune = "A3 NNPDF23LO"
diff --git a/Generators/Pythia8_i/share/common/Pythia8_A3_NNPDF23LO_Common.py b/Generators/Pythia8_i/share/common/Pythia8_A3_NNPDF23LO_Common.py
index 18d75006f43b9fcc88f49363985d71250aee3a04..a76cc577ecd13f562b9a0d8b8dc6530affb247ac 100644
--- a/Generators/Pythia8_i/share/common/Pythia8_A3_NNPDF23LO_Common.py
+++ b/Generators/Pythia8_i/share/common/Pythia8_A3_NNPDF23LO_Common.py
@@ -20,20 +20,7 @@ genSeq.Pythia8.Commands += [
rel = os.popen("echo $AtlasVersion").read()
-if rel[:2].isdigit() and int(rel[:2])<20:
-# todo - replace BeamRemnants with new ColourReconnection syntax once Pythia 8.201 is in place
- ver = os.popen("cmt show versions External/Pythia8").read()
- print ("Pythia8 version: " + ver)
- if 'Pythia8-01' in ver[:50]:
- genSeq.Pythia8.Commands += [
- "PDF:useLHAPDF = on",
- "PDF:LHAPDFset = NNPDF23_lo_as_0130_qed",
- "BeamRemnants:reconnectRange = 1.8"]
- else:
- genSeq.Pythia8.Commands += ["PDF:pSet=LHAPDF6:NNPDF23_lo_as_0130_qed",
- "ColourReconnection:range = 1.8"]
-else:
- genSeq.Pythia8.Commands += ["PDF:pSet=LHAPDF6:NNPDF23_lo_as_0130_qed",
+genSeq.Pythia8.Commands += ["PDF:pSet=LHAPDF6:NNPDF23_lo_as_0130_qed",
"ColourReconnection:range = 1.8"]
evgenConfig.tune = "A3 NNPDF23LO"
diff --git a/Generators/Pythia8_i/share/common/Pythia8_ATTBAR_NNPDF23LO_Common.py b/Generators/Pythia8_i/share/common/Pythia8_ATTBAR_NNPDF23LO_Common.py
index c7efd6a5ea7daa5e6c78c45da3a373aaf5df5aa4..0872d1404da01f0ae1e6def62b9656a5e3fb7fec 100644
--- a/Generators/Pythia8_i/share/common/Pythia8_ATTBAR_NNPDF23LO_Common.py
+++ b/Generators/Pythia8_i/share/common/Pythia8_ATTBAR_NNPDF23LO_Common.py
@@ -16,17 +16,7 @@ genSeq.Pythia8.Commands += [
rel = os.popen("echo $AtlasVersion").read()
-if rel[:2].isdigit() and int(rel[:2])<20:
- ver = os.popen("cmt show versions External/Pythia8").read()
- print ("Pythia8 version: " + ver)
- if ('Pythia8-01' in ver[:50]) or ('Pythia8_i-00-11' in ver):
- genSeq.Pythia8.Commands += [
- "PDF:useLHAPDF = on",
- "PDF:LHAPDFset = NNPDF23_lo_as_0130_qed"]
- else:
- genSeq.Pythia8.Commands += ["PDF:pSet=LHAPDF6:NNPDF23_lo_as_0130_qed"]
-else:
- genSeq.Pythia8.Commands += ["PDF:pSet=LHAPDF6:NNPDF23_lo_as_0130_qed"]
+genSeq.Pythia8.Commands += ["PDF:pSet=LHAPDF6:NNPDF23_lo_as_0130_qed"]
evgenConfig.tune = "ATTBAR NNPDF23LO"
diff --git a/Generators/Pythia8_i/share/common/Pythia8_AU2_MSTW2008LO_Common.py b/Generators/Pythia8_i/share/common/Pythia8_AU2_MSTW2008LO_Common.py
index b7a9f71293c08f59d752a7da3343164d47c9a9e4..faaf1acd933f5aabd894d5259d011c4bef54ff33 100644
--- a/Generators/Pythia8_i/share/common/Pythia8_AU2_MSTW2008LO_Common.py
+++ b/Generators/Pythia8_i/share/common/Pythia8_AU2_MSTW2008LO_Common.py
@@ -16,19 +16,7 @@ genSeq.Pythia8.Commands += [
rel = os.popen("echo $AtlasVersion").read()
-if rel[:2].isdigit() and int(rel[:2])<20:
- ver = os.popen("cmt show versions External/Pythia8").read()
- print ("Pythia8 version: " + ver)
- if 'Pythia8-01' in ver[:50]:
- genSeq.Pythia8.Commands += [
- "PDF:useLHAPDF = on",
- "PDF:LHAPDFset = MSTW2008lo68cl.LHgrid",
- "BeamRemnants:reconnectRange = 5.32"]
- else:
- genSeq.Pythia8.Commands += ["PDF:pSet=LHAPDF6:MSTW2008lo68cl",
- "ColourReconnection:range = 5.32"]
-else:
- genSeq.Pythia8.Commands += ["PDF:pSet=LHAPDF6:MSTW2008lo68cl",
+genSeq.Pythia8.Commands += ["PDF:pSet=LHAPDF6:MSTW2008lo68cl",
"ColourReconnection:range = 5.32"]
include("Pythia8_i/Pythia8_RapidityOrderMPI.py")
diff --git a/Generators/Pythia8_i/share/common/Pythia8_AZ_CTEQ6L1_Common.py b/Generators/Pythia8_i/share/common/Pythia8_AZ_CTEQ6L1_Common.py
index 9d1c54e482e2103dfc6e7f76377ed3f2095c405b..3da25839a145c6981de640bd03902f9775fc5bcf 100644
--- a/Generators/Pythia8_i/share/common/Pythia8_AZ_CTEQ6L1_Common.py
+++ b/Generators/Pythia8_i/share/common/Pythia8_AZ_CTEQ6L1_Common.py
@@ -10,17 +10,7 @@ genSeq.Pythia8.Commands += [
rel = os.popen("echo $AtlasVersion").read()
-if rel[:2].isdigit() and int(rel[:2])<20:
- ver = os.popen("cmt show versions External/Pythia8").read()
- print ("Pythia8 version: " + ver)
- if 'Pythia8-01' in ver[:50]:
- genSeq.Pythia8.Commands += [
- "PDF:useLHAPDF = on",
- "PDF:LHAPDFset = cteq6ll.LHgrid"]
- else:
- genSeq.Pythia8.Commands += ["PDF:pSet=LHAPDF6:cteq6l1"]
-else:
- genSeq.Pythia8.Commands += ["PDF:pSet=LHAPDF6:cteq6l1"]
+genSeq.Pythia8.Commands += ["PDF:pSet=LHAPDF6:cteq6l1"]
evgenConfig.tune = "AZ CTEQ6L1"
diff --git a/Generators/Pythia8_i/share/common/Pythia8_MonashStar_NNPDF23LO_Common.py b/Generators/Pythia8_i/share/common/Pythia8_MonashStar_NNPDF23LO_Common.py
index c1d79a8211040124a8875e425f6829d75f38bd10..ed2734111b2648251e9dcffc1a5f5dcc5491b08c 100644
--- a/Generators/Pythia8_i/share/common/Pythia8_MonashStar_NNPDF23LO_Common.py
+++ b/Generators/Pythia8_i/share/common/Pythia8_MonashStar_NNPDF23LO_Common.py
@@ -9,15 +9,6 @@ genSeq.Pythia8.Commands += ["Tune:ee = 7",
rel = os.popen("echo $AtlasVersion").read()
print ("Atlas release " + rel)
-if rel[:2].isdigit() and int(rel[:2])<20:
- ver = os.popen("cmt show versions External/Pythia8").read()
- print ("Pythia8 version: " + ver)
- if 'Pythia8-01' in ver[:50]:
- genSeq.Pythia8.Commands += ["PDF:useLHAPDF = on",
- "PDF:LHAPDFset = NNPDF23_lo_as_0130_qed"]
- else:
- genSeq.Pythia8.Commands += ["PDF:pSet=LHAPDF6:NNPDF23_lo_as_0130_qed"]
-else:
- genSeq.Pythia8.Commands += ["PDF:pSet=LHAPDF6:NNPDF23_lo_as_0130_qed"]
+genSeq.Pythia8.Commands += ["PDF:pSet=LHAPDF6:NNPDF23_lo_as_0130_qed"]
evgenConfig.tune = "MonashStar"
diff --git a/Generators/Pythia8_i/share/common/Pythia8_Photospp.py b/Generators/Pythia8_i/share/common/Pythia8_Photospp.py
index ca1d1463d922b1fb60a235ab7c6ff7fbd8e00b3c..377f767a90f3a264950d8ecf00e394dceb1e627f 100644
--- a/Generators/Pythia8_i/share/common/Pythia8_Photospp.py
+++ b/Generators/Pythia8_i/share/common/Pythia8_Photospp.py
@@ -4,13 +4,8 @@
assert hasattr(genSeq, "Pythia8")
genSeq.Pythia8.Commands += ["TimeShower:QEDshowerByL = off"]
-if "PYTHIA8VER" in os.environ:
- verph8str = str(os.environ['PYTHIA8VER'])[:3]
- verph8 = int(verph8str)
- print("verph8 ", verph8)
- if (verph8 > 218):
- print ("time shower cut active")
- genSeq.Pythia8.Commands += ["TimeShower:QEDshowerByOther = off"]
+print ("time shower cut active")
+genSeq.Pythia8.Commands += ["TimeShower:QEDshowerByOther = off"]
## Enable Photos++
include("Photospp_i/Photospp_Fragment.py")