From 2665c5eba874c5dcc738dc2e2982cac1aa3838f0 Mon Sep 17 00:00:00 2001
From: Catrin Bernius <Catrin.Bernius@cern.ch>
Date: Thu, 10 May 2018 11:22:36 +0200
Subject: [PATCH] ATR-17934: moving slice flags from
 TriggerMenuMT/python/HLTConfig/ subfolders for signatures to
 TriggerJobOpts/python

---
 .../Combined => TriggerJobOpts/python}/CombinedSliceFlags.py  | 4 ++--
 .../Egamma => TriggerJobOpts/python}/EgammaSliceFlags.py      | 4 ++--
 .../Muon => TriggerJobOpts/python}/MuonSliceFlags.py          | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)
 rename Trigger/TriggerCommon/{TriggerMenuMT/python/HLTMenuConfig/Combined => TriggerJobOpts/python}/CombinedSliceFlags.py (84%)
 rename Trigger/TriggerCommon/{TriggerMenuMT/python/HLTMenuConfig/Egamma => TriggerJobOpts/python}/EgammaSliceFlags.py (96%)
 rename Trigger/TriggerCommon/{TriggerMenuMT/python/HLTMenuConfig/Muon => TriggerJobOpts/python}/MuonSliceFlags.py (91%)

diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Combined/CombinedSliceFlags.py b/Trigger/TriggerCommon/TriggerJobOpts/python/CombinedSliceFlags.py
similarity index 84%
rename from Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Combined/CombinedSliceFlags.py
rename to Trigger/TriggerCommon/TriggerJobOpts/python/CombinedSliceFlags.py
index 51de8a007af..8d9879af3a6 100755
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Combined/CombinedSliceFlags.py
+++ b/Trigger/TriggerCommon/TriggerJobOpts/python/CombinedSliceFlags.py
@@ -3,7 +3,7 @@
 """ Combined slices specific flags  """
 
 from AthenaCommon.JobProperties         import JobProperty, JobPropertyContainer, jobproperties
-from TriggerMenu.menu.CommonSliceHelper import CommonSliceHelper, AllowedList
+from TriggerJobOpts.CommonSignatureHelper import CommonSignatureHelper, AllowedList
 
 __author__  = 'T. Bold, B. Demirkoz'
 __version__="$Revision: 1.53 $"
@@ -21,7 +21,7 @@ class signatures(JobProperty):
 _flags.append(signatures)
 
 # create container
-class CombinedSlice(JobPropertyContainer, CommonSliceHelper):
+class CombinedSlice(JobPropertyContainer, CommonSignatureHelper):
     """ Combined Slices Flags """
 
 from TriggerJobOpts.TriggerFlags import TriggerFlags
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/EgammaSliceFlags.py b/Trigger/TriggerCommon/TriggerJobOpts/python/EgammaSliceFlags.py
similarity index 96%
rename from Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/EgammaSliceFlags.py
rename to Trigger/TriggerCommon/TriggerJobOpts/python/EgammaSliceFlags.py
index 0c0f6abe9c4..cca7d203f9b 100755
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/EgammaSliceFlags.py
+++ b/Trigger/TriggerCommon/TriggerJobOpts/python/EgammaSliceFlags.py
@@ -4,7 +4,7 @@
 
 from AthenaCommon.Logging import logging
 from AthenaCommon.JobProperties import JobProperty, JobPropertyContainer
-from TriggerMenu.menu.CommonSliceHelper import CommonSliceHelper
+from TriggerJobOpts.CommonSignatureHelper import CommonSignatureHelper
 
 __author__  = 'T. Bold, P.Urquijo, R. White'
 __version__="$Revision: 1.42 $"
@@ -100,7 +100,7 @@ class calibMVAVersion (JobProperty):
 _flags.append(calibMVAVersion)
 
 # create container
-class EgammaSlice(JobPropertyContainer, CommonSliceHelper):
+class EgammaSlice(JobPropertyContainer, CommonSignatureHelper):
     """ Egamma Slice Flags """
 
 from TriggerJobOpts.TriggerFlags import TriggerFlags
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSliceFlags.py b/Trigger/TriggerCommon/TriggerJobOpts/python/MuonSliceFlags.py
similarity index 91%
rename from Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSliceFlags.py
rename to Trigger/TriggerCommon/TriggerJobOpts/python/MuonSliceFlags.py
index 151d4083dbb..16f08fa3421 100755
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSliceFlags.py
+++ b/Trigger/TriggerCommon/TriggerJobOpts/python/MuonSliceFlags.py
@@ -3,7 +3,7 @@
 """ Muon slice specific flags  """
 
 from AthenaCommon.JobProperties         import JobProperty, JobPropertyContainer, jobproperties
-from TriggerMenu.menu.CommonSliceHelper import CommonSliceHelper
+from TriggerJobOpts.CommonSignatureHelper import CommonSignatureHelper
 
 
 __author__  = 'T. Bold, B.Demirkoz'
@@ -46,7 +46,7 @@ _flags.append(signatures)
 
 # create container
 
-class MuonSlice(JobPropertyContainer, CommonSliceHelper):
+class MuonSlice(JobPropertyContainer, CommonSignatureHelper):
     """ Muon Slice Flags """
 
 from TriggerJobOpts.TriggerFlags import TriggerFlags
-- 
GitLab