Add setting ConfigFlags.Input.Files or ConfigFlags.Trigger.EDMVersion in a few JO files

Event/EventOverlay/EventOverlayJobTransforms/share/skeleton.BSOverlayFilter_tf.py

@@ -24,6 +24,8 @@ if hasattr( runArgs, 'inputZeroBiasBSFile'):
     athenaCommonFlags.FilesInput=runArgs.inputZeroBiasBSFile
 else:
     athenaCommonFlags.FilesInput=runArgs.inputBS_SKIMFile
+from AthenaConfiguration.AllConfigFlags import ConfigFlags
+ConfigFlags.Input.Files = athenaCommonFlags.FilesInput()
 
 #---------------------------
 ## Run performance monitoring (memory logging)

Reconstruction/RecJobTransforms/share/skeleton.MergePool_tf.py

@@ -15,6 +15,8 @@ import logging
 recoLog = logging.getLogger('merge_pool')
 recoLog.info( '****************** STARTING POOL FILE MERGING *****************' )
 
+from AthenaConfiguration.AllConfigFlags import ConfigFlags
+
 ## Input
 # Deal with generic case first of all
 if hasattr(runArgs, "inputPOOL_MRG_INPUTFile"):
@@ -43,6 +45,7 @@ if hasattr(runArgs,"inputAODFile"):
     rec.readAOD.set_Value_and_Lock( True )
     rec.doWriteAOD.set_Value_and_Lock( True )
     athenaCommonFlags.PoolAODInput.set_Value_and_Lock( runArgs.inputAODFile )
+    ConfigFlags.Input.Files = athenaCommonFlags.PoolAODInput()
     rec.doAODMerging.set_Value_and_Lock(True)
     rec.doApplyAODFix.set_Value_and_Lock(False)
 
@@ -50,6 +53,7 @@ if hasattr(runArgs,"inputESDFile"):
     rec.readESD.set_Value_and_Lock( True )
     rec.doWriteESD.set_Value_and_Lock( True )
     athenaCommonFlags.PoolESDInput.set_Value_and_Lock( runArgs.inputESDFile )
+    ConfigFlags.Input.Files = athenaCommonFlags.PoolESDInput()
 
 ## Output
 if hasattr(runArgs,"outputAOD_MRGFile"): athenaCommonFlags.PoolAODOutput.set_Value_and_Lock( runArgs.outputAOD_MRGFile )

Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigAOD_TrigDecTool.py

@@ -2,6 +2,7 @@
 
 from RecExConfig.RecFlags import rec
 from AthenaCommon.AthenaCommonFlags import athenaCommonFlags as acf
+from AthenaConfiguration.AllConfigFlags import ConfigFlags
 
 rec.readAOD=True
 
@@ -51,6 +52,7 @@ if not ('fileList' in dir()) and not ('RunningRTT' in dir()):
 #added for RTT-chainstore conmpatibility
 if not ('RunningRTT' in dir()):
     acf.FilesInput=fileList
+    ConfigFlags.Input.Files = acf.FilesInput()
 #acf.FilesInput=fileList
 
 ###############################

Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigAOD_TrigEDMAuxCheck.py

@@ -3,6 +3,7 @@
 
 from RecExConfig.RecFlags import rec
 from AthenaCommon.AthenaCommonFlags import athenaCommonFlags as acf
+from AthenaConfiguration.AllConfigFlags import ConfigFlags
 
 rec.readAOD=True
 
@@ -54,6 +55,7 @@ if not ('fileList' in dir()) and not ('RunningRTT' in dir()):
 #added for RTT-chainstore conmpatibility
 if not ('RunningRTT' in dir()):
     acf.FilesInput=fileList
+    ConfigFlags.Input.Files = acf.FilesInput()
 #acf.FilesInput=fileList
 
 

Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigAOD_TrigEDMCheck.py

@@ -3,6 +3,7 @@
 
 from RecExConfig.RecFlags import rec
 from AthenaCommon.AthenaCommonFlags import athenaCommonFlags as acf
+from AthenaConfiguration.AllConfigFlags import ConfigFlags
 
 rec.readAOD=True
 
@@ -54,6 +55,7 @@ if not ('fileList' in dir()) and not ('RunningRTT' in dir()):
 #added for RTT-chainstore conmpatibility
 if not ('RunningRTT' in dir()):
     acf.FilesInput=fileList
+    ConfigFlags.Input.Files = acf.FilesInput()
 #acf.FilesInput=fileList
 
 

Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigAODtoAOD_TrigNavSlimming.py

@@ -2,6 +2,7 @@
 # the navigation structure
 from RecExConfig.RecFlags import rec
 from AthenaCommon.AthenaCommonFlags import athenaCommonFlags as acf
+from AthenaConfiguration.AllConfigFlags import ConfigFlags
 
 rec.doCBNT=False
 rec.doWriteRDO=False
