From 768f3f25622810af014528699b5c80f1f524765b Mon Sep 17 00:00:00 2001 From: scott snyder Date: Thu, 23 Jan 2020 16:42:54 +0100 Subject: [PATCH 1/3] TrigBphysMonitoring: python 3 fix - print function --- .../share/RunJpsiFinder.py | 6 +++--- .../share/configureBphysTrackingServices.py | 20 +++++++++---------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Trigger/TrigMonitoring/TrigBphysMonitoring/share/RunJpsiFinder.py b/Trigger/TrigMonitoring/TrigBphysMonitoring/share/RunJpsiFinder.py index 531a2326b67..ac61cfcf55a 100644 --- a/Trigger/TrigMonitoring/TrigBphysMonitoring/share/RunJpsiFinder.py +++ b/Trigger/TrigMonitoring/TrigBphysMonitoring/share/RunJpsiFinder.py @@ -8,7 +8,7 @@ # ------------------------ include( "TrigBphysMonitoring/configureBphysTrackingServices.py" ) -#print "JWW: apply temp fix TrkVKalVrtFitter.firstMeasuredPoint = False" +#printfunc ("JWW: apply temp fix TrkVKalVrtFitter.firstMeasuredPoint = False") TrkVKalVrtFitter.FirstMeasuredPoint = False # ---------------------------------- @@ -36,7 +36,7 @@ ExampleJpsiFinder = Analysis__JpsiFinder(name = "BPhysJps VertexPointEstimator = VtxPointEstimator, useMCPCuts = False) ToolSvc += ExampleJpsiFinder -print ExampleJpsiFinder +printfunc (ExampleJpsiFinder) #------------------------------------------------------------- # User analysis steering algorithm @@ -55,7 +55,7 @@ dimuDeco = BphysTrigDiMuDecoratorTool(name = "BphysTrigDiMuDecoratorTool", OutputLevel=INFO) ToolSvc += dimuDeco -print dimuDeco +printfunc (dimuDeco) decoAlg = BphysTrigDecoratorAlg(name="BphysTrigDecoratorAlg", OutputLevel=INFO, diff --git a/Trigger/TrigMonitoring/TrigBphysMonitoring/share/configureBphysTrackingServices.py b/Trigger/TrigMonitoring/TrigBphysMonitoring/share/configureBphysTrackingServices.py index 4a3d2f0a021..9c6cba88c8f 100644 --- a/Trigger/TrigMonitoring/TrigBphysMonitoring/share/configureBphysTrackingServices.py +++ b/Trigger/TrigMonitoring/TrigBphysMonitoring/share/configureBphysTrackingServices.py @@ -4,7 +4,7 @@ #from TrkMagFieldTools.TrkMagFieldToolsConf import Trk__MagneticFieldTool #InDetMagField = Trk__MagneticFieldTool('InDetMagField') #ToolSvc += InDetMagField -#print InDetMagField +#printfunc (InDetMagField) # # set up extrapolator @@ -12,7 +12,7 @@ from TrkExTools.AtlasExtrapolator import AtlasExtrapolator InDetExtrapolator = AtlasExtrapolator() ToolSvc += InDetExtrapolator -print InDetExtrapolator +printfunc (InDetExtrapolator) # Vertex point estimator # @@ -100,7 +100,7 @@ InDetTrackSelectorTool = InDet__InDetDetailedTrackSelectorTool(name = "TrigBphys ) ToolSvc+=InDetTrackSelectorTool -print InDetTrackSelectorTool +printfunc (InDetTrackSelectorTool) # configure vertex fitters @@ -113,7 +113,7 @@ TrkVKalVrtFitter = Trk__TrkVKalVrtFitter( #FirstMeasuredPointLimit = True, MakeExtendedVertex = True) ToolSvc += TrkVKalVrtFitter -print TrkVKalVrtFitter +printfunc (TrkVKalVrtFitter) ## ## --- load linearized track factory @@ -124,7 +124,7 @@ print TrkVKalVrtFitter ## MagneticFieldTool = InDetMagField #) #ToolSvc += InDetLinFactory -#print InDetLinFactory +#printfunc (InDetLinFactory) from TrkV0Fitter.TrkV0FitterConf import Trk__TrkV0VertexFitter @@ -135,27 +135,27 @@ TrkV0Fitter = Trk__TrkV0VertexFitter(name = 'TrigBphysTrkV0FitterNa # MagneticFieldTool = InDetMagField ) ToolSvc += TrkV0Fitter -print TrkV0Fitter +printfunc (TrkV0Fitter) #from TrkVertexBilloirTools.TrkVertexBilloirToolsConf import Trk__FastVertexFitter #InDetFastVxFitterTool = Trk__FastVertexFitter(name = "InDetFastVertexFitterTool", #LinearizedTrackFactory = InDetLinFactory, #Extrapolator = InDetExtrapolator) #ToolSvc += InDetFastVxFitterTool -#print InDetFastVxFitterTool +#printfunc (InDetFastVxFitterTool) #from TrkVertexBilloirTools.TrkVertexBilloirToolsConf import Trk__FullVertexFitter #InDetFullVxFitterTool = Trk__FullVertexFitter(name = "InDetFullVertexFitterTool", #LinearizedTrackFactory = InDetLinFactory, #Extrapolator = InDetExtrapolator) #ToolSvc += InDetFullVxFitterTool -#print InDetFullVxFitterTool +#printfunc (InDetFullVxFitterTool) ## Primary vertex refitting #from TrkVertexFitterUtils.TrkVertexFitterUtilsConf import Trk__KalmanVertexUpdator #myVertexUpdator = Trk__KalmanVertexUpdator() #ToolSvc += myVertexUpdator -#print myVertexUpdator +#printfunc (myVertexUpdator) @@ -169,4 +169,4 @@ print TrkV0Fitter #from TrkVertexAnalysisUtils.TrkVertexAnalysisUtilsConf import Trk__V0Tools #InDetV0Tools = Trk__V0Tools(name = "InDetV0Tools") #ToolSvc += InDetV0Tools -#print InDetV0Tools +#printfunc (InDetV0Tools) -- GitLab From 9a582edb41f5153992de6133934fe5af75d3661d Mon Sep 17 00:00:00 2001 From: scott snyder Date: Thu, 23 Jan 2020 16:42:31 +0100 Subject: [PATCH 2/3] TgcRawDataMonitoring: python 3 fixes - print function --- .../share/TgcRaw_MonitoringOptions.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/share/TgcRaw_MonitoringOptions.py b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/share/TgcRaw_MonitoringOptions.py index adf4ef9d238..4aef14a0023 100755 --- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/share/TgcRaw_MonitoringOptions.py +++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/share/TgcRaw_MonitoringOptions.py @@ -1,10 +1,10 @@ -print '\n*************************************************************************************************\n' -print " ******** Welcome to the Offline ESD MuonRawDataMonitoring/TgcRawDataMonitoring package. ******** " -print " ******** Documentation may be found at:******** " -print " **** https://twiki.cern.ch/twiki/bin/view/Atlas/TGCOfflineMonitoringPlots ***** " -print '\n*************************************************************************************************\n' +printfunc ('\n*************************************************************************************************\n') +printfunc (" ******** Welcome to the Offline ESD MuonRawDataMonitoring/TgcRawDataMonitoring package. ******** " ) +printfunc (" ******** Documentation may be found at:******** " ) +printfunc (" **** https://twiki.cern.ch/twiki/bin/view/Atlas/TGCOfflineMonitoringPlots ***** " ) +printfunc ('\n*************************************************************************************************\n') if not 'MuonDQAFlags' in dir(): - print "MuonDQAFlags.py: MuonDQAFlags not yet imported - I import them now" + printfunc ("MuonDQAFlags.py: MuonDQAFlags not yet imported - I import them now") from MuonDQAMonFlags.MuonDQAFlags import MuonDQAFlags as MuonDQAFlags tgcRawMonMan = AthenaMonManager(name="TgcRawMonManager", @@ -22,7 +22,7 @@ tgcRawDataValAlg = TgcRawDataValAlg(name='tgcRawDataValAlg', #ToolSvc += tgcRawDataValAlg tgcRawMonMan.AthenaMonTools += [ tgcRawDataValAlg ] topSequence += tgcRawMonMan -print tgcRawMonMan +printfunc (tgcRawMonMan) ############## TgcLv1RawDataValAlg ########## from TgcRawDataMonitoring.TgcRawDataMonitoringConf import TgcLv1RawDataValAlg tgcLv1RawDataValAlg = TgcLv1RawDataValAlg(name='tgcLv1RawDataValAlg') @@ -31,4 +31,4 @@ if DQMonFlags.useTrigger(): #ToolSvc += tgcLv1RawDataValAlg tgcLv1RawMonMan.AthenaMonTools += [ tgcLv1RawDataValAlg ] topSequence += tgcLv1RawMonMan - print tgcLv1RawMonMan + printfunc (tgcLv1RawMonMan) -- GitLab From 84b82e24d38a4f82cd6a943c340d0f6be7e40d6d Mon Sep 17 00:00:00 2001 From: scott snyder Date: Thu, 23 Jan 2020 16:42:02 +0100 Subject: [PATCH 3/3] RpcRawDataMonitoring: python 3 fixes - print function --- .../share/RpcRawBS_MonitoringOptions.py | 16 ++++++++-------- .../share/RpcRawESD_MonitoringOptions.py | 18 +++++++++--------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/share/RpcRawBS_MonitoringOptions.py b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/share/RpcRawBS_MonitoringOptions.py index 8c33fa8d074..f149a57980a 100755 --- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/share/RpcRawBS_MonitoringOptions.py +++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/share/RpcRawBS_MonitoringOptions.py @@ -1,11 +1,11 @@ -#print '\n************************************************************************************************\n' -#print " ******** Welcome to the Offline BS MuonRawDataMonitoring/RpcRawDataMonitoring package. ******** " -#print " ******** Documentation may be found at:******** " -#print " **** https://twiki.cern.ch/twiki/bin/view/Atlas/RPCOfflineMonitoringPlots ***** " -#print '\n************************************************************************************************\n' +#printfunc ('\n************************************************************************************************\n') +#printfunc (" ******** Welcome to the Offline BS MuonRawDataMonitoring/RpcRawDataMonitoring package. ******** " ) +#printfunc (" ******** Documentation may be found at:******** " ) +#printfunc (" **** https://twiki.cern.ch/twiki/bin/view/Atlas/RPCOfflineMonitoringPlots ***** " ) +#printfunc ('\n************************************************************************************************\n') if not 'MuonDQAFlags' in dir(): - print "MuonDQAFlags.py: MuonDQAFlags not yet imported - I import them now" + printfunc ("MuonDQAFlags.py: MuonDQAFlags not yet imported - I import them now") from MuonDQAMonFlags.MuonDQAFlags import MuonDQAFlags as MuonDQAFlags ############# RPCLV1RawDataValAlg ############# @@ -27,7 +27,7 @@ rpcLV1RawDataValAlg = RpcLv1RawDataValAlg(name='rpcLV1RawDataValAlg' #ToolSvc += rpcLV1RawDataValAlg rpcLv1RawMonMan.AthenaMonTools += [ rpcLV1RawDataValAlg ] topSequence += rpcLv1RawMonMan -print rpcLv1RawMonMan +printfunc (rpcLv1RawMonMan) ############# RpcLv1RawDataSectorLogic ############# @@ -42,4 +42,4 @@ if globalflags.DataSource() != 'data': #ToolSvc += rpcLV1RawDataSectorLogic rpcLv1SLRawMonMan.AthenaMonTools += [ rpcLV1RawDataSectorLogic ] topSequence += rpcLv1SLRawMonMan -print rpcLv1SLRawMonMan +printfunc (rpcLv1SLRawMonMan) diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/share/RpcRawESD_MonitoringOptions.py b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/share/RpcRawESD_MonitoringOptions.py index 57966f6e629..73bce90628b 100755 --- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/share/RpcRawESD_MonitoringOptions.py +++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/share/RpcRawESD_MonitoringOptions.py @@ -1,11 +1,11 @@ -#print '\n************************************************************************************************\n' -#print " ******** Welcome to the Offline BS MuonRawDataMonitoring/RpcRawDataMonitoring package. ******** " -#print " ******** Documentation may be found at:******** " -#print " **** https://twiki.cern.ch/twiki/bin/view/Atlas/RPCOfflineMonitoringPlots ***** " -#print '\n************************************************************************************************\n' +#printfunc ('\n************************************************************************************************\n') +#printfunc (" ******** Welcome to the Offline BS MuonRawDataMonitoring/RpcRawDataMonitoring package. ******** " ) +#printfunc (" ******** Documentation may be found at:******** " ) +#printfunc (" **** https://twiki.cern.ch/twiki/bin/view/Atlas/RPCOfflineMonitoringPlots ***** " ) +#printfunc ('\n************************************************************************************************\n') if not 'MuonDQAFlags' in dir(): - print "MuonDQAFlags.py: MuonDQAFlags not yet imported - I import them now" + printfunc ("MuonDQAFlags.py: MuonDQAFlags not yet imported - I import them now") from MuonDQAMonFlags.MuonDQAFlags import MuonDQAFlags as MuonDQAFlags ############# RpcRawDataValAlg ############# @@ -44,7 +44,7 @@ rpcRawDataValAlg = RpcRawDataValAlg(name='rpcRawDataValAlg', #ToolSvc += rpcRawDataValAlg rpcRawMonMan.AthenaMonTools += [ rpcRawDataValAlg ] topSequence += rpcRawMonMan -print rpcRawMonMan +printfunc (rpcRawMonMan) #################### RPCStandaloneTracksMon ####################### rpcTrackMonMan = AthenaMonManager(name="RpcTrackMonManager", @@ -77,7 +77,7 @@ if globalflags.DataSource() != 'data': #ToolSvc += RPCStandaloneTracksMon rpcTrackMonMan.AthenaMonTools += [ RPCStandaloneTracksMon ] topSequence += rpcTrackMonMan -print rpcTrackMonMan +printfunc (rpcTrackMonMan) ############################ rpcLv1RawEfficiencyMonManager ###################################### rpcLv1RawEfficiencyMonMan = AthenaMonManager(name="rpcLv1RawEfficiencyMonManager", @@ -98,7 +98,7 @@ if globalflags.DataSource() != 'data': #ToolSvc += rpcLv1RawDataEfficiency rpcLv1RawEfficiencyMonMan.AthenaMonTools += [ rpcLv1RawDataEfficiency ] topSequence += rpcLv1RawEfficiencyMonMan -print rpcLv1RawEfficiencyMonMan +printfunc (rpcLv1RawEfficiencyMonMan) ################################################################### # -- GitLab