From 0ddaec639ee7694de37d5416d910215ee6bb6cac Mon Sep 17 00:00:00 2001
From: James Beacham <j.beacham@cern.ch>
Date: Fri, 9 Feb 2018 19:36:20 +0000
Subject: [PATCH] Merge branch 'add_data18_xxx_project_tags' into '21.0'
Update AutoConfiguration.py with data18_xxx project tags
See merge request atlas/athena!8717
(cherry picked from commit 67cc38025716e620b448e7ba1850c9d99e8f4fb3)
850358a0 Update AutoConfiguration.py with data18_xxx project tags
3675c105 Update AutoConfiguration.py
32237dcb Update AutoConfiguration.py; add data18_1p8TeV.
---
.../share/LUT_mc12.root | Bin
.../RecExConfig/python/AutoConfiguration.py | 8 +++++---
2 files changed, 5 insertions(+), 3 deletions(-)
mode change 100755 => 100644 PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/LUT_mc12.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/LUT_mc12.root b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/LUT_mc12.root
old mode 100755
new mode 100644
diff --git a/Reconstruction/RecExample/RecExConfig/python/AutoConfiguration.py b/Reconstruction/RecExample/RecExConfig/python/AutoConfiguration.py
index 890b55ebf82..acc22a2478f 100644
--- a/Reconstruction/RecExample/RecExConfig/python/AutoConfiguration.py
+++ b/Reconstruction/RecExample/RecExConfig/python/AutoConfiguration.py
@@ -23,7 +23,8 @@ KnownCosmicsProjects=frozenset(["data08_calocomm","data08_muoncomm","data08_cos"
"data14_calib","data14_calocomm","data14_cos","data14_idcomm","data14_larcomm","data14_muoncomm","data14_tilecomm",
"data15_calib","data15_calocomm","data15_cos","data15_idcomm","data15_larcomm","data15_muoncomm","data15_tilecomm",
"data16_calib","data16_calocomm","data16_cos","data16_idcomm","data16_larcomm","data16_muoncomm","data16_tilecomm",
- "data17_calib","data17_calocomm","data17_cos","data17_idcomm","data17_larcomm","data17_muoncomm","data17_tilecomm"
+ "data17_calib","data17_calocomm","data17_cos","data17_idcomm","data17_larcomm","data17_muoncomm","data17_tilecomm",
+ "data18_calib","data18_calocomm","data18_cos","data18_idcomm","data18_larcomm","data18_muoncomm","data18_tilecomm"
])
# Abandon the single-beam reconstruction all together, 26 February 2011
@@ -39,10 +40,11 @@ KnownCollisionsProjects=frozenset(["data08","data08_coll900","data09","data09_co
"data13_8TeV","data13_comm","data13_2p76TeV","data13_1beam",
"data14_comm","data15_comm","data15_900GeV","data15_1beam","data15_13TeV","data15_5TeV",
"data16_comm","data16_13TeV","data16_900GeV","data16_1beam",
- "data17_comm","data17_13TeV","data17_900GeV","data17_1beam","data17_5TeV"
+ "data17_comm","data17_13TeV","data17_900GeV","data17_1beam","data17_5TeV",
+ "data18_comm","data18_13TeV","data18_900GeV","data18_1beam","data18_1p8TeV"
])
-KnownHeavyIonProjects=frozenset(["data10_hi","data11_hi","data15_hi","data16_hi","data17_hi"])
+KnownHeavyIonProjects=frozenset(["data10_hi","data11_hi","data15_hi","data16_hi","data17_hi","data18_hi"])
KnownHeavyIonProtonProjects=frozenset(["data12_hip","data13_hip","data16_hip","data16_hip5TeV","data16_hip8TeV"])
--
GitLab