diff --git a/InnerDetector/InDetExample/InDetRecExample/python/ConfiguredInDetSGDeletion.py b/InnerDetector/InDetExample/InDetRecExample/python/ConfiguredInDetSGDeletion.py
index 765cc8bb7fa78d0382e5cb04bd5599d88620a163..2a803bf49a86a3e8509c66285744ab07fb82cae7 100644
--- a/InnerDetector/InDetExample/InDetRecExample/python/ConfiguredInDetSGDeletion.py
+++ b/InnerDetector/InDetExample/InDetRecExample/python/ConfiguredInDetSGDeletion.py
@@ -1,4 +1,6 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+
+from __future__ import print_function
class InDetSGDeletionAlg:
def __init__(self, container = "TrackCollection#", key = None):
diff --git a/InnerDetector/InDetExample/InDetRecExample/python/ConfiguredNewTrackingCuts.py b/InnerDetector/InDetExample/InDetRecExample/python/ConfiguredNewTrackingCuts.py
index 7772e940fcb16c05ad72cd92132a1c12249b6f8f..9437a5e3c0c11d7d70e5702d1b2742bb79252861 100755
--- a/InnerDetector/InDetExample/InDetRecExample/python/ConfiguredNewTrackingCuts.py
+++ b/InnerDetector/InDetExample/InDetRecExample/python/ConfiguredNewTrackingCuts.py
@@ -1,5 +1,7 @@
# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+from __future__ import print_function
+
#########################################################################
# ConfiguredNewtrackingCuts class
diff --git a/InnerDetector/InDetExample/InDetRecExample/python/ConfiguredSecVertexFinding.py b/InnerDetector/InDetExample/InDetRecExample/python/ConfiguredSecVertexFinding.py
index 87e05e32ac6ca57968461221f2f7fc52e8bb22ed..bca989125e5f3b5766e591f8885d26fcfec87f4c 100644
--- a/InnerDetector/InDetExample/InDetRecExample/python/ConfiguredSecVertexFinding.py
+++ b/InnerDetector/InDetExample/InDetRecExample/python/ConfiguredSecVertexFinding.py
@@ -1,4 +1,7 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+
+from __future__ import print_function
+
# ------------------------------------------------------------------------------------
#
diff --git a/InnerDetector/InDetExample/InDetRecExample/python/ConfiguredSecondaryVertexCuts.py b/InnerDetector/InDetExample/InDetRecExample/python/ConfiguredSecondaryVertexCuts.py
index bb6fba107c0a6296a1df07e7b1140584e33ef3a4..27515663fc48ef96618f34ed99750fc6b4d667e8 100644
--- a/InnerDetector/InDetExample/InDetRecExample/python/ConfiguredSecondaryVertexCuts.py
+++ b/InnerDetector/InDetExample/InDetRecExample/python/ConfiguredSecondaryVertexCuts.py
@@ -1,4 +1,7 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+
+from __future__ import print_function
+
########################################################################
# ConfiguredSecondaryVertexCuts class
diff --git a/InnerDetector/InDetExample/InDetRecExample/python/ConfiguredVertexingCuts.py b/InnerDetector/InDetExample/InDetRecExample/python/ConfiguredVertexingCuts.py
index 7b465beb84751a1ddfd1ab2aa5b0f695144e9e8b..2a0ffe0e8c5dbc789a5a3cf60a238394a80d48a9 100644
--- a/InnerDetector/InDetExample/InDetRecExample/python/ConfiguredVertexingCuts.py
+++ b/InnerDetector/InDetExample/InDetRecExample/python/ConfiguredVertexingCuts.py
@@ -1,4 +1,7 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+
+from __future__ import print_function
+
##############################################################################
# ConfiguredVertexingCuts class
diff --git a/InnerDetector/InDetExample/InDetRecExample/python/InDetJobProperties.py b/InnerDetector/InDetExample/InDetRecExample/python/InDetJobProperties.py
index 26e55f3094f0b3f31832a6d2e1284bd3616f0224..c60eb52f8cfffd0beaaa6b1ce30bf39f885cc27c 100644
--- a/InnerDetector/InDetExample/InDetRecExample/python/InDetJobProperties.py
+++ b/InnerDetector/InDetExample/InDetRecExample/python/InDetJobProperties.py
@@ -1,5 +1,6 @@
# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+from __future__ import print_function
#
diff --git a/InnerDetector/InDetExample/InDetRecExample/python/InDetKeys.py b/InnerDetector/InDetExample/InDetRecExample/python/InDetKeys.py
index f5883a0b0ecaefbe3995172761a639582d07232c..c3f8a3840b52fed4ea6454ba63e126a0ae880376 100644
--- a/InnerDetector/InDetExample/InDetRecExample/python/InDetKeys.py
+++ b/InnerDetector/InDetExample/InDetRecExample/python/InDetKeys.py
@@ -1,4 +1,7 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+
+from __future__ import print_function
+
##
## @file InDetRecExample/python/InDetKeys.py
diff --git a/InnerDetector/InDetExample/InDetRecExample/share/InDetRecCabling.py b/InnerDetector/InDetExample/InDetRecExample/share/InDetRecCabling.py
index 33311271b6a2bfc6bc66e70efcec3a1b809bc654..7c7235c6be5d42a892e5daf65dce825e98bc3b62 100755
--- a/InnerDetector/InDetExample/InDetRecExample/share/InDetRecCabling.py
+++ b/InnerDetector/InDetExample/InDetRecExample/share/InDetRecCabling.py
@@ -17,7 +17,7 @@ if DetFlags.detdescr.pixel_on() and not 'PixelCabling' in dir():
PixelCablingSvc = getService("PixelCablingSvc")
ServiceMgr += PixelCablingSvc
if (InDetFlags.doPrintConfigurables()):
- print(PixelCablingSvc)
+ printfunc (PixelCablingSvc)
#
# --- SCT cabling
@@ -30,7 +30,7 @@ if DetFlags.detdescr.SCT_on():
SCT_CablingCondAlgFromCoraCool = getAlgorithm("SCT_CablingCondAlgFromCoraCool")
condSeq += SCT_CablingCondAlgFromCoraCool
if (InDetFlags.doPrintConfigurables()):
- print(SCT_CablingCondAlgFromCoraCool)
+ printfunc (SCT_CablingCondAlgFromCoraCool)
#
# --- TRT cabling
@@ -44,12 +44,12 @@ if DetFlags.detdescr.TRT_on() and not 'TRT_Cabling' in dir():
TRT_Cabling.RealData=True
ToolSvc += TRT_Cabling
if (InDetFlags.doPrintConfigurables()):
- print(TRT_Cabling)
+ printfunc (TRT_Cabling)
from TRT_Cabling.TRT_CablingConf import TRT_CablingSvc
TRT_CablingSvc = TRT_CablingSvc()
ServiceMgr += TRT_CablingSvc
if (InDetFlags.doPrintConfigurables()):
- print(TRT_CablingSvc)
+ printfunc (TRT_CablingSvc)
diff --git a/InnerDetector/InDetExample/InDetRecExample/share/InDetRecConditionsAccess.py b/InnerDetector/InDetExample/InDetRecExample/share/InDetRecConditionsAccess.py
index 773a4a0c342e165d0972a88b67670846d3220020..83d652ec1d314818dc6c78382af4f3453898849f 100644
--- a/InnerDetector/InDetExample/InDetRecExample/share/InDetRecConditionsAccess.py
+++ b/InnerDetector/InDetExample/InDetRecExample/share/InDetRecConditionsAccess.py
@@ -136,7 +136,7 @@ if DetFlags.haveRIO.SCT_on():
sct_ConditionsSummaryToolSetup.setup()
InDetSCT_ConditionsSummaryTool = sct_ConditionsSummaryToolSetup.getTool()
if (InDetFlags.doPrintConfigurables()):
- print InDetSCT_ConditionsSummaryTool
+ printfunc (InDetSCT_ConditionsSummaryTool)
# Load conditions configuration service and load folders and algorithm for it
# Load folders that have to exist for both MC and Data
@@ -158,7 +158,7 @@ if DetFlags.haveRIO.SCT_on():
pass
try:
if (InDetFlags.ForceCoolVectorPayload() and InDetFlags.ForceCoraCool()):
- print '*** SCT DB CONFIGURATION FLAG CONFLICT: Both CVP and CoraCool selected****'
+ printfunc ('*** SCT DB CONFIGURATION FLAG CONFLICT: Both CVP and CoraCool selected****')
SCTConfigurationFolderPath=''
except:
pass
@@ -170,7 +170,7 @@ if DetFlags.haveRIO.SCT_on():
sct_ConfigurationConditionsToolSetup.setup()
InDetSCT_ConfigurationConditionsTool = sct_ConfigurationConditionsToolSetup.getTool()
if (InDetFlags.doPrintConfigurables()):
- print InDetSCT_ConfigurationConditionsTool
+ printfunc (InDetSCT_ConfigurationConditionsTool)
# Load calibration conditions tool
from SCT_ConditionsTools.SCT_ReadCalibDataToolSetup import SCT_ReadCalibDataToolSetup
@@ -178,7 +178,7 @@ if DetFlags.haveRIO.SCT_on():
sct_ReadCalibDataToolSetup.setup()
InDetSCT_ReadCalibDataTool = sct_ReadCalibDataToolSetup.getTool()
if (InDetFlags.doPrintConfigurables()):
- print InDetSCT_ReadCalibDataTool
+ printfunc (InDetSCT_ReadCalibDataTool)
# Load flagged condition tool
from SCT_ConditionsTools.SCT_FlaggedConditionToolSetup import SCT_FlaggedConditionToolSetup
@@ -186,7 +186,7 @@ if DetFlags.haveRIO.SCT_on():
sct_FlaggedConditionToolSetup.setup()
InDetSCT_FlaggedConditionTool = sct_FlaggedConditionToolSetup.getTool()
if (InDetFlags.doPrintConfigurables()):
- print InDetSCT_FlaggedConditionTool
+ printfunc (InDetSCT_FlaggedConditionTool)
# Load conditions Monitoring tool
if not athenaCommonFlags.isOnline():
@@ -196,7 +196,7 @@ if DetFlags.haveRIO.SCT_on():
sct_MonitorConditionsToolSetup.setup()
InDetSCT_MonitorConditionsTool = sct_MonitorConditionsToolSetup.getTool()
if (InDetFlags.doPrintConfigurables()):
- print InDetSCT_MonitorConditionsTool
+ printfunc (InDetSCT_MonitorConditionsTool)
if InDetFlags.doSCTModuleVeto():
from SCT_ConditionsTools.SCT_ModuleVetoToolSetup import SCT_ModuleVetoToolSetup
@@ -204,7 +204,7 @@ if DetFlags.haveRIO.SCT_on():
sct_ModuleVetoToolSetup.setup()
InDetSCT_ModuleVetoTool = sct_ModuleVetoToolSetup.getTool()
if (InDetFlags.doPrintConfigurables()):
- print InDetSCT_ModuleVetoTool
+ printfunc (InDetSCT_ModuleVetoTool)
# Load bytestream errors tool (use default instance without "InDet")
# @TODO find a better to solution to get the correct tool for the current job.
@@ -213,7 +213,7 @@ if DetFlags.haveRIO.SCT_on():
sct_ByteStreamErrorsToolSetup.setConfigTool(InDetSCT_ConfigurationConditionsTool)
sct_ByteStreamErrorsToolSetup.setup()
if (InDetFlags.doPrintConfigurables()):
- print sct_ByteStreamErrorsToolSetup.getTool()
+ printfunc (sct_ByteStreamErrorsToolSetup.getTool())
if InDetFlags.useSctDCS():
from SCT_ConditionsTools.SCT_DCSConditionsToolSetup import SCT_DCSConditionsToolSetup
@@ -223,10 +223,10 @@ if DetFlags.haveRIO.SCT_on():
if InDetFlags.useHVForSctDCS():
sct_DCSConditionsToolSetup.getStateAlg().UseDefaultHV = True #Hack to use ~20V cut for SCT DCS rather than ChanStat for startup
if (InDetFlags.doPrintConfigurables()):
- print InDetSCT_DCSConditionsTool
+ printfunc (InDetSCT_DCSConditionsTool)
if (globalflags.DataSource() == 'data'):
- print "Conditions db instance is ", conddb.dbdata
+ printfunc ("Conditions db instance is ", conddb.dbdata)
# Load Tdaq enabled tools for data only and add some to summary tool for data only
tdaqFolder = '/TDAQ/EnabledResources/ATLAS/SCT/Robins'
if (conddb.dbdata == "CONDBR2"):
@@ -238,7 +238,7 @@ if DetFlags.haveRIO.SCT_on():
sct_TdaqEnabledToolSetup.setup()
InDetSCT_TdaqEnabledTool = sct_TdaqEnabledToolSetup.getTool()
if (InDetFlags.doPrintConfigurables()):
- print InDetSCT_TdaqEnabledTool
+ printfunc (InDetSCT_TdaqEnabledTool)
# Configure summary tool
InDetSCT_ConditionsSummaryTool.ConditionsTools= [ sct_ConfigurationConditionsToolSetup.getTool().getFullName(),
@@ -272,7 +272,7 @@ if DetFlags.haveRIO.SCT_on():
TrackingCommon.def_InDetSCT_ConditionsSummaryTool=InDetSCT_ConditionsSummaryTool
if (InDetFlags.doPrintConfigurables()):
- print InDetSCT_ConditionsSummaryTool
+ printfunc (InDetSCT_ConditionsSummaryTool)
# Conditions summary tool without InDetSCT_FlaggedConditionTool
sct_ConditionsSummaryToolSetupWithoutFlagged = SCT_ConditionsSummaryToolSetup("InDetSCT_ConditionsSummaryToolWithoutFlagged")
@@ -340,7 +340,7 @@ if DetFlags.haveRIO.TRT_on():
InDetTRTCalDbSvc = TRT_CalDbSvc()
ServiceMgr += InDetTRTCalDbSvc
if(InDetFlags.doPrintConfigurables()):
- print InDetTRTCalDbSvc
+ printfunc (InDetTRTCalDbSvc)
# Dead/Noisy Straw Lists
@@ -389,7 +389,7 @@ if DetFlags.haveRIO.TRT_on():
InDetTRT_DAQ_ConditionsSvc = TRT_DAQ_ConditionsSvc( name = "InDetTRT_DAQ_ConditionsSvc" )
ServiceMgr += InDetTRT_DAQ_ConditionsSvc
if (InDetFlags.doPrintConfigurables()):
- print InDetTRT_DAQ_ConditionsSvc
+ printfunc (InDetTRT_DAQ_ConditionsSvc)
#
# Load and Configure TRT Conditions Services
@@ -407,7 +407,7 @@ if DetFlags.haveRIO.TRT_on():
isGEANT4 = useOldStyle)
ServiceMgr += InDetTRTStrawStatusSummarySvc
if (InDetFlags.doPrintConfigurables()):
- print InDetTRTStrawStatusSummarySvc
+ printfunc (InDetTRTStrawStatusSummarySvc)
InDetTRTConditionsServices.append(InDetTRTStrawStatusSummarySvc)
# Straw status tool
@@ -467,7 +467,7 @@ if DetFlags.haveRIO.TRT_on():
InDetTRT_HWMappingSvc = TRT_HWMappingSvc(name="InDetTRT_HWMappingSvc")
ServiceMgr += InDetTRT_HWMappingSvc
if (InDetFlags.doPrintConfigurables()):
- print InDetTRT_HWMappingSvc
+ printfunc (InDetTRT_HWMappingSvc)
from TRT_ConditionsServices.TRT_ConditionsServicesConf import TRT_DCS_ConditionsSvc
InDetTRT_DCS_ConditionsSvc = TRT_DCS_ConditionsSvc(name = "InDetTRT_DCS_ConditionsSvc",
@@ -480,7 +480,7 @@ if DetFlags.haveRIO.TRT_on():
)
ServiceMgr += InDetTRT_DCS_ConditionsSvc
if (InDetFlags.doPrintConfigurables()):
- print InDetTRT_DCS_ConditionsSvc
+ printfunc (InDetTRT_DCS_ConditionsSvc)
#InDetTRTConditionsServices.append(InDetTRT_DCS_ConditionsSvc)
# TRT Conditions Summary Service
@@ -489,6 +489,6 @@ if DetFlags.haveRIO.TRT_on():
ServiceList = InDetTRTConditionsServices)
ServiceMgr += InDetTRTConditionsSummaryService
if (InDetFlags.doPrintConfigurables()):
- print InDetTRTConditionsSummaryService
+ printfunc (InDetTRTConditionsSummaryService)