From 1bd841eb37e98a30208f7b4f04df9b11b357b5fd Mon Sep 17 00:00:00 2001 From: scott snyder Date: Thu, 6 Feb 2020 17:55:50 +0100 Subject: [PATCH] TileRecEx: python 3 fixes - print function - exec - encoding issues --- .../share/jobOptions_TileCalibRec.py | 85 ++++++++++--------- .../TileRecEx/share/jobOptions_TileTBDump.py | 2 +- .../TileRecEx/share/jobOptions_TileTBStat.py | 4 +- 3 files changed, 48 insertions(+), 43 deletions(-) diff --git a/TileCalorimeter/TileExample/TileRecEx/share/jobOptions_TileCalibRec.py b/TileCalorimeter/TileExample/TileRecEx/share/jobOptions_TileCalibRec.py index 96d6607a99f..eb01ad1c38c 100644 --- a/TileCalorimeter/TileExample/TileRecEx/share/jobOptions_TileCalibRec.py +++ b/TileCalorimeter/TileExample/TileRecEx/share/jobOptions_TileCalibRec.py @@ -7,6 +7,7 @@ from os import system from subprocess import check_output from subprocess import CalledProcessError +import six from AthenaCommon.AppMgr import theApp svcMgr = theApp.serviceMgr() @@ -272,6 +273,7 @@ def FindFile(path, runinput, filter): files = [] log.warn('Seems there are no such directory: ' + path) + files = [six.ensure_str(f) for f in files] for file_name in (files): try: good=(not file_name in open('/afs/cern.ch/user/t/tilebeam/ARR/bad_data_files').read()) @@ -288,7 +290,7 @@ def FindFile(path, runinput, filter): else: fullname.append(path + '/' + file_name) else: - print "Excluding known bad data file",file_name + printfunc ("Excluding known bad data file",file_name) return [fullname, run] @@ -790,7 +792,7 @@ jobproperties.print_JobProperties('tree&value') include( "TileConditions/TileConditions_jobOptions.py" ) tileInfoConfigurator.OutputLevel = OutputLevel # use correct timing constants for different run types -print tileInfoConfigurator +printfunc (tileInfoConfigurator) #============================================================ #=== configure TileCondToolOfcCool @@ -811,7 +813,7 @@ if not OfcFromCOOL and (doTileOpt2 or doTileOptATLAS or doTileOF1): # 'LAS' or "CIS" or 'PHY' pulse shape - print tileCondToolOfc + printfunc (tileCondToolOfc) #============================================================ #=== adding Event Info @@ -885,13 +887,13 @@ if doTileFit and tileRawChannelBuilderFitFilter: tileRawChannelBuilderFitFilter.RMSChannelNoise = 3; tileRawChannelBuilderFitFilter.UseDSPCorrection = not TileBiGainRun - print tileRawChannelBuilderFitFilter + printfunc (tileRawChannelBuilderFitFilter) if doTileFitCool: ToolSvc.TileRawChannelBuilderFitFilterCool.MaxTimeFromPeak = 250.0; # recover behaviour of rel 13.0.30 ToolSvc.TileRawChannelBuilderFitFilterCool.UseDSPCorrection = not TileBiGainRun - print ToolSvc.TileRawChannelBuilderFitFilterCool + printfunc (ToolSvc.TileRawChannelBuilderFitFilterCool) if doTileOpt2: @@ -902,7 +904,7 @@ if doTileOpt2: tileRawChannelBuilderOpt2Filter.EmulateDSP = True # use dsp emulation tileRawChannelBuilderOpt2Filter.UseDSPCorrection = not TileBiGainRun - print tileRawChannelBuilderOpt2Filter + printfunc (tileRawChannelBuilderOpt2Filter) if doTileOptATLAS and tileRawChannelBuilderOptATLAS: if ReadPool: @@ -916,7 +918,7 @@ if doTileOptATLAS and tileRawChannelBuilderOptATLAS: tileRawChannelBuilderOptATLAS.EmulateDSP = True # use dsp emulation tileRawChannelBuilderOptATLAS.UseDSPCorrection = not TileBiGainRun - print tileRawChannelBuilderOptATLAS + printfunc (tileRawChannelBuilderOptATLAS) if doTileMF: @@ -933,7 +935,7 @@ if doTileMF: tileInfoConfigurator.setupCOOLPULSE(type = TilePulse) tileInfoConfigurator.setupCOOLAutoCr() - print ToolSvc.TileRawChannelBuilderMF + printfunc (ToolSvc.TileRawChannelBuilderMF ) if doTileOF1: ToolSvc.TileRawChannelBuilderOF1.PedestalMode = TileOF1Ped @@ -946,7 +948,7 @@ if doTileOF1: ToolSvc.TileRawChannelBuilderOF1.EmulateDSP = True # use dsp emulation ToolSvc.TileRawChannelBuilderOF1.UseDSPCorrection = not TileBiGainRun - print ToolSvc.TileRawChannelBuilderOF1 + printfunc (ToolSvc.TileRawChannelBuilderOF1 ) if doTileWiener and tileRawChannelBuilderWienerFilter: if PhaseFromCOOL: @@ -959,7 +961,7 @@ if doTileWiener and tileRawChannelBuilderWienerFilter: tileRawChannelBuilderWienerFilter.EmulateDSP = True # use dsp emulation tileRawChannelBuilderWienerFilter.UseDSPCorrection = not TileBiGainRun - print tileRawChannelBuilderWienerFilter + printfunc (tileRawChannelBuilderWienerFilter) if (doEventDisplay or doCreatePool): # create TileHit from TileRawChannel and store it in TileHitVec @@ -968,7 +970,7 @@ if (doEventDisplay or doCreatePool): theTileHitFromRawChGetter.TileRawChannelToHit().TileRawChannelContainer = "TileRawChannelOpt2" theTileHitFromRawChGetter.TileRawChannelToHit().UseSamplFract = False - print theTileHitFromRawChGetter.TileRawChannelToHit() + printfunc (theTileHitFromRawChGetter.TileRawChannelToHit()) if doCaloCell: # create TileCell from TileRawChannel and store it in CaloCellContainer @@ -1052,14 +1054,16 @@ if (doTileNtuple or doD3PD): if not hasattr(svcMgr,"THistSvc"): from GaudiSvc.GaudiSvcConf import THistSvc svcMgr+=THistSvc() - exec 'svcMgr.THistSvc.Output += [ "AANT DATAFILE=\'%(dir)s/tile_%(RunNum).f_%(Version)s.aan.root\' OPT=\'RECREATE\' " ] ' % {'dir': OutputDirectory, 'RunNum': RunNumber, 'Version': Version } + datafile = '%(dir)s/tile_%(RunNum).f_%(Version)s.aan.root' % {'dir': OutputDirectory, 'RunNum': RunNumber, 'Version': Version } + svcMgr.THistSvc.Output += [ "AANT DATAFILE='" + datafile + "' OPT='RECREATE' " ] svcMgr.THistSvc.MaxFileSize = 32768 from AnalysisTools.AthAnalysisToolsConf import AANTupleStream topSequence += AANTupleStream( "AANTupleStream1" ) AANTupleStream1 = topSequence.AANTupleStream1 AANTupleStream1.ExtraRefNames = [ "StreamESD","StreamRDO" ] - exec 'AANTupleStream1.OutputName = \'%(dir)s/tile_%(RunNum).f_%(Version)s.aan.root\' ' % {'dir': OutputDirectory, 'RunNum': RunNumber, 'Version': Version } + datafile = '%(dir)s/tile_%(RunNum).f_%(Version)s.aan.root' % {'dir': OutputDirectory, 'RunNum': RunNumber, 'Version': Version } + AANTupleStream1.OutputName = datafile AANTupleStream1.ExistDataHeader = False @@ -1237,7 +1241,8 @@ if doTileMon: if not hasattr(svcMgr,"THistSvc"): from GaudiSvc.GaudiSvcConf import THistSvc svcMgr+=THistSvc() - exec 'svcMgr.THistSvc.Output += [ "Tile DATAFILE=\'%(dir)s/tilemon_%(RunNum).f_%(Version)s.root\' OPT=\'RECREATE\' " ] ' % {'dir': OutputDirectory, 'RunNum': RunNumber, 'Version': Version } + datafile = '%(dir)s/tilemon_%(RunNum).f_%(Version)s.root' % {'dir': OutputDirectory, 'RunNum': RunNumber, 'Version': Version } + svcMgr.THistSvc.Output += [ "Tile DATAFILE='" + datafile + "' OPT=\'RECREATE\' " ] if (TileMonoRun): runType = 9 @@ -1280,7 +1285,7 @@ if doTileMon: FillPedestalDifference = True) #ToolSvc += theTileDigitsMon TileMon.AthenaMonTools += [ theTileDigitsMon ] - print theTileDigitsMon + printfunc (theTileDigitsMon) if doTileMonRch: b2d = TileCisRun or TileRampRun @@ -1320,7 +1325,7 @@ if doTileMon: #theTileRawChannelMon.MinAmpForCorrectedTime = 0.1 - print theTileRawChannelMon + printfunc (theTileRawChannelMon) if doTileMonDQ: theTileDQFragMon = TileDQFragMonTool(name = 'TileDQFragMon', @@ -1356,7 +1361,7 @@ if doTileMon: #ToolSvc += theTileDQFragMon; TileMon.AthenaMonTools += [ theTileDQFragMon ]; - print theTileDQFragMon + printfunc (theTileDQFragMon) if doTileMonCell: if TileBiGainRun: @@ -1369,7 +1374,7 @@ if doTileMon: histoPathBase = "/Tile/Cell"); #ToolSvc += theTileCellMonHG; TileMon.AthenaMonTools += [ theTileCellMonHG ]; - print theTileCellMonHG; + printfunc (theTileCellMonHG) else: theTileCellMon = TileCellMonTool(name = 'TileCellMon', @@ -1385,7 +1390,7 @@ if doTileMon: #theTileCellMon.FillTimeHistograms = True #ToolSvc += theTileCellMon; TileMon.AthenaMonTools += [ theTileCellMon ]; - print theTileCellMon; + printfunc (theTileCellMon) if doTileDigiNoiseMon: TileDigiNoiseMon = TileDigiNoiseMonTool(name = 'TileDigiNoiseMon', @@ -1397,7 +1402,7 @@ if doTileMon: if not TileBiGainRun: TileDigiNoiseMon.TriggerTypes = [ 0x82 ] #ToolSvc += TileDigiNoiseMon; TileMon.AthenaMonTools += [ TileDigiNoiseMon ]; - print TileDigiNoiseMon; + printfunc (TileDigiNoiseMon) if TileBiGainRun and doTileCellNoiseMon: TileCellNoiseMonLG = TileCellNoiseMonTool(name = 'TileCellNoiseMonLG', @@ -1409,7 +1414,7 @@ if doTileMon: TileCellNoiseMonLG.Xmax = 2000.; #ToolSvc += TileCellNoiseMonLG; TileMon.AthenaMonTools += [ TileCellNoiseMonLG ]; - print TileCellNoiseMonLG; + printfunc (TileCellNoiseMonLG) TileCellNoiseMonHG = TileCellNoiseMonTool(name = 'TileCellNoiseMonHG', @@ -1421,7 +1426,7 @@ if doTileMon: TileCellNoiseMonHG.Xmax = 300.; #ToolSvc += TileCellNoiseMonHG; TileMon.AthenaMonTools += [ TileCellNoiseMonHG ]; - print TileCellNoiseMonHG; + printfunc (TileCellNoiseMonHG) if (not TileBiGainRun) and doTileCellNoiseMon: TileCellNoiseMon = TileCellNoiseMonTool(name = 'TileCellNoiseMon', @@ -1433,7 +1438,7 @@ if doTileMon: TileCellNoiseMon.Xmax = 2000.; #ToolSvc += TileCellNoiseMon; TileMon.AthenaMonTools += [ TileCellNoiseMon ]; - print TileCellNoiseMon; + printfunc (TileCellNoiseMon) if doTileRawChannelTimeMonTool: @@ -1448,7 +1453,7 @@ if doTileMon: #ToolSvc += TileRawChannelTimeMon TileMon.AthenaMonTools += [ TileRawChannelTimeMon ]; - print TileRawChannelTimeMon + printfunc (TileRawChannelTimeMon) @@ -1469,7 +1474,7 @@ if doTileMon: #ToolSvc += TileRawChannelNoiseMonLG; TileMon.AthenaMonTools += [ TileRawChannelNoiseMonLG ]; - print TileRawChannelNoiseMonLG; + printfunc (TileRawChannelNoiseMonLG) TileRawChannelNoiseMonHG = TileRawChannelNoiseMonTool(name = 'TileRawChannelNoiseMonHG', @@ -1486,7 +1491,7 @@ if doTileMon: #ToolSvc += TileRawChannelNoiseMonHG; TileMon.AthenaMonTools += [ TileRawChannelNoiseMonHG ]; - print TileRawChannelNoiseMonHG; + printfunc (TileRawChannelNoiseMonHG) if (not TileBiGainRun) and doTileRawChannelNoiseMon: TileRawChannelNoiseMon = TileRawChannelNoiseMonTool(name = 'TileRawChannelNoiseMon', @@ -1506,7 +1511,7 @@ if doTileMon: #ToolSvc += TileRawChannelNoiseMon; TileMon.AthenaMonTools += [ TileRawChannelNoiseMon ]; - print TileRawChannelNoiseMon; + printfunc (TileRawChannelNoiseMon) ########### end doTileCellNoiseMon ########## @@ -1518,7 +1523,7 @@ if doTileMon: , histoPathBase = "/Tile/TMDBDigits") TileMon.AthenaMonTools += [ TileTMDBDigitsMon ] - print TileTMDBDigitsMon + printfunc (TileTMDBDigitsMon) if doTileTMDBRawChannelMon: @@ -1530,7 +1535,7 @@ if doTileMon: TileMon.AthenaMonTools += [TileTMDBRawChannelDspMon ] - print TileTMDBRawChannelDspMon + printfunc (TileTMDBRawChannelDspMon) TileTMDBRawChannelMon = CfgMgr.TileTMDBRawChannelMonTool(name = 'TileTMDBRawChannelMon' , OutputLevel = INFO @@ -1541,7 +1546,7 @@ if doTileMon: TileMon.AthenaMonTools += [TileTMDBRawChannelMon ] - print TileTMDBRawChannelMon + printfunc (TileTMDBRawChannelMon) if doTileMonDigi or doTileMonRch or doTileMonCell or doTileMonDQ \ @@ -1562,18 +1567,18 @@ if doTileCalib: theTileDigiNoiseCalibAlg = TileDigiNoiseCalibAlg( "theTileDigiNoiseCalibAlg" ) theTileDigiNoiseCalibAlg.DoAvgCorr = False # False=> Full AutoCorr matrix calculation if TileNoiseFilter > 0: - exec 'theTileDigiNoiseCalibAlg.FileNamePrefix = \'Digi_NoiseCalib_%(Version)s\' ' % {'Version': TileNoiseFilter } + theTileDigiNoiseCalibAlg.FileNamePrefix = 'Digi_NoiseCalib_%(Version)s' % {'Version': TileNoiseFilter } if Version != "0" and Version != "Ped.0" and Version != "Ped" : VF = Version+"_tnf"+str(TileNoiseFilter) - exec 'theTileDigiNoiseCalibAlg.FileNamePrefix = \'Digi_NoiseCalib_%(Version)s\' ' % {'Version': VF } + theTileDigiNoiseCalibAlg.FileNamePrefix = 'Digi_NoiseCalib_%(Version)s' % {'Version': VF } topSequence += theTileDigiNoiseCalibAlg theTileRawChNoiseCalibAlg = TileRawChNoiseCalibAlg("theTileRawChNoiseCalibAlg") theTileRawChNoiseCalibAlg.UseforCells = 1 # 1= Fixed , 2= Opt2 if TileNoiseFilter > 0: - exec 'theTileRawChNoiseCalibAlg.FileNamePrefix = \'RawCh_NoiseCalib_%(Version)s\' ' % {'Version': TileNoiseFilter } + theTileRawChNoiseCalibAlg.FileNamePrefix = 'RawCh_NoiseCalib_%(Version)s' % {'Version': TileNoiseFilter } if Version != "0" and Version != "Ped.0" and Version != "Ped" : VF = Version + "_tnf" + str(TileNoiseFilter) - exec 'theTileRawChNoiseCalibAlg.FileNamePrefix = \'RawCh_NoiseCalib_%(Version)s\' ' % {'Version': VF } + theTileRawChNoiseCalibAlg.FileNamePrefix = 'RawCh_NoiseCalib_%(Version)s' % {'Version': VF } topSequence += theTileRawChNoiseCalibAlg if TileEmulateDSP: @@ -1594,7 +1599,7 @@ if doTileCalib: TileCalibAlg = TileTopCalibAlg() TileCalibAlg.RunNumber = RunNumber TileCalibAlg.RunType = 8 - exec 'TileCalibAlg.FileName = \'%(dir)s/tileCalibCIS_%(RunNum).f_%(Version)s.root\' ' % {'dir': OutputDirectory, 'RunNum': RunNumber, 'Version': Version } + TileCalibAlg.FileName = '%(dir)s/tileCalibCIS_%(RunNum).f_%(Version)s.root' % {'dir': OutputDirectory, 'RunNum': RunNumber, 'Version': Version } # declare CIS tool(s) and set jobOptions if necessary TileCisTool = TileCisDefaultCalibTool() @@ -1619,7 +1624,7 @@ if doTileCalib: TileCalibAlg = TileTopCalibAlg() TileCalibAlg.RunNumber = RunNumber TileCalibAlg.RunType = 8 - exec 'TileCalibAlg.FileName = \'%(dir)s/tileCalibL1Calo_%(RunNum).f_%(Version)s.root\' ' % {'dir': OutputDirectory, 'RunNum': RunNumber, 'Version': Version } + TileCalibAlg.FileName = '%(dir)s/tileCalibL1Calo_%(RunNum).f_%(Version)s.root' % {'dir': OutputDirectory, 'RunNum': RunNumber, 'Version': Version } # declare Trigger tool(s) and set jobOptions if necessary TileTriggerTool = TileTriggerDefaultCalibTool() @@ -1635,7 +1640,7 @@ if doTileCalib: from TileCalibAlgs.TileCalibAlgsConf import TileLaserDefaultCalibTool TileCalibAlg = TileLaserCalibAlg() - exec 'TileCalibAlg.FileName = \'%(dir)s/tileCalibLAS_%(RunNum).f_%(Version)s.root\' ' % {'dir': OutputDirectory, 'RunNum': RunNumber, 'Version': Version } + TileCalibAlg.FileName = '%(dir)s/tileCalibLAS_%(RunNum).f_%(Version)s.root' % {'dir': OutputDirectory, 'RunNum': RunNumber, 'Version': Version } # declare LASER tool(s) and set jobOptions if necessary TileLaserTool = TileLaserDefaultCalibTool() @@ -1661,7 +1666,7 @@ if doCreatePool: # Pool Output include( "AthenaPoolCnvSvc/WriteAthenaPool_jobOptions.py" ) from AthenaPoolCnvSvc.WriteAthenaPool import AthenaPoolOutputStream - exec 'FileName = \'%(dir)s/tile_%(RunNum).f_%(Version)s.pool.root\' ' % {'dir': OutputDirectory, 'RunNum': RunNumber, 'Version': Version } + FileName = '%(dir)s/tile_%(RunNum).f_%(Version)s.pool.root' % {'dir': OutputDirectory, 'RunNum': RunNumber, 'Version': Version } Stream1 = AthenaPoolOutputStream( "Stream1", FileName ) # list of output objects @@ -1731,7 +1736,7 @@ if doAtlantis: ToolSvc += thexAODCaloClusterRetriever theEventData2XML.DataTypes += ["JiveXML::xAODCaloClusterRetriever/xAODCaloClusterRetriever"] - print theEventData2XML + printfunc (theEventData2XML) #----------------------- # And some final options @@ -1747,7 +1752,7 @@ if not ReadPool: #svcMgr.ByteStreamInputSvc.DumpFlag = True ToolSvc.TileROD_Decoder.VerboseOutput = True -print topSequence +printfunc (topSequence) svcMgr.MessageSvc.OutputLevel = OutputLevel svcMgr.EventSelector.SkipEvents = EvtMin diff --git a/TileCalorimeter/TileExample/TileRecEx/share/jobOptions_TileTBDump.py b/TileCalorimeter/TileExample/TileRecEx/share/jobOptions_TileTBDump.py index 4fbada33a36..0cf62675c89 100644 --- a/TileCalorimeter/TileExample/TileRecEx/share/jobOptions_TileTBDump.py +++ b/TileCalorimeter/TileExample/TileRecEx/share/jobOptions_TileTBDump.py @@ -300,7 +300,7 @@ tileInfoConfigurator.OutputLevel = OutputLevel from AthenaCommon.AppMgr import ToolSvc from TileConditions.TileCondToolConf import * -print tileInfoConfigurator +printfunc (tileInfoConfigurator) #============================================================= #=== ByteStream Input diff --git a/TileCalorimeter/TileExample/TileRecEx/share/jobOptions_TileTBStat.py b/TileCalorimeter/TileExample/TileRecEx/share/jobOptions_TileTBStat.py index 741868998ab..465f6796ff8 100644 --- a/TileCalorimeter/TileExample/TileRecEx/share/jobOptions_TileTBStat.py +++ b/TileCalorimeter/TileExample/TileRecEx/share/jobOptions_TileTBStat.py @@ -188,7 +188,7 @@ def FindFile(path, runinput, filter): else: fullname.append(path + '/' + file_name) else: - print "Excluding known bad data file",file_name + printfunc ("Excluding known bad data file",file_name) return [fullname, run] @@ -303,7 +303,7 @@ tileInfoConfigurator.OutputLevel = OutputLevel from AthenaCommon.AppMgr import ToolSvc from TileConditions.TileCondToolConf import * -print tileInfoConfigurator +printfunc (tileInfoConfigurator) #============================================================= #=== ByteStream Input -- GitLab