From 1428434fde7d90e3efbc81f35c61c10e364f95f9 Mon Sep 17 00:00:00 2001
From: Tomasz Bold <tomasz.bold@gmail.com>
Date: Wed, 31 Jul 2019 14:13:29 +0000
Subject: [PATCH] Unified naming of HLT JSON files
---
.../TrigValidation/TrigUpgradeTest/share/newJOtest.py | 9 +++++++--
.../python/HLTMenuConfig/Menu/HLTMenuJSON.py | 5 +++--
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/newJOtest.py b/Trigger/TrigValidation/TrigUpgradeTest/share/newJOtest.py
index 259180c9f4e..4a6246eb529 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/newJOtest.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/newJOtest.py
@@ -24,9 +24,14 @@ flags.Detector.GeometryCSC = True
flags.Detector.GeometryRPC = True
flags.Trigger.writeBS=True # switches on HLTResultMT creation
-exec("from TriggerMenuMT.HLTMenuConfig.Menu."+flags.Trigger.triggerMenuSetup +" import setupMenu")
+
+import importlib
+setupMenuPath = "TriggerMenuMT.HLTMenuConfig.Menu."+flags.Trigger.triggerMenuSetup
+setupMenuModule = importlib.import_module( setupMenuPath )
+assert setupMenuModule != None, "Could not import module {}".format(setupMenuPath)
+assert setupMenuModule.setupMenu != None, "Could not import setupMenu from {}".format(setupMenuPath)
flags.needFlagsCategory('Trigger')
-setupMenu(flags)
+setupMenuModule.setupMenu(flags)
flags.Input.isMC = False
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/HLTMenuJSON.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/HLTMenuJSON.py
index 69cb5ad2d17..e4696bcbccd 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/HLTMenuJSON.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/HLTMenuJSON.py
@@ -38,7 +38,8 @@ def generateJSON( allStepsSequence ):
from TriggerJobOpts.TriggerFlags import TriggerFlags
from TriggerMenuMT.HLTMenuConfig.Menu.TriggerConfigHLT import TriggerConfigHLT
triggerConfigHLT = TriggerConfigHLT.currentTriggerConfig()
- return __generateJSON( triggerConfigHLT.allChainDicts, None, TriggerFlags.outputHLTconfigFile().replace( '.xml', '' ) )
+ import os
+ return __generateJSON( triggerConfigHLT.allChainDicts, None, "HLTmenu_"+os.getenv( "AtlasVersion" ) + "." + TriggerFlags.triggerMenuSetup() )
def generateJSON_newJO( allStepsSequence ):
__log.info("Generating HLT JSON config in the new JO")
@@ -56,4 +57,4 @@ def generateJSON_newJO( allStepsSequence ):
chainDicts.append( decoder.getChainDict( chain ) )
import os
- return __generateJSON( chainDicts, None, "HLTconfig_"+os.getenv( "AtlasVersion" ) + "." + ConfigFlags.Trigger.triggerMenuSetup )
+ return __generateJSON( chainDicts, None, "HLTmenu_"+os.getenv( "AtlasVersion" ) + "." + ConfigFlags.Trigger.triggerMenuSetup )
--
GitLab