From 8065cfe6f92359d11fb6f172cb0b73d2017abbb6 Mon Sep 17 00:00:00 2001
From: scott snyder <snyder@bnl.gov>
Date: Fri, 31 Jan 2020 16:36:04 +0100
Subject: [PATCH] TriggerTest: python 3 fixes

 - print function
 - commands module
---
 .../TriggerTest/share/TrigScanFiles.py        | 38 ++++++++++---------
 .../TriggerTest/share/TriggerTestCommon.py    | 18 ++++-----
 .../share/testAthenaTrigRDO_standalone.py     |  4 +-
 .../share/testCommonSliceAthenaTrigRDO.py     |  6 +--
 .../testCommonSliceAthenaTrigRDOtoAOD.py      |  4 +-
 .../share/testLVL1CTPAthenaTrigRDO.py         |  8 ++--
 6 files changed, 40 insertions(+), 38 deletions(-)

diff --git a/Trigger/TrigValidation/TriggerTest/share/TrigScanFiles.py b/Trigger/TrigValidation/TriggerTest/share/TrigScanFiles.py
index 0518bd84f8f..aed48d497ac 100644
--- a/Trigger/TrigValidation/TriggerTest/share/TrigScanFiles.py
+++ b/Trigger/TrigValidation/TriggerTest/share/TrigScanFiles.py
@@ -1,67 +1,69 @@
 from RecExConfig.RecFlags import rec
 from AthenaCommon.AthenaCommonFlags import athenaCommonFlags as acf
 
-import os,commands
+from future import standard_library
+standard_library.install_aliases()
+
 def getCastorDirectoryList(path,fileRange):
     cmd  = 'eos ls %s/ ' % (path)
     files = []
-    for i in commands.getoutput(cmd).split('\n'):
+    for i in subprocess.getoutput(cmd).split('\n'):
         fileNumber = i[i.rfind(".pool.root")-5:i.rfind(".pool.root")]
-        print 'fileNumber',fileNumber
+        printfunc ('fileNumber',fileNumber)
         if  int(fileNumber) > fileRange[0]-1 and int(fileNumber) <fileRange[1]+1 :
             collection = 'root://eosatlas.cern.ch/'+path+i
             files += ["root://eosatlas.cern.ch/%s/%s" % (path,i) ]
-    print files 
+    printfunc (files )
     return files 
 
 def getCastorDirectoryListRepeat(path,fileRange,repeatN):
     cmd  = 'eos ls %s/ ' % (path)
     files = []
     for j in range(repeatN):
-        for i in commands.getoutput(cmd).split('\n'):
+        for i in subprocess.getoutput(cmd).split('\n'):
             fileNumber = i[i.rfind(".pool.root")-5:i.rfind(".pool.root")]
-            print 'fileNumber',fileNumber
+            printfunc ('fileNumber',fileNumber)
             if  int(fileNumber) > fileRange[0]-1 and int(fileNumber) <fileRange[1]+1 :
                 collection = 'root://eosatlas.cern.ch/'+path+i
                 files += ["root://eosatlas.cern.ch/%s/%s" % (path,i) ]
-        print files 
+        printfunc (files )
         return files 
 
 def getEOSDirectoryList(path,fileRange):
     cmd  = 'eos ls %s/ ' % (path)
     files = []
-    print cmd
-    for i in commands.getoutput(cmd).split('\n'):
-        print i
+    printfunc (cmd)
+    for i in subprocess.getoutput(cmd).split('\n'):
+        printfunc (i)
         if i.find(".pool.root")==-1:
             continue
         fileNumber = i[i.rfind(".pool.root")-5:i.rfind(".pool.root")]
-        print 'fileNumber',fileNumber
+        printfunc ('fileNumber',fileNumber)
         if  int(fileNumber) > fileRange[0]-1 and int(fileNumber) <fileRange[1]+1 :
             collection = 'root://eosatlas.cern.ch/'+path+i
-            print collection
+            printfunc (collection)
             files += ["root://eosatlas.cern.ch//%s/%s" % (path,i) ]
-    print files
+    printfunc (files)
     return files
 
 def getEOSDirectoryListRepeat(path,fileRange,repeatN):
     cmd  = 'eos ls %s/ ' % (path)
     files = []
     for j in range(repeatN):
-        for i in commands.getoutput(cmd).split('\n'):
-            print i
+        for i in subprocess.getoutput(cmd).split('\n'):
+            printfunc (i)
             if i.find(".pool.root")==-1:
                 continue
             fileNumber = i[i.rfind(".pool.root")-5:i.rfind(".pool.root")]