@@ -29,6 +30,7 @@ else:
     acf.PoolAODOutput = PoolAODOutput
 
 acf.FilesInput=acf.PoolAODInput()
+ConfigFlags.Input.Files = acf.FilesInput()
 
 # Setup slimming
 include ("TrigNavTools/TrigNavigationSlimming_test.py")

Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigBStoESD.py

@@ -4,6 +4,7 @@
 
 from RecExConfig.RecFlags import rec
 from AthenaCommon.AthenaCommonFlags import athenaCommonFlags as acf
+from AthenaConfiguration.AllConfigFlags import ConfigFlags
 
 from AthenaCommon.Logging import logging 
 log = logging.getLogger("testAthenaTrigBStoESD.py:") 
@@ -50,6 +51,7 @@ import os
 if not os.path.exists(acf.BSRDOInput()[0]):
    log.fatal(" ERROR FATAL Input file acf.BSRDOInput()[0] does not exist: " + acf.BSRDOInput()[0])
    exit(-2)
+ConfigFlags.Input.Files = acf.BSRDOInput()
 
 exit
 

Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigESD_HLTMonitoring.py

@@ -5,6 +5,7 @@
 
 from RecExConfig.RecFlags import rec
 from AthenaCommon.AthenaCommonFlags import athenaCommonFlags as acf
+from AthenaConfiguration.AllConfigFlags import ConfigFlags
 
 if not ('fileList' in dir()):
      fileList=['/afs/cern.ch/atlas/project/trigger/pesa-sw/validation/validation-data/valid1.105200.T1_McAtNlo_Jimmy.recon.AOD.e380_s764_r1295/AOD.134900._000001.pool.root.1']
@@ -12,7 +13,7 @@ if not ('fileList' in dir()):
 # allow this to work in RTT
 if not fileList == []:
     acf.FilesInput=fileList
-
+    ConfigFlags.Input.Files = acf.FilesInput()
 
 if not 'RootNtupleOutput' in dir():
     rec.RootNtupleOutput="ntuple_fromAOD.root"

Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigRDOtoAOD.py

@@ -2,6 +2,7 @@
 
 from RecExConfig.RecFlags import rec
 from AthenaCommon.AthenaCommonFlags import athenaCommonFlags as acf
+from AthenaConfiguration.AllConfigFlags import ConfigFlags
 
 if not acf.EvtMax.is_locked():
     acf.EvtMax=10
@@ -22,6 +23,9 @@ doTAG=False
 rec.doCBNT=False 
 #rec.doTruth=True
 
+# Legacy (Run-2) trigger produces Run-2 EDM
+ConfigFlags.Trigger.EDMVersion = 2
+
 #-----------------------------------------------------------
 include("RecExCond/RecExCommon_flags.py")
 #-----------------------------------------------------------

Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigRDOtoAODSLIM.py

@@ -2,6 +2,7 @@
 
 from RecExConfig.RecFlags import rec
 from AthenaCommon.AthenaCommonFlags import athenaCommonFlags as acf
+from AthenaConfiguration.AllConfigFlags import ConfigFlags
 
 if not acf.EvtMax.is_locked():
     acf.EvtMax=10
@@ -21,6 +22,9 @@ doTAG=False
 rec.doCBNT=False 
 #rec.doTruth=True
 
+# Legacy (Run-2) trigger produces Run-2 EDM
+ConfigFlags.Trigger.EDMVersion = 2
+
 #-----------------------------------------------------------
 include("RecExCond/RecExCommon_flags.py")
 #-----------------------------------------------------------

Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigRDOtoBS.py

@@ -32,6 +32,10 @@ doTAG=False
 rec.doCBNT=False
 #rec.doTruth=True
 
+# Legacy (Run-2) trigger produces Run-2 EDM
+from AthenaConfiguration.AllConfigFlags import ConfigFlags
+ConfigFlags.Trigger.EDMVersion = 2
+
 #-----------------------------------------------------------
 include("RecExCond/RecExCommon_flags.py")
 #-----------------------------------------------------------

Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigRDOtoESDAOD.py

@@ -4,6 +4,7 @@
 
 from RecExConfig.RecFlags import rec
 from AthenaCommon.AthenaCommonFlags import athenaCommonFlags as acf
+from AthenaConfiguration.AllConfigFlags import ConfigFlags
 
 if not acf.EvtMax.is_locked():
     acf.EvtMax=10
@@ -24,6 +25,9 @@ doTAG=False
 rec.doCBNT=False
 #rec.doTruth=True
 
+# Legacy (Run-2) trigger produces Run-2 EDM
+ConfigFlags.Trigger.EDMVersion = 2
+
 #-----------------------------------------------------------
 include("RecExCond/RecExCommon_flags.py")
 #-----------------------------------------------------------