From f0af5fdf5a5cbda070fe9671d58ce913c2f13ea0 Mon Sep 17 00:00:00 2001
From: John Kenneth Anders <john.kenneth.anders@cern.ch>
Date: Wed, 12 Dec 2018 17:20:23 +0000
Subject: [PATCH] Merge branch 'ATLASSIM-3954_21.0' into '21.0'
Add new Run number / timestamp pairs for MC matching 2018 special runs.
See merge request atlas/athena!16657
(cherry picked from commit 982ce54ca024a09e7425999299cba532fabbe6e7)
3ee073c5 Add new Run number / timestamp pairs for MC matching 2018 special runs.
---
Control/AthenaConfiguration/python/iconfTool/__init__.py | 0
.../AthenaConfiguration/python/iconfTool/utils/__init__.py | 0
.../RunDependentSimComps/python/RunDMCFlags.py | 7 ++++++-
3 files changed, 6 insertions(+), 1 deletion(-)
mode change 100755 => 100644 Control/AthenaConfiguration/python/iconfTool/__init__.py
mode change 100644 => 100755 Control/AthenaConfiguration/python/iconfTool/utils/__init__.py
diff --git a/Control/AthenaConfiguration/python/iconfTool/__init__.py b/Control/AthenaConfiguration/python/iconfTool/__init__.py
old mode 100755
new mode 100644
diff --git a/Control/AthenaConfiguration/python/iconfTool/utils/__init__.py b/Control/AthenaConfiguration/python/iconfTool/utils/__init__.py
old mode 100644
new mode 100755
diff --git a/Simulation/RunDependentSim/RunDependentSimComps/python/RunDMCFlags.py b/Simulation/RunDependentSim/RunDependentSimComps/python/RunDMCFlags.py
index 9080a3e3a77..7205a0394d6 100644
--- a/Simulation/RunDependentSim/RunDependentSimComps/python/RunDMCFlags.py
+++ b/Simulation/RunDependentSim/RunDependentSimComps/python/RunDMCFlags.py
@@ -140,7 +140,12 @@ class RunToTimestampDict(JobProperty):
300000:1500000000, ##MC16 pp (25 ns bunch spacing, nominal mu, 2017)
305000:1525000000, ##MC16 pp (5 TeV 2017)
309000:1540000000, ##MC16 XeXe (2017)
- 310000:1550000000 ##MC16 pp (25 ns bunch spacing, nominal mu, 2018)
+ 310000:1550000000, ##MC16 pp (25 ns bunch spacing, nominal mu, 2018)
+ 311000:1551000000, ##MC16 pp (25 ns bunch spacing, low mu, 2018)
+ 312000:1552000000, ##MC16 pp (900 GeV high-beta ALFA, 2018)
+ 313000:1553000000 ##MC16 PbPb (2018)
+
+
}
def addEntry( self, run, timestamp, force=False):
if not type(run) == int:
--
GitLab