-            print 'fileNumber',fileNumber
+            printfunc ('fileNumber',fileNumber)
             if  int(fileNumber) > fileRange[0]-1 and int(fileNumber) <fileRange[1]+1 :
                 collection = 'root://eosatlas.cern.ch/'+path+i
                 files += ["root://eosatlas.cern.ch//%s/%s" % (path,i) ]
-        print files
+        printfunc (files)
         return files
 
 if (('dsName' in dir())  and ('fileRange' in dir()) and ( not ('repeatN' in dir()))  ):
-    print "looking for EOS files"
+    printfunc ("looking for EOS files")
     from AthenaCommon.AthenaCommonFlags import athenaCommonFlags
     athenaCommonFlags.FilesInput=getEOSDirectoryList(dsName,fileRange)
     #athenaCommonFlags.FilesInput=getCastorDirectoryList(dsName,fileRange)
diff --git a/Trigger/TrigValidation/TriggerTest/share/TriggerTestCommon.py b/Trigger/TrigValidation/TriggerTest/share/TriggerTestCommon.py
index 8623d1be67e..1262eeed944 100644
--- a/Trigger/TrigValidation/TriggerTest/share/TriggerTestCommon.py
+++ b/Trigger/TrigValidation/TriggerTest/share/TriggerTestCommon.py
@@ -6,7 +6,7 @@
 # from AthenaCommon.AthenaCommonFlags import athenaCommonFlags as acf
 
 if  ('checkLeak' in dir()):
-    print "setting up Leak-Checking and output File"
+    printfunc ("setting up Leak-Checking and output File")
     import Hephaestus.MemoryTracker as memtrack
     # Try to write the leaks into separate file 
     try: 
@@ -14,7 +14,7 @@ if  ('checkLeak' in dir()):
         memtrack.MemoryTrace.size( 19 ) # size of traces kept in memory
         memtrack.outstream( open("LeakCheck.txt","w") )
     except: 
-        print "ERROR setting memory depth"
+        printfunc ("ERROR setting memory depth")
 
 
 # flags for command-line input
@@ -29,20 +29,20 @@ if  ('chainOrderOption' in dir()):
     TriggerFlags.MuonSlice.disableSignatures(['HLT_mu0_muoncalib_ds3'])
     
     # set direct or inverse order of chain execution
-    print "Setting order of trigger chain execution"
+    printfunc ("Setting order of trigger chain execution")
     #    from TrigSteering.TrigSteeringConfig import TrigSteer_HLT
     #    TrigSteer_HLT = TrigSteer_HLT("TrigSteer_HLT")
     #    topSequence += TrigSteer_HLT
     topSequence.TrigSteer_HLT.sortChains=orderHLTChains
-    print "topSequence.TrigSteer_HLT.sortChains",
-    print topSequence.TrigSteer_HLT.sortChains 
-    print "Done setting chain execution order"
+    printfunc ("topSequence.TrigSteer_HLT.sortChains",)
+    printfunc (topSequence.TrigSteer_HLT.sortChains )
+    printfunc ("Done setting chain execution order")
 
 
 # flags for fast calo access 
 if ('doFastCaloAccess' in dir()):
     
-    print "ERROR tests of FastCalo Access no longer needed"
+    printfunc ("ERROR tests of FastCalo Access no longer needed")
     
     ##### MET slice configuration: ######
     EFMissingET_Fex= Configurable.allConfigurables.get("EFMissingET_Fex")
@@ -107,8 +107,8 @@ if hasattr(svcMgr,'THistSvc'):
     svcMgr.THistSvc.OutputLevel = WARNING
 
 #from AthenaCommon.AlgSequence import AlgSequence
-print AlgSequence
-print ServiceMgr
+printfunc (AlgSequence)
+printfunc (ServiceMgr)
 
 # Tempory - 24/05/17 # this can be later removed
 if not hasattr(svcMgr.ToolSvc,"TileROD_Decoder"):
diff --git a/Trigger/TrigValidation/TriggerTest/share/testAthenaTrigRDO_standalone.py b/Trigger/TrigValidation/TriggerTest/share/testAthenaTrigRDO_standalone.py
index b64ef95a8d1..1364d908c7b 100644
--- a/Trigger/TrigValidation/TriggerTest/share/testAthenaTrigRDO_standalone.py
+++ b/Trigger/TrigValidation/TriggerTest/share/testAthenaTrigRDO_standalone.py
@@ -19,8 +19,8 @@ include("TriggerJobOpts/runHLT_standalone_run2.py")
 
 MessageSvc.Format = "% F%48W%S%7W%R%T %0W%M"
 
