From e46646995e15cdbb0d3abbea2ba72dc0556dc79f Mon Sep 17 00:00:00 2001
From: Tadej Novak <tadej.novak@cern.ch>
Date: Mon, 17 Jan 2022 12:23:03 +0100
Subject: [PATCH] Better handle jobs with no inputs

---
 Control/AthenaConfiguration/python/AllConfigFlags.py | 12 +++---------
 .../AthenaConfiguration/python/AutoConfigFlags.py    |  5 ++++-
 .../python/GeoModelConfigFlags.py                    |  4 +---
 Control/AthenaMP/python/AthenaMPConfig.py            |  2 +-
 .../PerfMonTests/test/test_perfMonMTSvc_mt1.py       |  1 +
 .../PerfMonTests/test/test_perfMonMTSvc_mt8.py       |  1 +
 .../PerfMonTests/test/test_perfMonMTSvc_serial.py    |  1 +
 .../PixelGeoModelXml/test/ITkPixelGMConfig_test.py   |  2 +-
 .../StripGeoModelXml/test/ITkStripGMConfig_test.py   |  2 +-
 .../python/LArCalib_Delay_OFCCaliConfig.py           |  3 +--
 .../python/LArCalib_OFCPhysConfig.py                 |  2 +-
 .../python/LArCalib_PedestalAutoCorrConfig.py        |  2 --
 .../python/LArCalib_PhysWavePredictionConfig.py      |  3 +--
 .../python/LArCalib_PileUpAutoCorrConfig.py          |  3 +--
 .../python/LArCalib_RTMParamsConfig.py               |  3 +--
 .../RecJobTransforms/test/RecoSteeringTest.py        |  2 +-
 .../python/SetupEgammaMonitoring.py                  |  4 ++--
 .../python/CommonSimulationSteering.py               |  2 +-
 .../SimuJobTransforms/python/G4AtlasAlg_Skeleton.py  |  2 +-
 Simulation/SimuJobTransforms/python/ISF_Skeleton.py  |  2 +-
 .../TrigConfigSvc/python/TrigConfigSvcCfg.py         |  4 ++--
 .../TriggerJobOpts/python/TriggerConfigFlags.py      |  3 +--
 .../TriggerJobOpts/share/runHLT_standalone.py        |  3 +--
 .../TriggerMenuMT/scripts/checkMenuPrimaries.py      |  1 +
 .../TriggerMenuMT/scripts/generateL1MenuRun3.py      |  1 +
 25 files changed, 31 insertions(+), 39 deletions(-)

diff --git a/Control/AthenaConfiguration/python/AllConfigFlags.py b/Control/AthenaConfiguration/python/AllConfigFlags.py
index 1871b5fb00a4..07f860d5c673 100644
--- a/Control/AthenaConfiguration/python/AllConfigFlags.py
+++ b/Control/AthenaConfiguration/python/AllConfigFlags.py
@@ -46,18 +46,12 @@ def _createCfgFlags():
     acf.addFlag('Input.SpecialConfiguration', lambda prevFlags : getSpecialConfigurationMetadata(prevFlags.Input.Files, prevFlags.Input.SecondaryFiles))  # special Configuration options read from input file metadata
 
     def _inputCollections(inputFile):
-        if not inputFile:
-            return []
-
-        rawCollections = [type_key[1] for type_key in GetFileMD(inputFile).get("itemList",[])]
-        collections = [col for col in rawCollections if not col.endswith('Aux.') ]
+        rawCollections = [type_key[1] for type_key in GetFileMD(inputFile).get("itemList", [])]
+        collections = [col for col in rawCollections if not col.endswith('Aux.')]
         return collections
 
     def _typedInputCollections(inputFile):
-        if not inputFile or inputFile==["_ATHENA_GENERIC_INPUTFILE_NAME_"]:
-            return []
-
-        collections = ['%s#%s' % type_key for type_key in GetFileMD(inputFile).get("itemList",[])]
+        collections = ['%s#%s' % type_key for type_key in GetFileMD(inputFile).get("itemList", [])]
         return collections
 
     acf.addFlag('Input.Collections', lambda prevFlags : _inputCollections(prevFlags.Input.Files) )
