From ccc29a239da9b1ce555e12b50cf63a9d49cd989d Mon Sep 17 00:00:00 2001
From: scott snyder <snyder@bnl.gov>
Date: Mon, 24 Feb 2020 16:11:22 +0100
Subject: [PATCH] InDetRecExample: Python 3 fixes
Further fixes for python 3.
---
.../python/InDetJobProperties.py | 2 +-
.../InDetRecExample/python/TrackingCommon.py | 4 +-
.../ConfiguredxAODTrackParticleCreation.py | 6 +--
.../share/InDetInclusiveSecVtx.py | 38 +++++++++----------
.../share/InDetInclusiveSecVtx_fromAOD.py | 22 +++++------
.../InDetRecExample/share/InDetRecXKalIPat.py | 24 ++++++------
.../share/InDetRec_jobOptions.py | 2 +-
.../share/ReadInDet_jobOptions.py | 22 +++++------
.../share/jobOptions_RecExCommon.py | 10 ++---
9 files changed, 66 insertions(+), 64 deletions(-)
diff --git a/InnerDetector/InDetExample/InDetRecExample/python/InDetJobProperties.py b/InnerDetector/InDetExample/InDetRecExample/python/InDetJobProperties.py
index 151530e6a90..6f1718c1ac0 100644
--- a/InnerDetector/InDetExample/InDetRecExample/python/InDetJobProperties.py
+++ b/InnerDetector/InDetExample/InDetRecExample/python/InDetJobProperties.py
@@ -127,7 +127,7 @@ class doPseudoTracking(InDetFlagsJobProperty):
StoredValue = False
class doIdealPseudoTracking(InDetFlagsJobProperty):
- """Run pseudoTracking with 100\% hit assignment efficiency"""
+ """Run pseudoTracking with 100% hit assignment efficiency"""
statusOn = True
allowedTypes = ['bool']
StoredValue = True
diff --git a/InnerDetector/InDetExample/InDetRecExample/python/TrackingCommon.py b/InnerDetector/InDetExample/InDetRecExample/python/TrackingCommon.py
index f5ccb114af0..da81a73c2e1 100644
--- a/InnerDetector/InDetExample/InDetRecExample/python/TrackingCommon.py
+++ b/InnerDetector/InDetExample/InDetRecExample/python/TrackingCommon.py
@@ -1,5 +1,7 @@
# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+from __future__ import print_function
+
from AthenaCommon.Logging import logging
log = logging.getLogger('TrackingCommon')
@@ -93,7 +95,7 @@ def makePublicTool(tool_creator) :
if the_name != tool.name() :
raise Exception('Tool has not the exepected name %s but %s' % (the_name, tool.name()))
if private is False :
- print 'DEBUG add to ToolSvc %s' % (tool.name())
+ print ('DEBUG add to ToolSvc %s' % (tool.name()))
ToolSvc += tool
return tool
else :
diff --git a/InnerDetector/InDetExample/InDetRecExample/share/ConfiguredxAODTrackParticleCreation.py b/InnerDetector/InDetExample/InDetRecExample/share/ConfiguredxAODTrackParticleCreation.py
index 8343deca97e..1a0b42e8f80 100644
--- a/InnerDetector/InDetExample/InDetRecExample/share/ConfiguredxAODTrackParticleCreation.py
+++ b/InnerDetector/InDetExample/InDetRecExample/share/ConfiguredxAODTrackParticleCreation.py
@@ -41,7 +41,7 @@ class ConfiguredxAODTrackParticleCreation:
ToolSvc += InDetxAODParticleCreatorTool
if (InDetFlags.doPrintConfigurables()):
- print InDetxAODParticleCreatorTool
+ printfunc (InDetxAODParticleCreatorTool)
from xAODTrackingCnv.xAODTrackingCnvConf import xAODMaker__TrackParticleCnvAlg
xAODTrackParticleCnvAlg = xAODMaker__TrackParticleCnvAlg(name = "InDetxAODParticleCreatorAlg"+InputTrackCollection,
@@ -61,10 +61,10 @@ class ConfiguredxAODTrackParticleCreation:
xAODTrackParticleCnvAlg.MCTruthClassifier = MCTruthClassifier
elif (InDetFlags.doTruth() and InputTrackTruthCollection == ''):
- print "WARNING: ConfiguredxAODTrackParticleCreation - doTruth = True, but no input Truth collection specified!"
+ printfunc ("WARNING: ConfiguredxAODTrackParticleCreation - doTruth = True, but no input Truth collection specified!")
else:
xAODTrackParticleCnvAlg.AddTruthLink = False
topSequence += xAODTrackParticleCnvAlg
if (InDetFlags.doPrintConfigurables()):
- print xAODTrackParticleCnvAlg
+ printfunc (xAODTrackParticleCnvAlg)
diff --git a/InnerDetector/InDetExample/InDetRecExample/share/InDetInclusiveSecVtx.py b/InnerDetector/InDetExample/InDetRecExample/share/InDetInclusiveSecVtx.py
index 2b60d6aaf9b..eedc2f5de18 100755
--- a/InnerDetector/InDetExample/InDetRecExample/share/InDetInclusiveSecVtx.py
+++ b/InnerDetector/InDetExample/InDetRecExample/share/InDetInclusiveSecVtx.py
@@ -16,7 +16,7 @@ if not InDetFlags.doMonitoring() :
ServiceMgr.THistSvc.Output += [ "AANT DATAFILE='IteraSecVtxFinderTool.root' OPT='RECREATE'" ]
else :
- print ' IncSecVtx : can not fill Xcheck upon MultiSeed mode '
+ printfunc (' IncSecVtx : can not fill Xcheck upon MultiSeed mode ')
## use together with INCLUSIVESECVTX_DEBUG
## trackSelector
@@ -43,7 +43,7 @@ InDetTrackSelectorToolRelax = InDet__InDetTrackSelectionTool(name = "DetailedTra
ToolSvc += InDetTrackSelectorToolRelax
if (InDetFlags.doPrintConfigurables()):
- print ' InDetTrackSelectorToolRelax : ', InDetTrackSelectorToolRelax
+ printfunc (' InDetTrackSelectorToolRelax : ', InDetTrackSelectorToolRelax)
from InDetSecVtxTrackSelectionTool.InDetSecVtxTrackSelectionToolConf import InDet__InDetSecVtxTrackSelectionTool
@@ -54,17 +54,17 @@ InDetSecVtxTrackSelectorTool = InDet__InDetSecVtxTrackSelectionTool( name = "Sec
minD0 = 2.0 )
ToolSvc += InDetSecVtxTrackSelectorTool
if (InDetFlags.doPrintConfigurables()):
- print ' InDetSecVtxTrackSelectorTool : ', InDetSecVtxTrackSelectorTool
+ printfunc (' InDetSecVtxTrackSelectorTool : ', InDetSecVtxTrackSelectorTool)
## InDetFlags.doVertexFinding is set off when start ISV from AOD
if rec.readAOD():
- print ' Here '
+ printfunc (' Here ')
from TrkVertexFitterUtils.TrkVertexFitterUtilsConf import Trk__FullLinearizedTrackFactory
InDetLinFactory = Trk__FullLinearizedTrackFactory( name = "FullLinearizedTrackFactoryIncSecVtx",
Extrapolator = InDetExtrapolator )
ToolSvc += InDetLinFactory
if (InDetFlags.doPrintConfigurables()):
- print InDetLinFactory
+ printfunc (InDetLinFactory)
## two options for seedFinder
if IncSecVtxMultiSeed :
@@ -88,7 +88,7 @@ if IncSecVtxMultiSeed :
gaussianWindow = True)
ToolSvc += InDetMedImgClusterFinder
if (InDetFlags.doPrintConfigurables()):
- print ' InDetMedImgClusterFinder ' , InDetMedImgClusterFinder
+ printfunc (' InDetMedImgClusterFinder ' , InDetMedImgClusterFinder)
## MedImgClusterFinder has been set as ImagingSeedFinder if primaryVertexSetup() == 'MedImgMultiFinding'
from TrkVertexSeedFinderUtils.TrkVertexSeedFinderUtilsConf import Trk__VertexImageMaker
@@ -104,7 +104,7 @@ if IncSecVtxMultiSeed :
angularCutoffParameter = 0.75)
ToolSvc += SecVtxInDetMedImgMaker
if (InDetFlags.doPrintConfigurables()):
- print ' SecVtxInDetMedImgMaker ', SecVtxInDetMedImgMaker
+ printfunc (' SecVtxInDetMedImgMaker ', SecVtxInDetMedImgMaker)
from TrkVertexSeedFinderTools.TrkVertexSeedFinderToolsConf import Trk__ImagingSeedFinder
InDetIncSecVtxSeedFinder = Trk__ImagingSeedFinder( name = "InDetSecVtxMedImgSeedFinder",
@@ -112,7 +112,7 @@ if IncSecVtxMultiSeed :
VertexImageMaker = SecVtxInDetMedImgMaker )
if (InDetFlags.doPrintConfigurables()):
- print 'InDetIncSecVtxSeedFinder', InDetIncSecVtxSeedFinder
+ printfunc ('InDetIncSecVtxSeedFinder', InDetIncSecVtxSeedFinder)
## InDetVtxSeedFinder has been set as ImagingSeedFinder if primaryVertexSetup() == 'MedImgMultiFinding'
else :
@@ -127,13 +127,13 @@ else :
)
ToolSvc+=Mode3dFromFsmw1dFinder
if (InDetFlags.doPrintConfigurables()):
- print ' Mode3dFromFsmw1dFinder ', Mode3dFromFsmw1dFinder
+ printfunc ( ' Mode3dFromFsmw1dFinder ', Mode3dFromFsmw1dFinder )
from TrkVertexSeedFinderUtils.TrkVertexSeedFinderUtilsConf import Trk__SeedNewtonTrkDistanceFinder
NewtonTrk2DDistanceFinder = Trk__SeedNewtonTrkDistanceFinder(name = "NewtonTrk2DDistanceFinder" )
ToolSvc+=NewtonTrk2DDistanceFinder
if (InDetFlags.doPrintConfigurables()):
- print ' NewtonTrk2DDistanceFinder ', NewtonTrk2DDistanceFinder
+ printfunc (' NewtonTrk2DDistanceFinder ', NewtonTrk2DDistanceFinder)
from TrkVertexSeedFinderTools.TrkVertexSeedFinderToolsConf import Trk__IndexedCrossDistancesSeedFinder
InDetIncSecVtxSeedFinder = Trk__IndexedCrossDistancesSeedFinder(name = "IncSecVtxCrossDistancesSeedFinder",
@@ -150,13 +150,13 @@ else :
## Now turn to the vertex fitter
ToolSvc += InDetIncSecVtxSeedFinder
if (InDetFlags.doPrintConfigurables()):
- print InDetIncSecVtxSeedFinder
+ printfunc (InDetIncSecVtxSeedFinder)
from TrkVertexFitterUtils.TrkVertexFitterUtilsConf import Trk__KalmanVertexUpdator
IncSecVertexUpdator = Trk__KalmanVertexUpdator()
ToolSvc += IncSecVertexUpdator
if (InDetFlags.doPrintConfigurables()):
- print ' IncSecVertexUpdator ', IncSecVertexUpdator
+ printfunc (' IncSecVertexUpdator ', IncSecVertexUpdator)
if rec.readAOD():
from TrkVertexFitterUtils.TrkVertexFitterUtilsConf import Trk__ImpactPoint3dEstimator
@@ -164,7 +164,7 @@ if rec.readAOD():
Extrapolator = InDetExtrapolator)
ToolSvc += InDetImpactPoint3dEstimator
if (InDetFlags.doPrintConfigurables()):
- print InDetImpactPoint3dEstimator
+ printfunc (InDetImpactPoint3dEstimator)
from TrkVertexFitterUtils.TrkVertexFitterUtilsConf import Trk__DetAnnealingMaker
@@ -172,13 +172,13 @@ if rec.readAOD():
SetOfTemperatures = [64.,16.,4.,2.,1.5,1.]) # not default
ToolSvc += InDetAnnealingMaker
if (InDetFlags.doPrintConfigurables()):
- print InDetAnnealingMaker
+ printfunc (InDetAnnealingMaker)
from TrkVertexFitters.TrkVertexFittersConf import Trk__SequentialVertexSmoother
InDetVertexSmoother = Trk__SequentialVertexSmoother(name = "InDetSequentialVertexSmoother")
ToolSvc += InDetVertexSmoother
if (InDetFlags.doPrintConfigurables()):
- print InDetVertexSmoother
+ printfunc (InDetVertexSmoother)
from TrkVertexFitters.TrkVertexFittersConf import Trk__AdaptiveVertexFitter
@@ -196,7 +196,7 @@ InDetIncSecVtxFitterTool = Trk__AdaptiveVertexFitter(name = "Adap
OutputLevel = myPrint)
ToolSvc += InDetIncSecVtxFitterTool
if (InDetFlags.doPrintConfigurables()):
- print InDetIncSecVtxFitterTool
+ printfunc (InDetIncSecVtxFitterTool )
from InDetIncSecVxFinderTool.InDetIncSecVxFinderToolConf import InDet__InDetIterativeSecVtxFinderTool
InDetSecVtxFinderTool = InDet__InDetIterativeSecVtxFinderTool(name = "InDetSecVtxFinderTool",
@@ -226,7 +226,7 @@ InDetSecVtxFinderTool = InDet__InDetIterativeSecVtxFinderTool(name = "InDetSecV
ToolSvc += InDetSecVtxFinderTool
if (InDetFlags.doPrintConfigurables()):
- print ' InDetSecVtxFinderTool : ', InDetSecVtxFinderTool
+ printfunc (' InDetSecVtxFinderTool : ', InDetSecVtxFinderTool )
from TrkVertexTools.TrkVertexToolsConf import Trk__SecVertexMergingTool
SecVertexMergingTool = Trk__SecVertexMergingTool( name = "IncSecMergeTool",
@@ -237,7 +237,7 @@ SecVertexMergingTool = Trk__SecVertexMergingTool( name = "IncSecMergeTool",
)
ToolSvc += SecVertexMergingTool
if (InDetFlags.doPrintConfigurables()):
- print ' SecVertexMergingTool : ', SecVertexMergingTool
+ printfunc (' SecVertexMergingTool : ', SecVertexMergingTool)
from InDetInclusiveSecVtx.InDetInclusiveSecVtxConf import InDet__InDetSecVtxFinder
InDetIncSecVtxFinder = InDet__InDetSecVtxFinder(name = "InDetIncSecVtxFinder",
@@ -250,5 +250,5 @@ InDetIncSecVtxFinder = InDet__InDetSecVtxFinder(name = "InDetIncSecV
topSequence += InDetIncSecVtxFinder
if InDetFlags.doPrintConfigurables():
- print ' InDetIncSecVtxFinder : ' , InDetIncSecVtxFinder
+ printfunc (' InDetIncSecVtxFinder : ' , InDetIncSecVtxFinder)
diff --git a/InnerDetector/InDetExample/InDetRecExample/share/InDetInclusiveSecVtx_fromAOD.py b/InnerDetector/InDetExample/InDetRecExample/share/InDetInclusiveSecVtx_fromAOD.py
index 3e95feb062e..a5e42f6fde2 100755
--- a/InnerDetector/InDetExample/InDetRecExample/share/InDetInclusiveSecVtx_fromAOD.py
+++ b/InnerDetector/InDetExample/InDetRecExample/share/InDetInclusiveSecVtx_fromAOD.py
@@ -77,22 +77,22 @@ if redoPatternRecoAndTracking and reDoParticleCreation:
reDoPrimaryVertexing = True
if not (readESD or readAOD):
- print "You have to turn on reading of ESD or AOD! That's the purpose of this jobO!"
+ printfunc ("You have to turn on reading of ESD or AOD! That's the purpose of this jobO!")
if readESD and readAOD:
- print "I can either read ESD or AOD but not both at the same time! Turn one or the other off!"
+ printfunc ("I can either read ESD or AOD but not both at the same time! Turn one or the other off!")
if readESD and reDoPrimaryVertexing and not reDoParticleCreation:
- print "INFO! You are running on ESD, redoing the vertexing but not recreating the TrackParticles!"
- print "INFO! To avoid inconsistencies do not use the old track particles in conjunction with the new vertex!"
+ printfunc ("INFO! You are running on ESD, redoing the vertexing but not recreating the TrackParticles!")
+ printfunc ("INFO! To avoid inconsistencies do not use the old track particles in conjunction with the new vertex!")
if doWriteESD or doWriteAOD:
- print "INFO! To avoid inconsistencies the old track particle (truth) container will not be in the new ESD/AOD!"
+ printfunc ("INFO! To avoid inconsistencies the old track particle (truth) container will not be in the new ESD/AOD!")
if readAOD and reDoPrimaryVertexing:
- print "INFO! You are running on AOD, and redoing the vertexing. At the moment new track particles cannot be made from old ones."
- print "INFO! To avoid inconsistencies do not use the old track particles in conjunction with the new vertex!"
+ printfunc ("INFO! You are running on AOD, and redoing the vertexing. At the moment new track particles cannot be made from old ones.")
+ printfunc ("INFO! To avoid inconsistencies do not use the old track particles in conjunction with the new vertex!")
if doWriteAOD:
- print "INFO! To avoid inconsistencies the old track particle (truth) container will not be in the new AOD!"
+ printfunc ("INFO! To avoid inconsistencies the old track particle (truth) container will not be in the new AOD!")
if doRefitTracks and (reDoPrimaryVertexing or reDoParticleCreation):
- print "INFO! You are refitting tracks and also revertex and/or recreate track particles"
- print "INFO! The input for that will be the refitted tracks!"
+ printfunc ("INFO! You are refitting tracks and also revertex and/or recreate track particles")
+ printfunc ("INFO! The input for that will be the refitted tracks!")
#--------------------------------------------------------------
# Additional Detector setup
@@ -199,7 +199,7 @@ if doWriteAOD:
InDetKeys.OutputAODFileName = "output.root"
# InDetKeys.OutputAODFileName = "/tmp/shanly/InDetRecAOD_new.root"
-print "Printing InDetKeys"
+printfunc ("Printing InDetKeys")
InDetKeys.lockAllExceptAlias()
InDetKeys.print_JobProperties()
diff --git a/InnerDetector/InDetExample/InDetRecExample/share/InDetRecXKalIPat.py b/InnerDetector/InDetExample/InDetRecExample/share/InDetRecXKalIPat.py
index ce7500aca02..0375d65897b 100755
--- a/InnerDetector/InDetExample/InDetRecExample/share/InDetRecXKalIPat.py
+++ b/InnerDetector/InDetExample/InDetRecExample/share/InDetRecXKalIPat.py
@@ -44,7 +44,7 @@ if InDetFlags.doxKalman():
topSequence += XKaMField
if (InDetFlags.doPrintConfigurables()):
- print XKaMField
+ printfunc (XKaMField)
#
# xKalman geomodel service
@@ -69,7 +69,7 @@ if InDetFlags.doxKalman():
topSequence += XKaDetectorBuilder
if (InDetFlags.doPrintConfigurables()):
- print XKaDetectorBuilder
+ printfunc (XKaDetectorBuilder)
#
# xKalman seeds service
@@ -80,7 +80,7 @@ if InDetFlags.doxKalman():
topSequence += XKaSeedsManager
if (InDetFlags.doPrintConfigurables()):
- print XKaSeedsManager
+ printfunc (XKaSeedsManager)
#
# xKalman seed for full event reconstruction
@@ -91,7 +91,7 @@ if InDetFlags.doxKalman():
RoadParameters = [InDetNewTrackingCuts.minPT(),3.2,2.6,240.,InDetNewTrackingCuts.maxPrimaryImpact()])
topSequence += XKaSeedALL
if (InDetFlags.doPrintConfigurables()):
- print XKaSeedALL
+ printfunc (XKaSeedALL)
#
# xKalman reconstruction menager
@@ -123,7 +123,7 @@ if InDetFlags.doxKalman():
ExtraInformation = 2 )
topSequence += XKalMan
if (InDetFlags.doPrintConfigurables()):
- print XKalMan
+ printfunc (XKalMan)
#
# xKalman clusters production
@@ -137,7 +137,7 @@ if InDetFlags.doxKalman():
PrintLevelDetector = -1 )
topSequence += XKaClustersProduction
if (InDetFlags.doPrintConfigurables()):
- print XKaClustersProduction
+ printfunc (XKaClustersProduction)
#
# xKalman space points production
@@ -150,7 +150,7 @@ if InDetFlags.doxKalman():
PrintLevelDetector = -1 )
topSequence += XKaSpacePointsProduction
if (InDetFlags.doPrintConfigurables()):
- print XKaSpacePointsProduction
+ printfunc (XKaSpacePointsProduction)
#
# xKalman reconstruction started from space points seeds
@@ -162,7 +162,7 @@ if InDetFlags.doxKalman():
PrintLevelTracks = [-1,1] )
topSequence += XKaSILReconstruction
if (InDetFlags.doPrintConfigurables()):
- print XKaSILReconstruction
+ printfunc (XKaSILReconstruction)
#
# xKalman reconstruction using only TRT information
@@ -174,7 +174,7 @@ if InDetFlags.doxKalman():
PrintLevelTracks = [-1,1] )
topSequence += XKaTRTReconstruction
if (InDetFlags.doPrintConfigurables()):
- print XKaTRTReconstruction
+ printfunc (XKaTRTReconstruction)
#
# xKalman ambiguity solving
@@ -186,7 +186,7 @@ if InDetFlags.doxKalman():
PrintLevelTracks = [-1,1] )
topSequence += XKaTracksComparison
if (InDetFlags.doPrintConfigurables()):
- print XKaTracksComparison
+ printfunc (XKaTracksComparison)
#
# xKalman track extension to TRT
@@ -198,7 +198,7 @@ if InDetFlags.doxKalman():
PrintLevelTracks = [-1,1] )
topSequence += XKaTrackTRTExtension
if (InDetFlags.doPrintConfigurables()):
- print XKaTrackTRTExtension
+ printfunc (XKaTrackTRTExtension)
#
# xKalman simple tracks production
#
@@ -213,7 +213,7 @@ if InDetFlags.doxKalman():
RIOonTrackTool = InDetRotCreator )
topSequence += XKaSimpleTracksProduction
if (InDetFlags.doPrintConfigurables()):
- print XKaSimpleTracksProduction
+ printfunc (XKaSimpleTracksProduction)
if InDetFlags.doTruth():
#
diff --git a/InnerDetector/InDetExample/InDetRecExample/share/InDetRec_jobOptions.py b/InnerDetector/InDetExample/InDetRecExample/share/InDetRec_jobOptions.py
index a75879d6e14..a0d06b25e30 100755
--- a/InnerDetector/InDetExample/InDetRecExample/share/InDetRec_jobOptions.py
+++ b/InnerDetector/InDetExample/InDetRecExample/share/InDetRec_jobOptions.py
@@ -34,7 +34,7 @@ else:
printfunc ("* Major FAILURE : InDet reconstruction in seeded brem mode, *")
printfunc ("* but LAr is off *")
printfunc ("*************************************************************")
- # raise RuntimeError,"Conflict in InDetRec setup: seeded Brem recovery, but Calo is off"
+ # raise RuntimeError ("Conflict in InDetRec setup: seeded Brem recovery, but Calo is off")
if InDetFlags.doBremRecovery.is_locked():
InDetFlags.doBremRecovery.unlock()
printfunc (" ------------> WARNING: turning off brem recovery")
diff --git a/InnerDetector/InDetExample/InDetRecExample/share/ReadInDet_jobOptions.py b/InnerDetector/InDetExample/InDetRecExample/share/ReadInDet_jobOptions.py
index 789bcd4894f..680393b67e5 100755
--- a/InnerDetector/InDetExample/InDetRecExample/share/ReadInDet_jobOptions.py
+++ b/InnerDetector/InDetExample/InDetRecExample/share/ReadInDet_jobOptions.py
@@ -76,22 +76,22 @@ if redoPatternRecoAndTracking and reDoParticleCreation:
reDoPrimaryVertexing = True
if not (readESD or readAOD):
- print "You have to turn on reading of ESD or AOD! That's the purpose of this jobO!"
+ printfunc ("You have to turn on reading of ESD or AOD! That's the purpose of this jobO!")
if readESD and readAOD:
- print "I can either read ESD or AOD but not both at the same time! Turn one or the other off!"
+ printfunc ("I can either read ESD or AOD but not both at the same time! Turn one or the other off!")
if readESD and reDoPrimaryVertexing and not reDoParticleCreation:
- print "INFO! You are running on ESD, redoing the vertexing but not recreating the TrackParticles!"
- print "INFO! To avoid inconsistencies do not use the old track particles in conjunction with the new vertex!"
+ printfunc ("INFO! You are running on ESD, redoing the vertexing but not recreating the TrackParticles!")
+ printfunc ("INFO! To avoid inconsistencies do not use the old track particles in conjunction with the new vertex!")
if doWriteESD or doWriteAOD:
- print "INFO! To avoid inconsistencies the old track particle (truth) container will not be in the new ESD/AOD!"
+ printfunc ("INFO! To avoid inconsistencies the old track particle (truth) container will not be in the new ESD/AOD!")
if readAOD and reDoPrimaryVertexing:
- print "INFO! You are running on AOD, and redoing the vertexing. At the moment new track particles cannot be made from old ones."
- print "INFO! To avoid inconsistencies do not use the old track particles in conjunction with the new vertex!"
+ printfunc ("INFO! You are running on AOD, and redoing the vertexing. At the moment new track particles cannot be made from old ones.")
+ printfunc ("INFO! To avoid inconsistencies do not use the old track particles in conjunction with the new vertex!")
if doWriteAOD:
- print "INFO! To avoid inconsistencies the old track particle (truth) container will not be in the new AOD!"
+ printfunc ("INFO! To avoid inconsistencies the old track particle (truth) container will not be in the new AOD!")
if doRefitTracks and (reDoPrimaryVertexing or reDoParticleCreation):
- print "INFO! You are refitting tracks and also revertex and/or recreate track particles"
- print "INFO! The input for that will be the refitted tracks!"
+ printfunc ("INFO! You are refitting tracks and also revertex and/or recreate track particles")
+ printfunc ("INFO! The input for that will be the refitted tracks!")
#--------------------------------------------------------------
# Additional Detector setup
@@ -192,7 +192,7 @@ if doWriteESD:
if doWriteAOD:
InDetKeys.OutputAODFileName = "InDetRecAOD_new.root"
-print "Printing InDetKeys"
+printfunc ("Printing InDetKeys")
InDetKeys.lockAllExceptAlias()
InDetKeys.print_JobProperties()
diff --git a/InnerDetector/InDetExample/InDetRecExample/share/jobOptions_RecExCommon.py b/InnerDetector/InDetExample/InDetRecExample/share/jobOptions_RecExCommon.py
index 21e9231fa74..35175491bed 100755
--- a/InnerDetector/InDetExample/InDetRecExample/share/jobOptions_RecExCommon.py
+++ b/InnerDetector/InDetExample/InDetRecExample/share/jobOptions_RecExCommon.py
@@ -140,14 +140,14 @@ recAlgs.doTrackParticleCellAssociation.set_Value_and_Lock(False)
#--------------------------------------------------------------
from AthenaCommon.GlobalFlags import globalflags
-print "globalflags configuration:"
-print globalflags
+printfunc ("globalflags configuration:")
+printfunc (globalflags)
-print "detflags configuration:"
+printfunc ("detflags configuration:")
DetFlags.Print()
-print "rec configuration:"
-print rec
+printfunc ("rec configuration:")
+printfunc (rec)
#--------------------------------------------------------------
# Load InDet configuration
--
GitLab