-print AlgSequence
-print ServiceMgr
+printfunc (AlgSequence)
+printfunc (ServiceMgr)
 
 del EvtMax
 
diff --git a/Trigger/TrigValidation/TriggerTest/share/testCommonSliceAthenaTrigRDO.py b/Trigger/TrigValidation/TriggerTest/share/testCommonSliceAthenaTrigRDO.py
index 82bca071a46..4116ed38364 100644
--- a/Trigger/TrigValidation/TriggerTest/share/testCommonSliceAthenaTrigRDO.py
+++ b/Trigger/TrigValidation/TriggerTest/share/testCommonSliceAthenaTrigRDO.py
@@ -23,7 +23,7 @@ import imp
 try:
     imp.find_module('TrigCostD3PDMaker')
 except:
-    print 'CostMonitoring packages not available, setting  enableCostMonitoring=False'
+    printfunc ('CostMonitoring packages not available, setting  enableCostMonitoring=False')
     enableCostMonitoring=False
 
 # flags for RecExCommon
@@ -56,7 +56,7 @@ TriggerFlags.readLVL1configFromXML=False
 if  ('menu' in dir()):
     TriggerFlags.triggerMenuSetup=menu 
 else: 
-    print 'No MENU was set - this is required when using this JO! -  WARNING  falling back to TriggerFlags standard menu'
+    printfunc ('No MENU was set - this is required when using this JO! -  WARNING  falling back to TriggerFlags standard menu')
 
 TriggerFlags.doHLT=True
 #TriggerFlags.doL1Topo=True 
@@ -200,7 +200,7 @@ if 'sliceName' in dir() and 'minbias' in sliceName and hasattr(topSequence, "LVL
 #
 #import AthenaCommon.Configurable as Configurable
 #Configurable.log.setLevel( INFO )
-#print topSequence.getChildren()
+#printfunc (topSequence.getChildren())
 
 #-------------------------------------------------------------
 # Disable overly verbose and problematic ChronoStatSvc print-out
diff --git a/Trigger/TrigValidation/TriggerTest/share/testCommonSliceAthenaTrigRDOtoAOD.py b/Trigger/TrigValidation/TriggerTest/share/testCommonSliceAthenaTrigRDOtoAOD.py
index 3d07e3a29f4..37245eb29d7 100644
--- a/Trigger/TrigValidation/TriggerTest/share/testCommonSliceAthenaTrigRDOtoAOD.py
+++ b/Trigger/TrigValidation/TriggerTest/share/testCommonSliceAthenaTrigRDOtoAOD.py
@@ -28,7 +28,7 @@ import imp
 try:
     imp.find_module('TrigCostD3PDMaker')
 except:
-    print 'CostMonitoring packages not available, setting  enableCostMonitoring=False'
+    printfunc ('CostMonitoring packages not available, setting  enableCostMonitoring=False')
     enableCostMonitoring=False
 
 # flags for RecExCommon
@@ -226,7 +226,7 @@ if 'sliceName' in dir() and 'minbias' in sliceName and hasattr(topSequence, "LVL
 #
 #import AthenaCommon.Configurable as Configurable
 #Configurable.log.setLevel( INFO )
-#print topSequence.getChildren()
+#print (topSequence.getChildren())
 
 #-------------------------------------------------------------
 # Disable overly verbose and problematic ChronoStatSvc print-out
diff --git a/Trigger/TrigValidation/TriggerTest/share/testLVL1CTPAthenaTrigRDO.py b/Trigger/TrigValidation/TriggerTest/share/testLVL1CTPAthenaTrigRDO.py
index 56d3a2c5e12..fa219cefafd 100644
--- a/Trigger/TrigValidation/TriggerTest/share/testLVL1CTPAthenaTrigRDO.py
+++ b/Trigger/TrigValidation/TriggerTest/share/testLVL1CTPAthenaTrigRDO.py
@@ -70,8 +70,8 @@ include("TriggerTest/TriggerTestCommon.py")
 #------------------------------------------------------------
 
 
-#print AlgSequence()
-#print ServiceMgr
-print DetFlags
-print TriggerFlags
+#printfunc (AlgSequence())
+#printfunc (ServiceMgr)
+printfunc (DetFlags)
+printfunc (TriggerFlags)
 
-- 
GitLab