diff --git a/Control/AthenaConfiguration/python/AutoConfigFlags.py b/Control/AthenaConfiguration/python/AutoConfigFlags.py
index b65392010b92..49a71194f99f 100644
--- a/Control/AthenaConfiguration/python/AutoConfigFlags.py
+++ b/Control/AthenaConfiguration/python/AutoConfigFlags.py
@@ -47,9 +47,12 @@ class DynamicallyLoadMetadata:
         return self.metadata.keys()
 
 def GetFileMD(filenames):
+    if not filenames:
+        msg.info("Running an input-less job. Will have empty metadata.")
+        return {}
     if isinstance(filenames, str):
         filenames = [filenames]
-    if ['_ATHENA_GENERIC_INPUTFILE_NAME_'] == filenames:
+    if '_ATHENA_GENERIC_INPUTFILE_NAME_' in filenames:
         raise RuntimeError('Input file name not set, instead _ATHENA_GENERIC_INPUTFILE_NAME_ found. Cannot read metadata.')
     for filename in filenames:
         if filename not in _fileMetaData:
diff --git a/Control/AthenaConfiguration/python/GeoModelConfigFlags.py b/Control/AthenaConfiguration/python/GeoModelConfigFlags.py
index 3c6c3b63a409..469353d61387 100644
--- a/Control/AthenaConfiguration/python/GeoModelConfigFlags.py
+++ b/Control/AthenaConfiguration/python/GeoModelConfigFlags.py
@@ -10,9 +10,7 @@ def createGeoModelConfigFlags():
     gcf.addFlag('GeoModel.Layout', 'atlas') # replaces global.GeoLayout
 
     gcf.addFlag("GeoModel.AtlasVersion",
-                lambda prevFlags : ((prevFlags.Input.Files and
-                                    prevFlags.Input.Files != ["_ATHENA_GENERIC_INPUTFILE_NAME_"] and
-                                    GetFileMD(prevFlags.Input.Files).get("GeoAtlas",None))
+                lambda prevFlags : (GetFileMD(prevFlags.Input.Files).get("GeoAtlas", None)
                                     or "ATLAS-R2-2016-01-00-01"))
 
     gcf.addFlag("GeoModel.Align.Dynamic",
diff --git a/Control/AthenaMP/python/AthenaMPConfig.py b/Control/AthenaMP/python/AthenaMPConfig.py
index 4cc535807b7c..d09368754cf7 100644
--- a/Control/AthenaMP/python/AthenaMPConfig.py
+++ b/Control/AthenaMP/python/AthenaMPConfig.py
@@ -149,7 +149,7 @@ def getChunkSize(configFlags) -> int:
     if configFlags.MP.ChunkSize > 0:
         chunk_size = configFlags.MP.ChunkSize
         msg.info('Chunk size set to %i', chunk_size)
-    elif configFlags.Input.Files != ["_ATHENA_GENERIC_INPUTFILE_NAME_"]:
+    else:
         md = GetFileMD(configFlags.Input.Files)
         #Don't use auto flush for shared reader
         if configFlags.MP.UseSharedReader:
diff --git a/Control/PerformanceMonitoring/PerfMonTests/test/test_perfMonMTSvc_mt1.py b/Control/PerformanceMonitoring/PerfMonTests/test/test_perfMonMTSvc_mt1.py
index 00e158e55280..bb509504154c 100755
--- a/Control/PerformanceMonitoring/PerfMonTests/test/test_perfMonMTSvc_mt1.py
+++ b/Control/PerformanceMonitoring/PerfMonTests/test/test_perfMonMTSvc_mt1.py
@@ -13,6 +13,7 @@ if __name__ == '__main__':
 
     # Set the necessary configuration flags
     # Process 100 events in 1 thread/slot and do full monitoring
+    ConfigFlags.Input.Files = []
     ConfigFlags.Exec.MaxEvents = 100
     ConfigFlags.Concurrency.NumProcs = 1
     ConfigFlags.Concurrency.NumThreads = 1
diff --git a/Control/PerformanceMonitoring/PerfMonTests/test/test_perfMonMTSvc_mt8.py b/Control/PerformanceMonitoring/PerfMonTests/test/test_perfMonMTSvc_mt8.py
index 4ab546fa939e..9bbf348beece 100755
--- a/Control/PerformanceMonitoring/PerfMonTests/test/test_perfMonMTSvc_mt8.py
+++ b/Control/PerformanceMonitoring/PerfMonTests/test/test_perfMonMTSvc_mt8.py
@@ -13,6 +13,7 @@ if __name__ == '__main__':
 
     # Set the necessary configuration flags
     # Process 100 events in 8 threads/slots and do full monitoring
+    ConfigFlags.Input.Files = []
     ConfigFlags.Exec.MaxEvents = 100
     ConfigFlags.Concurrency.NumProcs = 8
     ConfigFlags.Concurrency.NumThreads = 8
diff --git a/Control/PerformanceMonitoring/PerfMonTests/test/test_perfMonMTSvc_serial.py b/Control/PerformanceMonitoring/PerfMonTests/test/test_perfMonMTSvc_serial.py
index a1765d193857..d2f17b691357 100755
--- a/Control/PerformanceMonitoring/PerfMonTests/test/test_perfMonMTSvc_serial.py
+++ b/Control/PerformanceMonitoring/PerfMonTests/test/test_perfMonMTSvc_serial.py
@@ -13,6 +13,7 @@ if __name__ == '__main__':
 
     # Set the necessary configuration flags
     # Process 100 events in serial and do full monitoring
+    ConfigFlags.Input.Files = []
     ConfigFlags.Exec.MaxEvents = 100
     ConfigFlags.PerfMon.doFullMonMT = True
     ConfigFlags.PerfMon.OutputJSON = 'perfmonmt_test.json'
diff --git a/InnerDetector/InDetDetDescr/PixelGeoModelXml/test/ITkPixelGMConfig_test.py b/InnerDetector/InDetDetDescr/PixelGeoModelXml/test/ITkPixelGMConfig_test.py
index 7a7ea21cfe51..ebe941b86df7 100755
--- a/InnerDetector/InDetDetDescr/PixelGeoModelXml/test/ITkPixelGMConfig_test.py
+++ b/InnerDetector/InDetDetDescr/PixelGeoModelXml/test/ITkPixelGMConfig_test.py
@@ -8,7 +8,7 @@ if __name__ == "__main__":
     Configurable.configurableRun3Behavior=1
     from AthenaConfiguration.AllConfigFlags import ConfigFlags
 
-    ConfigFlags.Input.Files = "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/PhaseIIUpgrade/HITS/ttbar.HITS.pool.root"
+    ConfigFlags.Input.Files = ["/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/PhaseIIUpgrade/HITS/ttbar.HITS.pool.root"]
     ConfigFlags.IOVDb.GlobalTag = "OFLCOND-MC16-SDR-16"
     ConfigFlags.GeoModel.Align.Dynamic = False
     ConfigFlags.lock()
diff --git a/InnerDetector/InDetDetDescr/StripGeoModelXml/test/ITkStripGMConfig_test.py b/InnerDetector/InDetDetDescr/StripGeoModelXml/test/ITkStripGMConfig_test.py
index c5a822dcf57e..4781a7297f99 100755
--- a/InnerDetector/InDetDetDescr/StripGeoModelXml/test/ITkStripGMConfig_test.py
+++ b/InnerDetector/InDetDetDescr/StripGeoModelXml/test/ITkStripGMConfig_test.py
@@ -8,7 +8,7 @@ if __name__ == "__main__":
     Configurable.configurableRun3Behavior=1
     from AthenaConfiguration.AllConfigFlags import ConfigFlags
 
-    ConfigFlags.Input.Files = "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/PhaseIIUpgrade/HITS/ttbar.HITS.pool.root"
+    ConfigFlags.Input.Files = ["/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/PhaseIIUpgrade/HITS/ttbar.HITS.pool.root"]
     ConfigFlags.IOVDb.GlobalTag = "OFLCOND-MC16-SDR-16"
     ConfigFlags.GeoModel.Align.Dynamic = False
     ConfigFlags.lock()
diff --git a/LArCalorimeter/LArExample/LArCalibProcessing/python/LArCalib_Delay_OFCCaliConfig.py b/LArCalorimeter/LArExample/LArCalibProcessing/python/LArCalib_Delay_OFCCaliConfig.py
index 3347444b9584..809ecc2461ae 100644
--- a/LArCalorimeter/LArExample/LArCalibProcessing/python/LArCalib_Delay_OFCCaliConfig.py
+++ b/LArCalorimeter/LArExample/LArCalibProcessing/python/LArCalib_Delay_OFCCaliConfig.py
@@ -171,14 +171,13 @@ if __name__ == "__main__":
     from LArCalibProcessing.LArCalibConfigFlags import addLArCalibFlags
     addLArCalibFlags(ConfigFlags)
 
-    ConfigFlags.Input.TypedCollections=[]
     ConfigFlags.LArCalib.Input.Dir = "/scratch/wlampl/calib21/Aug27"
     ConfigFlags.LArCalib.Input.Type="calibration_LArElec-Delay"
     ConfigFlags.LArCalib.Input.RunNumbers=[400268,]
     ConfigFlags.LArCalib.Input.Database="db.sqlite"
-    ConfigFlags.Input.Files=ConfigFlags.LArCalib.Input.Files
     ConfigFlags.LArCalib.Preselection.BEC=[1]
     ConfigFlags.LArCalib.Preselection.Side=[0]
+    ConfigFlags.Input.Files=ConfigFlags.LArCalib.Input.Files
 
 
     ConfigFlags.LArCalib.Output.ROOTFile="ofccali.root"
diff --git a/LArCalorimeter/LArExample/LArCalibProcessing/python/LArCalib_OFCPhysConfig.py b/LArCalorimeter/LArExample/LArCalibProcessing/python/LArCalib_OFCPhysConfig.py
index 6a8550290625..d60a46e81130 100644
--- a/LArCalorimeter/LArExample/LArCalibProcessing/python/LArCalib_OFCPhysConfig.py
+++ b/LArCalorimeter/LArExample/LArCalibProcessing/python/LArCalib_OFCPhysConfig.py
@@ -161,7 +161,7 @@ if __name__ == "__main__":
     from LArCalibProcessing.LArCalibConfigFlags import addLArCalibFlags
     addLArCalibFlags(ConfigFlags)
 
-    ConfigFlags.Input.TypedCollections=[]
+    ConfigFlags.Input.Files=[]
     ConfigFlags.LArCalib.Input.RunNumbers=[500000]
     ConfigFlags.LArCalib.Input.Database="/home/wlampl/calibTest/00403758_00403761_00403762_EndCap-EMB-EMEC_HIGH_40_21.0.20_1/poolFiles/myDB200_00403758_00403761_00403762_EB-EMECC_one.db"
     ConfigFlags.LArCalib.Input.SubDet="EM"
diff --git a/LArCalorimeter/LArExample/LArCalibProcessing/python/LArCalib_PedestalAutoCorrConfig.py b/LArCalorimeter/LArExample/LArCalibProcessing/python/LArCalib_PedestalAutoCorrConfig.py
index e10ec7304aa5..ccdfbc31f6e1 100644
--- a/LArCalorimeter/LArExample/LArCalibProcessing/python/LArCalib_PedestalAutoCorrConfig.py
+++ b/LArCalorimeter/LArExample/LArCalibProcessing/python/LArCalib_PedestalAutoCorrConfig.py
@@ -164,8 +164,6 @@ if __name__ == "__main__":
     from LArCalibProcessing.LArCalibConfigFlags import addLArCalibFlags
     addLArCalibFlags(ConfigFlags)
 
-    ConfigFlags.Input.TypedCollections=[]
-
     ConfigFlags.LArCalib.Input.Dir = "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/LArCalibProcessing"
     ConfigFlags.LArCalib.Input.Type="calibration_LArElec-Pedestal"
     ConfigFlags.LArCalib.Input.RunNumbers=[174585,]
diff --git a/LArCalorimeter/LArExample/LArCalibProcessing/python/LArCalib_PhysWavePredictionConfig.py b/LArCalorimeter/LArExample/LArCalibProcessing/python/LArCalib_PhysWavePredictionConfig.py
index 3176213a7ec0..dbbfd2df5e11 100644
--- a/LArCalorimeter/LArExample/LArCalibProcessing/python/LArCalib_PhysWavePredictionConfig.py
+++ b/LArCalorimeter/LArExample/LArCalibProcessing/python/LArCalib_PhysWavePredictionConfig.py
@@ -149,8 +149,7 @@ if __name__ == "__main__":
     from LArCalibProcessing.LArCalibConfigFlags import addLArCalibFlags
     addLArCalibFlags(ConfigFlags)
 
-
-    ConfigFlags.Input.TypedCollections=[]
+    ConfigFlags.Input.Files=[]
     ConfigFlags.LArCalib.Input.RunNumbers=[401351,]
     ConfigFlags.LArCalib.Input.Database="/home/wlampl/calibTest/00400939_00400943_00400945_Barrel-EMB-EMEC_HIGH_40_21.0.20_1/poolFiles/myDB200_00400939_00400943_00400945_EB-EMBA_one.db_Delay"
     ConfigFlags.LArCalib.Input.SubDet="EM"
diff --git a/LArCalorimeter/LArExample/LArCalibProcessing/python/LArCalib_PileUpAutoCorrConfig.py b/LArCalorimeter/LArExample/LArCalibProcessing/python/LArCalib_PileUpAutoCorrConfig.py
index f16f573f5904..22c4d2a12776 100644
--- a/LArCalorimeter/LArExample/LArCalibProcessing/python/LArCalib_PileUpAutoCorrConfig.py
+++ b/LArCalorimeter/LArExample/LArCalibProcessing/python/LArCalib_PileUpAutoCorrConfig.py
@@ -116,8 +116,7 @@ if __name__ == "__main__":
     from LArCalibProcessing.LArCalibConfigFlags import addLArCalibFlags
     addLArCalibFlags(ConfigFlags)
 
-
-    ConfigFlags.Input.TypedCollections=[]
+    ConfigFlags.Input.Files=[]
     ConfigFlags.LArCalib.Input.RunNumbers=[400939,]
     ConfigFlags.LArCalib.Input.Database="/home/wlampl/calibTest/00400939_00400943_00400945_Barrel-EMB-EMEC_HIGH_40_21.0.20_1/poolFiles/myDB200_00400939_00400943_00400945_EB-EMBA_one.db_Delay"
     ConfigFlags.LArCalib.Input.SubDet="EM"
diff --git a/LArCalorimeter/LArExample/LArCalibProcessing/python/LArCalib_RTMParamsConfig.py b/LArCalorimeter/LArExample/LArCalibProcessing/python/LArCalib_RTMParamsConfig.py
index 75413438b793..86aebb5a13e3 100644
--- a/LArCalorimeter/LArExample/LArCalibProcessing/python/LArCalib_RTMParamsConfig.py
+++ b/LArCalorimeter/LArExample/LArCalibProcessing/python/LArCalib_RTMParamsConfig.py
@@ -134,8 +134,7 @@ if __name__ == "__main__":
     from LArCalibProcessing.LArCalibConfigFlags import addLArCalibFlags
     addLArCalibFlags(ConfigFlags)
 
-
-    ConfigFlags.Input.TypedCollections=[]
+    ConfigFlags.Input.Files=[]
     ConfigFlags.LArCalib.Input.RunNumbers=[401351,]
     ConfigFlags.LArCalib.Input.Database="/home/wlampl/calibTest/00400939_00400943_00400945_Barrel-EMB-EMEC_HIGH_40_21.0.20_1/poolFiles/myDB200_00400939_00400943_00400945_EB-EMBA_one.db_Delay"
     ConfigFlags.LArCalib.Input.SubDet="EM"
diff --git a/Reconstruction/RecJobTransforms/test/RecoSteeringTest.py b/Reconstruction/RecJobTransforms/test/RecoSteeringTest.py
index bbeb267180e4..f06a7f549d98 100755
--- a/Reconstruction/RecJobTransforms/test/RecoSteeringTest.py
+++ b/Reconstruction/RecJobTransforms/test/RecoSteeringTest.py
@@ -22,7 +22,7 @@ def _run(input):
     args = flags.fillFromArgs(parser=parser)
 
     # test inputs
-    if flags.Input.Files == []:
+    if not flags.Input.Files:
         from AthenaConfiguration.TestDefaults import defaultTestFiles
         if input == "RAW":
             flags.Input.Files = defaultTestFiles.RAW
diff --git a/Reconstruction/egamma/egammaPerformance/python/SetupEgammaMonitoring.py b/Reconstruction/egamma/egammaPerformance/python/SetupEgammaMonitoring.py
index 629c64b15d45..424e01bffb98 100755
--- a/Reconstruction/egamma/egammaPerformance/python/SetupEgammaMonitoring.py
+++ b/Reconstruction/egamma/egammaPerformance/python/SetupEgammaMonitoring.py
@@ -948,9 +948,9 @@ if __name__=='__main__':
     file = 'data16_13TeV.00311321.physics_Main.recon.AOD.r9264/AOD.11038520._000001.pool.root.1'
 
     ConfigFlags.Input.Files = [nightly+file]
-#    ConfigFlags.Input.Files = 'AOD.11038520._000001.pool.root.1'
+    # ConfigFlags.Input.Files = ['AOD.11038520._000001.pool.root.1']
     ConfigFlags.Input.isMC = False
-#    ConfigFlags.Output.HISTFileName = 'MonitorEgammaOutput.root'
+    # ConfigFlags.Output.HISTFileName = 'MonitorEgammaOutput.root'
 
 # To produce WebDisplay, filename must follow a certain format
     ConfigFlags.Output.HISTFileName = 'data16_13TeV.00311321.physics_Main.merge.HIST.f1156_h347._0002.1.root'
diff --git a/Simulation/SimuJobTransforms/python/CommonSimulationSteering.py b/Simulation/SimuJobTransforms/python/CommonSimulationSteering.py
index 93b82b595408..af56aca7d361 100644
--- a/Simulation/SimuJobTransforms/python/CommonSimulationSteering.py
+++ b/Simulation/SimuJobTransforms/python/CommonSimulationSteering.py
@@ -33,7 +33,7 @@ def specialConfigPostInclude(ConfigFlags, cfg):
 
 def CommonSimulationCfg(ConfigFlags, log):
     # Configure main services and input reading (if required)
-    if ConfigFlags.Input.Files == '':
+    if not ConfigFlags.Input.Files:
         # Cases 3a, 3b
         from AthenaConfiguration.MainServicesConfig import MainEvgenServicesCfg
         cfg = MainEvgenServicesCfg(ConfigFlags)
diff --git a/Simulation/SimuJobTransforms/python/G4AtlasAlg_Skeleton.py b/Simulation/SimuJobTransforms/python/G4AtlasAlg_Skeleton.py
index b6beb97f5d57..02899d2c2d0e 100644
--- a/Simulation/SimuJobTransforms/python/G4AtlasAlg_Skeleton.py
+++ b/Simulation/SimuJobTransforms/python/G4AtlasAlg_Skeleton.py
@@ -84,7 +84,7 @@ def fromRunArgs(runArgs):
         # Common cases
         # 3a) ParticleGun
         # 3b) CosmicGenerator
-        ConfigFlags.Input.Files = ''
+        ConfigFlags.Input.Files = []
         ConfigFlags.Input.isMC = True
         log.info('No inputEVNTFile provided. Assuming that you are running a generator on the fly.')
         if ConfigFlags.Beam.Type == 'cosmics':
diff --git a/Simulation/SimuJobTransforms/python/ISF_Skeleton.py b/Simulation/SimuJobTransforms/python/ISF_Skeleton.py
index e27dd7b51d8c..e682bfcd7d99 100644
--- a/Simulation/SimuJobTransforms/python/ISF_Skeleton.py
+++ b/Simulation/SimuJobTransforms/python/ISF_Skeleton.py
@@ -94,7 +94,7 @@ def fromRunArgs(runArgs):
         # Common cases
         # 3a) ParticleGun
         # 3b) CosmicGenerator
-        ConfigFlags.Input.Files = ''
+        ConfigFlags.Input.Files = []
         ConfigFlags.Input.isMC = True
         log.info('No inputEVNTFile provided. Assuming that you are running a generator on the fly.')
         if ConfigFlags.Beam.Type == 'cosmics':
diff --git a/Trigger/TrigConfiguration/TrigConfigSvc/python/TrigConfigSvcCfg.py b/Trigger/TrigConfiguration/TrigConfigSvc/python/TrigConfigSvcCfg.py
index e1f4be9d0661..b7b61a6f32e7 100644
--- a/Trigger/TrigConfiguration/TrigConfigSvc/python/TrigConfigSvcCfg.py
+++ b/Trigger/TrigConfiguration/TrigConfigSvc/python/TrigConfigSvcCfg.py
@@ -123,8 +123,8 @@ def getHLTPrescaleFolderName():
 
 def _doMenuConversion(flags):
     """Do JSON menu conversion for Run-1&2 data"""
-    return ('_ATHENA_GENERIC_INPUTFILE_NAME_' not in flags.Input.Files and
-            flags.Trigger.EDMVersion in [1,2] and not flags.Input.isMC)
+    return flags.Input.Files and flags.Trigger.EDMVersion in [1, 2] and not flags.Input.isMC
+
 
 def _getMenuFileName(flags):
     """Return base name for menu files"""
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfigFlags.py b/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfigFlags.py
index 4f9de88d4d66..f599c64075bd 100644
--- a/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfigFlags.py
+++ b/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfigFlags.py
@@ -118,9 +118,8 @@ def createTriggerFlags():
     # True if we have at least one input file, it is a POOL file, it has a metadata store, and the store has xAOD trigger configuration data
     # in either the run-2 or run-3 formats.
     def __trigConfMeta(flags):
-        hasInput = any(flags.Input.Files) and '_ATHENA_GENERIC_INPUTFILE_NAME_' not in flags.Input.Files
         from AthenaConfiguration.AutoConfigFlags import GetFileMD
-        md = GetFileMD(flags.Input.Files) if hasInput else {}
+        md = GetFileMD(flags.Input.Files)
         return ("metadata_items" in md and any(('TriggerMenu' in key) for key in md["metadata_items"].keys()))
 
     # Flag to sense if trigger configuration POOL metadata is available on the job's input
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone.py b/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone.py
index 89dfeaddc7eb..10162d49b62c 100644
--- a/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone.py
+++ b/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone.py
@@ -152,8 +152,7 @@ else:   # athenaHLT
     globalflags.InputFormat = 'bytestream'
     globalflags.DataSource = 'data' if not opt.setupForMC else 'data'
     ConfigFlags.Input.isMC = False
-    ConfigFlags.Input.Collections = []
-    ConfigFlags.Input.TypedCollections = []
+    ConfigFlags.Input.Files = []
     TriggerJobOpts.Modifiers._run_number = globals().get('_run_number')  # set by athenaHLT
     TriggerJobOpts.Modifiers._lb_number = globals().get('_lb_number')  # set by athenaHLT
     if '_run_number' in globals():
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/scripts/checkMenuPrimaries.py b/Trigger/TriggerCommon/TriggerMenuMT/scripts/checkMenuPrimaries.py
index 6d809b56c9dc..e4e8c79e0024 100755
--- a/Trigger/TriggerCommon/TriggerMenuMT/scripts/checkMenuPrimaries.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/scripts/checkMenuPrimaries.py
@@ -9,6 +9,7 @@ def main():
     log.setLevel(logging.INFO)
 
     from AthenaConfiguration.AllConfigFlags import ConfigFlags
+    ConfigFlags.Input.Files = []
     ConfigFlags.Trigger.triggerMenuSetup = "Physics_pp_run3_v1"
 
     TriggerAPI.setRelease("current")
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/scripts/generateL1MenuRun3.py b/Trigger/TriggerCommon/TriggerMenuMT/scripts/generateL1MenuRun3.py
index 1cc5773f0853..78c32b4d493a 100755
--- a/Trigger/TriggerCommon/TriggerMenuMT/scripts/generateL1MenuRun3.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/scripts/generateL1MenuRun3.py
@@ -18,6 +18,7 @@ def main():
     args = parser.parse_args()
 
     # set menu
+    ConfigFlags.Input.Files = []
     ConfigFlags.Trigger.triggerMenuSetup = args.menu
     ConfigFlags.lock()
 
-- 
GitLab