Merge branch 'py3.DerivationFrameworkMuons-20200501' into 'master'

DerivationFrameworkMuons: Python 3 / flake8 fixes.

See merge request atlas/athena!32554

PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/CMakeLists.txt

@@ -50,5 +50,6 @@ atlas_add_component( DerivationFrameworkMuons
    LINK_LIBRARIES GaudiKernel DerivationFrameworkMuonsLib )
 
 # Install files from the package:
-atlas_install_python_modules( python/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
 atlas_install_joboptions( share/*.py )
+

PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/python/ConstituentPileupIso.py

-#Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+#Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 def ConstituentPileupIso(privateSeq):
   from AthenaCommon.AppMgr import ToolSvc
   from JetRecTools.JetRecToolsConfig import ctm
-  from JetRecTools.JetRecToolsConf import CaloClusterConstituentsOrigin, ConstituentSubtractorTool, ConstitTimeCutTool, SoftKillerWeightTool
+  from JetRecTools.JetRecToolsConf import ConstituentSubtractorTool, ConstitTimeCutTool, SoftKillerWeightTool
   ctm.add( ConstitTimeCutTool("JetConstit_Timing"),
            alias = 'timing' )
   ctm.add( ConstituentSubtractorTool("JetConstit_ConstSub"),
@@ -95,11 +95,11 @@ def ConstituentPileupIso(privateSeq):
   ToolSvc += OrigTimeCSSKCaloClustersInConeTool
   
   from PFlowUtils.PFlowUtilsConf import CP__RetrievePFOTool as RetrievePFOTool
-  TimePFCSTool = RetrievePFOTool("TimePFCSTool",NeutralInputContainer="TimePFCSNeutralParticleFlowObjects");
+  TimePFCSTool = RetrievePFOTool("TimePFCSTool",NeutralInputContainer="TimePFCSNeutralParticleFlowObjects")
   ToolSvc += TimePFCSTool
-  TimePFSKTool = RetrievePFOTool("TimePFSKTool",NeutralInputContainer="TimePFSKNeutralParticleFlowObjects");
+  TimePFSKTool = RetrievePFOTool("TimePFSKTool",NeutralInputContainer="TimePFSKNeutralParticleFlowObjects")
   ToolSvc += TimePFSKTool
-  TimePFCSSKTool = RetrievePFOTool("TimePFCSSKTool",NeutralInputContainer="TimePFCSSKNeutralParticleFlowObjects");
+  TimePFCSSKTool = RetrievePFOTool("TimePFCSSKTool",NeutralInputContainer="TimePFCSSKNeutralParticleFlowObjects")
   ToolSvc += TimePFCSSKTool
   
   from ParticlesInConeTools.ParticlesInConeToolsConf import xAOD__PFlowObjectsInConeTool

PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/python/JPsiVertexFitSetup.py

+#Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+from __future__ import print_function
 
 def AddJPsiVertexingAlgs(prefix='',addAlgo=True):
 
@@ -12,7 +15,7 @@ def AddJPsiVertexingAlgs(prefix='',addAlgo=True):
   from TrkVertexFitterUtils.TrkVertexFitterUtilsConf import Trk__KalmanVertexUpdator
   VertexUpdater = Trk__KalmanVertexUpdator(name             = "MuonTP_KalmanVertexUpdator")
   ToolSvc += VertexUpdater
-  print      VertexUpdater
+  print (     VertexUpdater)
 
 
 
@@ -21,7 +24,7 @@ def AddJPsiVertexingAlgs(prefix='',addAlgo=True):
     MuContainer = job.CalibratedMuonsProvider.Output
 
 
-  from AthenaCommon.Constants import INFO,DEBUG,WARNING
+  from AthenaCommon.Constants import WARNING
   from JpsiUpsilonTools.JpsiUpsilonToolsConf import Analysis__JpsiFinder
   ExampleJpsiFinder = Analysis__JpsiFinder(name                        = prefix+"JpsiFinderName",
                                            muAndMu                     = False,
@@ -70,7 +73,7 @@ def AddJPsiVertexingAlgs(prefix='',addAlgo=True):
   OutputLevel           = WARNING )
 
   ToolSvc += MuonTP_Reco_mumu
-  print MuonTP_Reco_mumu
+  print (MuonTP_Reco_mumu)
 
 
   from DerivationFrameworkBPhys.DerivationFrameworkBPhysConf import DerivationFramework__Select_onia2mumu
@@ -88,7 +91,7 @@ def AddJPsiVertexingAlgs(prefix='',addAlgo=True):
   OutputLevel           = WARNING)
 
   ToolSvc += MuonTP_Select_Jpsi2mumu
-  print MuonTP_Select_Jpsi2mumu
+  print (MuonTP_Select_Jpsi2mumu)
 
   if addAlgo:
       from DerivationFrameworkMuons.DerivationFrameworkMuonsConf import MuonTPJpsiVertexFittingAlg

PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/python/MuonsCommon.py

-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 #********************************************************************
 # MuonsCommon.py 
 # Schedules all tools needed for muon object selection and writes
 # results into SG. These may then be accessed along the train   
 #********************************************************************
-from DerivationFrameworkCore.DerivationFrameworkMaster import *
+from __future__ import print_function
+
+from DerivationFrameworkCore.DerivationFrameworkMaster import DerivationFrameworkJob
 from DerivationFrameworkMuons import DFCommonMuonsConfig
+from AthenaCommon.AppMgr import ToolSvc
+from AthenaCommon import CfgMgr 
 DFCommonMuonsTrtCutOff = DFCommonMuonsConfig.TrtCutOff
 
 #====================================================================
@@ -27,9 +31,9 @@ DFCommonMuonsSelector.MuQuality = 3
 # turn of the momentum correction which is not needed for IDHits cut and Preselection
 DFCommonMuonsSelector.TurnOffMomCorr = True
 
-if DFCommonMuonsTrtCutOff != None: DFCommonMuonsSelector.TrtCutOff = DFCommonMuonsTrtCutOff
+if DFCommonMuonsTrtCutOff is not None: DFCommonMuonsSelector.TrtCutOff = DFCommonMuonsTrtCutOff
 ToolSvc += DFCommonMuonsSelector
-print DFCommonMuonsSelector
+print (DFCommonMuonsSelector)
 
 DFCommonMuonToolWrapper = DerivationFramework__AsgSelectionToolWrapper( name = "DFCommonMuonToolWrapper",
                                                                         AsgSelectionTool = DFCommonMuonsSelector,
@@ -37,7 +41,7 @@ DFCommonMuonToolWrapper = DerivationFramework__AsgSelectionToolWrapper( name = "
                                                                         StoreGateEntryName = "DFCommonGoodMuon",
                                                                         ContainerName = "Muons")
 ToolSvc += DFCommonMuonToolWrapper
-print DFCommonMuonToolWrapper
+print (DFCommonMuonToolWrapper)
 DFCommonMuonToolWrapperTools.append(DFCommonMuonToolWrapper)
 
 ### Preselection
@@ -47,9 +51,9 @@ DFCommonMuonsSelectorPreselection.MuQuality = 3
 # turn of the momentum correction which is not needed for IDHits cut and Preselection
 DFCommonMuonsSelectorPreselection.TurnOffMomCorr = True
 
-if DFCommonMuonsTrtCutOff != None: DFCommonMuonsSelectorPreselection.TrtCutOff = DFCommonMuonsTrtCutOff
+if DFCommonMuonsTrtCutOff is not None: DFCommonMuonsSelectorPreselection.TrtCutOff = DFCommonMuonsTrtCutOff
 ToolSvc += DFCommonMuonsSelectorPreselection
-print DFCommonMuonsSelectorPreselection
+print (DFCommonMuonsSelectorPreselection)
 
 DFCommonMuonToolWrapperPreselection = DerivationFramework__AsgSelectionToolWrapper( name = "DFCommonMuonToolWrapperPreselection",
                                                                         AsgSelectionTool = DFCommonMuonsSelectorPreselection,
@@ -57,20 +61,19 @@ DFCommonMuonToolWrapperPreselection = DerivationFramework__AsgSelectionToolWrapp
                                                                         StoreGateEntryName = "DFCommonMuonsPreselection",
                                                                         ContainerName = "Muons")
 ToolSvc += DFCommonMuonToolWrapperPreselection
-print DFCommonMuonToolWrapperPreselection
+print (DFCommonMuonToolWrapperPreselection)
 DFCommonMuonToolWrapperTools.append(DFCommonMuonToolWrapperPreselection)
 
 ### Decoration of the muon objects with the ID track covariances
 #from DerivationFrameworkMuons.DerivationFrameworkMuonsConf import DerivationFramework__MuonIDCovMatrixDecorator
 #DFCommonMuonIDCovMatrixDecorator = DerivationFramework__MuonIDCovMatrixDecorator( name = "DFCommonMuonIDCovMatrixDecorator")
 #ToolSvc += DFCommonMuonIDCovMatrixDecorator
-#print DFCommonMuonIDCovMatrixDecorator
+#print (DFCommonMuonIDCovMatrixDecorator)
 #DFCommonMuonToolWrapperTools.append(DFCommonMuonIDCovMatrixDecorator)
 
 #############
 #  Add tools
 #############
-from DerivationFrameworkCore.DerivationFrameworkCoreConf import DerivationFramework__CommonAugmentation
 DerivationFrameworkJob += CfgMgr.DerivationFramework__CommonAugmentation("DFCommonMuonsKernel",
                                                                          AugmentationTools = DFCommonMuonToolWrapperTools
                                                                         )

PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/python/StreamConfig.py

 #!/usr/bin/env python
 
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+from __future__ import print_function
+
 from DerivationFrameworkCore.DerivationFrameworkMaster import DerivationFrameworkIsMonteCarlo
 
 def useSmartSlimmingIfSupported(itemPairs, smAllVarlist, addItemList, ContainerNamesAndTypes):
@@ -8,7 +11,7 @@ def useSmartSlimmingIfSupported(itemPairs, smAllVarlist, addItemList, ContainerN
         cname = i.split('#')[-1]
         if cname in ContainerNamesAndTypes and itemPairs[i].split('#')[-1].rstrip('.') in ContainerNamesAndTypes:
             smAllVarlist.append(cname)
-            print cname, 'added to smartlimming'
+            print (cname, 'added to smartlimming')
         else:
             addItemList.append(i)
             addItemList.append(itemPairs[i])
@@ -124,14 +127,18 @@ class MuonsDxAODStreamConfigurer:
             stream.AddItem(item)
 
     def show(self):
-        print 'Add Items:'
-        for i in self.Items: print i,'=',self.Items[i]
-        print 'Smart slimming:'
-        for i in self.smSlContainer and (not i in self.allVarContainer): print i,'=',self.smSlContainer[i]
-        print 'Keep all varaibles:'
-        for i in self.allVarContainer: print i,'=',self.allVarContainer[i]
-        print 'Keep trigger content:'
-        for i in self.UseTriggerContent: print i,'=',self.UseTriggerContent[i]
+        print ('Add Items:')
+        for i in self.Items:
+            print (i,'=',self.Items[i])
+        print ('Smart slimming:')
+        for i in self.smSlContainer and (i not in self.allVarContainer):
+            print (i,'=',self.smSlContainer[i])
+        print ('Keep all variables:')
+        for i in self.allVarContainer:
+            print (i,'=',self.allVarContainer[i])
+        print ('Keep trigger content:')
+        for i in self.UseTriggerContent:
+            print (i,'=',self.UseTriggerContent[i])
 
 
 if __name__ == '__main__':

PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/python/TrackIsolationDecorator.py

-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Add a track isolation updater tool
 
+from __future__ import print_function
+
 from AthenaCommon.AppMgr import ToolSvc
 
 from IsolationTool.IsolationToolConf import xAOD__TrackIsolationTool
@@ -36,7 +38,7 @@ CaloIsoTool.addCaloExtensionDecoration = False
 # if hasattr(CaloIsoTool, 'addCaloExtensionDecoration'): ### somehow does not work
 #     CaloIsoTool.addCaloExtensionDecoration = False
 # CaloIsoTool.OutputLevel = 2
-print CaloIsoTool
+print (CaloIsoTool)
 ToolSvc += CaloIsoTool
 
 

PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/scripts/create_period_container.py

 #!/usr/bin/env python
 
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 ######################
 ##
 ## Contact: Dongliang Zhang <dongliang.zhang@cern.ch>
@@ -10,6 +10,8 @@
 ##   lsetup pyami
 ######################
 
+from __future__ import print_function
+
 import sys
 import pyAMI.client
 import pyAMI.atlas.api as AtlasAPI
@@ -46,7 +48,7 @@ def makeContainer(c1):
     runs = set([a['run_number'] for a in x0])
 
     if len(runs)==0:
-        print 'no run in period'+c1.period+' is listed in GRL:', c1.grl
+        print ('no run in period'+c1.period+' is listed in GRL:', c1.grl)
         return
 
     ### get AOD datasets
@@ -55,7 +57,7 @@ def makeContainer(c1):
     ### get dataset info
     dic1={}
     for a in x:
-        print a['run_number'], a['ldn']
+        print (a['run_number'], a['ldn'])
         try:
             dic1[a['ldn'].split('_')[-1]].append((a['run_number'],a['ldn']))
         except KeyError:
@@ -64,10 +66,10 @@ def makeContainer(c1):
     ### get the tags, sorted by popularity
     allTags = sorted(dic1.keys(), key=lambda k: len(dic1[k]),reverse=True)
     for tag in allTags:
-        print tag,':',
+        print (tag,':', end='')
         for xx in dic1[tag]:
-            print xx[0],
-        print
+            print (xx[0], end='')
+        print()
 
     ### use the most popular tags if not spicified
     t_acceptTags = c1.acceptTags if c1.acceptTags else allTags
@@ -86,19 +88,19 @@ def makeContainer(c1):
 
     ### Warning when the given tag does not select any dataset
     if len(ds)==0:
-        print 'No dataset in period',c1.period+', exiting...'
+        print ('No dataset in period',c1.period+', exiting...')
         return
 
     #### find any missing runs
     for d in ds:
-        print d[0],d[1]
+        print (d[0],d[1])
         runs.remove(d[0])
-    print runs
+    print (runs)
 
     #### Warn when there are any missing runs
     if len(runs) !=0:
-        print '!'*10
-        print 'MISSING ', ' '.join(runs)
+        print ('!'*10)
+        print ('MISSING ', ' '.join(runs))
 
     ### prepare commands
     dlist=','.join([d[1] for d in ds])
@@ -106,7 +108,7 @@ def makeContainer(c1):
     comments = superTag+','+c1.derivation
 
     cmd='ami cmd COMAPopulateSuperProductionDataset -rucioRegistration="yes" -creationComment="'+comments+'" -selectionType="run_config" -superTag="'+superTag+'" -containedDatasets="'+dlist+'" -separator="," '
-    print 'command:',cmd
+    print ('command:',cmd)
 
     ### write out script if asked
     if c1.outScript:
@@ -139,7 +141,7 @@ def doFirstTry():
     c1.grl = grl15
 
     pds =[p['period'] for p in periods if p['status']=='frozen']
-#     print pds
+#     print (pds)
 #     sys.exit(0)
 
     for p in pds:
@@ -161,7 +163,7 @@ def doData15():
     c1.grl = grl15
 
     pds =[p['period'] for p in periods if p['status']=='frozen']
-#     print pds
+#     print (pds)
 #     sys.exit(0)
 
     for p in pds:
@@ -184,7 +186,7 @@ def do2016LaterPeriods():
     c1.grl = grl16
 
 #     pds =[p['period'] for p in periods if p['status']=='frozen']
-#     print pds
+#     print (pds)
 #     sys.exit(0)
     pds = ['J', 'K', 'L']
 

PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/scripts/update_CPContent.py

 #!/usr/bin/env python
 
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+from __future__ import print_function
+
 import sys 
 import os
 sys.path.append(os.path.abspath("../python"))
 import MuonsCPContent as mcc
 
-print mcc.MuonsCPContent
+print (mcc.MuonsCPContent)
 
 def makeContent(l):
     ct = 'MuonsCPContent = [\n'
@@ -29,10 +32,10 @@ def mergeList(l1, l2, excludeList=[]):
             found = True
             for m in x[1:]:
                 if m in y[1:]: continue
-                print m, 'is not found for', tag
+                print (m, 'is not found for', tag)
                 l2[ji] += '.'+m
         if (not found) and (not (tag in excludeList)):
-            print tag, 'is not found'
+            print (tag, 'is not found')
             l1a.append(i)
     return l2+l1a
 
@@ -41,8 +44,8 @@ list1 = []
 with open(ifile) as if1:
     for line in if1.readlines():
         list1.append(line.rstrip())
-print makeContent(list1)
-print makeContent(mcc.MuonsCPContent)
+print (makeContent(list1))
+print (makeContent(mcc.MuonsCPContent))
 
 kk = mergeList(list1, mcc.MuonsCPContent, ['EventInfo', 'EventInfoAux']) 
 nc = makeContent(kk)

PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/share/MUON0.py

@@ -28,7 +28,7 @@ triggerList = ['HLT_.*mu.*', 'L1_.*MU.*','HLT_noalg_L1.*MU.*']
 from DerivationFrameworkCore.ThinningHelper import ThinningHelper
 MUON0ThinningHelper = ThinningHelper( "MUON0ThinningHelper" )
 MUON0ThinningHelper.TriggerChains = '|'.join(triggerList1)
-print MUON0ThinningHelper.TriggerChains
+printfunc (MUON0ThinningHelper.TriggerChains)
 MUON0ThinningHelper.AppendToStream( MUON0Stream )
 thinningSvc = getattr( svcMgr, "MUON0ThinningSvc" )
 thinningHelperTool = getattr( ToolSvc, "MUON0ThinningHelperSlim" )

PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/share/MUON1.py

@@ -40,7 +40,7 @@ triggerList1 = ['HLT_.*mu\d+.*']
 from DerivationFrameworkCore.ThinningHelper import ThinningHelper
 MUON1ThinningHelper = ThinningHelper( "MUON1ThinningHelper" )
 MUON1ThinningHelper.TriggerChains = '|'.join(triggerList1)
-print MUON1ThinningHelper.TriggerChains
+printfunc (MUON1ThinningHelper.TriggerChains)
 MUON1ThinningHelper.AppendToStream( MUON1Stream )
 
 #====================================================================
@@ -79,7 +79,7 @@ ToolSvc += MUON1AugmentTool1a
 MUON1AugmentTools.append(MUON1AugmentTool1a)
 skimmingORs.append(brPrefix1a+'DIMU_pass>0')
 thinningORs.append(brPrefix1a+'DIMU_trkStatus>0')
-print MUON1AugmentTool1a
+printfunc (MUON1AugmentTool1a)
 
 
 ### Jpsi for tag-probe
@@ -114,7 +114,7 @@ ToolSvc += MUON1AugmentTool1b
 MUON1AugmentTools.append(MUON1AugmentTool1b)
 skimmingORs.append(brPrefix1b+'DIMU_pass>0')
 thinningORs.append(brPrefix1b+'DIMU_trkStatus>0')
-print MUON1AugmentTool1b
+printfunc (MUON1AugmentTool1b)
 
 
 ### Jpsi for calibration
@@ -149,7 +149,7 @@ ToolSvc += MUON1AugmentTool1c
 MUON1AugmentTools.append(MUON1AugmentTool1c)
 skimmingORs.append(brPrefix1c+'DIMU_pass>0')
 thinningORs.append(brPrefix1c+'DIMU_trkStatus>0')
-print MUON1AugmentTool1c
+printfunc (MUON1AugmentTool1c)
 
 ### Upsilon tagging
 brPrefix1d = 'MUON1d'
@@ -182,7 +182,7 @@ ToolSvc += MUON1AugmentTool1d
 MUON1AugmentTools.append(MUON1AugmentTool1d)
 skimmingORs.append(brPrefix1d+'DIMU_pass>0')
 thinningORs.append(brPrefix1d+'DIMU_trkStatus>0')
-print MUON1AugmentTool1d
+printfunc (MUON1AugmentTool1d)
 
 ### isolation decorations
 from DerivationFrameworkMuons.TrackIsolationDecorator import MUON1IDTrackDecorator as MUON1AugmentTool2a
@@ -192,12 +192,12 @@ MUON1AugmentTool2a.SelectionFlagValue = 0
 
 ToolSvc += MUON1AugmentTool2a
 MUON1AugmentTools.append(MUON1AugmentTool2a)
-print MUON1AugmentTool2a
+printfunc (MUON1AugmentTool2a)
 
 from DerivationFrameworkMuons.TrackIsolationDecorator import MUON1MSTrackDecorator as MUON1AugmentTool3
 ToolSvc += MUON1AugmentTool3
 MUON1AugmentTools.append(MUON1AugmentTool3)
-print MUON1AugmentTool3
+printfunc (MUON1AugmentTool3)
 
 #====================================================================
 # SKIMMING
@@ -256,7 +256,7 @@ MUON1ThinningTool4 = DerivationFramework__CaloClusterThinning(name
                                                               TopoClCollectionSGKey   = "CaloCalTopoClusters",
                                                               ConeSize                = 0.5)
 ToolSvc += MUON1ThinningTool4
-print MUON1ThinningTool4
+printfunc (MUON1ThinningTool4)
 MUON1ThinningTools.append(MUON1ThinningTool4)
 
 ### also for forward tracks
@@ -278,7 +278,8 @@ theCaloCellDFGetter = CaloCellDFGetter(inputClusterKeys=["MuonClusterCollection"
 
 from DerivationFrameworkMuons import  JPsiVertexFitSetup
 MUON1AugmentTools += JPsiVertexFitSetup.AddJPsiVertexingAlgs('MUON1',False)
-for t in MUON1AugmentTools: print t
+for t in MUON1AugmentTools:
+  printfunc (t)
 
 from DerivationFrameworkBPhys.DerivationFrameworkBPhysConf import DerivationFramework__Thin_vtxTrk
 MUON1Thin_vtxTrk = DerivationFramework__Thin_vtxTrk(

PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/share/MUON2.py

@@ -12,7 +12,7 @@ isSimulation = False
 if globalflags.DataSource()=='geant4':
     isSimulation = True
 
-print isSimulation
+printfunc (isSimulation)
 
 #====================================================================
 # AUGMENTATION TOOLS 
@@ -60,7 +60,7 @@ MUON2JpsiFinder = Analysis__JpsiFinder(name                         = "MUON2Jpsi
                                         VertexPointEstimator        = MUON2_VertexTools.VtxPointEstimator,
                                         useMCPCuts                  = False)
 ToolSvc += MUON2JpsiFinder
-print      MUON2JpsiFinder
+printfunc (     MUON2JpsiFinder)
 
 #--------------------------------------------------------------------
 ## 3/ setup the vertex reconstruction "call" tool(s). They are part of the derivation framework.
@@ -76,7 +76,7 @@ MUON2JpsiSelectAndWrite = DerivationFramework__Reco_mumu(name                 =
                                                        RefPVContainerName     = "SHOULDNOTBEUSED",
                                                        DoVertexType           =1)
 ToolSvc += MUON2JpsiSelectAndWrite
-print MUON2JpsiSelectAndWrite
+printfunc (MUON2JpsiSelectAndWrite)
 
 
 from DerivationFrameworkBPhys.DerivationFrameworkBPhysConf import DerivationFramework__Select_onia2mumu
@@ -94,7 +94,7 @@ MUON2_Select_Jpsi2mumu = DerivationFramework__Select_onia2mumu(
 
   
 ToolSvc += MUON2_Select_Jpsi2mumu
-print      MUON2_Select_Jpsi2mumu
+printfunc (     MUON2_Select_Jpsi2mumu)
 
 
 
@@ -107,7 +107,7 @@ BsKKVertexFit = Trk__TrkVKalVrtFitter(
                                          FirstMeasuredPoint  = True,
                                          MakeExtendedVertex  = True)
 ToolSvc += BsKKVertexFit
-print      BsKKVertexFit
+printfunc (     BsKKVertexFit)
 
 from TrkVKalVrtFitter.TrkVKalVrtFitterConf import Trk__TrkVKalVrtFitter
 BplKplVertexFit = Trk__TrkVKalVrtFitter(
@@ -116,7 +116,7 @@ BplKplVertexFit = Trk__TrkVKalVrtFitter(
                                          FirstMeasuredPoint  = True,
                                          MakeExtendedVertex  = True)
 ToolSvc += BplKplVertexFit
-print      BplKplVertexFit
+printfunc (     BplKplVertexFit)
 
 
 ## 5/ setup the Jpsi+2 track finder
@@ -145,7 +145,7 @@ TrackSelectorTool		    = MUON2_VertexTools.InDetTrackSelectorTool,
 UseMassConstraint		    = True)
 
 ToolSvc += MUON2BsJpsiKK
-print      MUON2BsJpsiKK    
+printfunc (     MUON2BsJpsiKK    )
 
 ## 5a/ setup the Jpsi+1 track finder
 from JpsiUpsilonTools.JpsiUpsilonToolsConf import Analysis__JpsiPlus1Track
@@ -169,7 +169,7 @@ TrackSelectorTool		= MUON2_VertexTools.InDetTrackSelectorTool,
 UseMassConstraint		= True)
         
 ToolSvc += MUON2BplJpsiKpl
-print      MUON2BplJpsiKpl    
+printfunc (     MUON2BplJpsiKpl    )
 
 
 ## 6/ setup the combined augmentation/skimming tool for the Bpm
@@ -182,7 +182,7 @@ MUON2BsKKSelectAndWrite = DerivationFramework__Reco_dimuTrkTrk(name
                                                            RefitPV                  = True,
                                                            MaxPVrefit               = 10000, DoVertexType = 7)
 ToolSvc += MUON2BsKKSelectAndWrite 
-print      MUON2BsKKSelectAndWrite
+printfunc (     MUON2BsKKSelectAndWrite)
 
 from DerivationFrameworkBPhys.DerivationFrameworkBPhysConf import DerivationFramework__Reco_dimuTrk
 MUON2BplKplSelectAndWrite = DerivationFramework__Reco_dimuTrk(name				     	= "MUON2BplKplSelectAndWrite",
@@ -193,7 +193,7 @@ MUON2BplKplSelectAndWrite = DerivationFramework__Reco_dimuTrk(name				     	= "M
                                                               RefitPV                   = True,
                                                               MaxPVrefit                = 10000 )
 ToolSvc += MUON2BplKplSelectAndWrite
-print      MUON2BplKplSelectAndWrite
+printfunc (     MUON2BplKplSelectAndWrite)
 
 
 ## b/ augment and select Bs->JpsiKK candidates
@@ -208,7 +208,7 @@ MUON2_Select_Bs2JpsiKK = DerivationFramework__Select_onia2mumu(
   Chi2Max                    = 200)
 
 ToolSvc += MUON2_Select_Bs2JpsiKK
-print      MUON2_Select_Bs2JpsiKK
+printfunc (     MUON2_Select_Bs2JpsiKK)
 
 MUON2_Select_Bpl2JpsiKpl     = DerivationFramework__Select_onia2mumu(
   name                       = "MUON2_Select_Bpl2JpsiKpl",
@@ -221,7 +221,7 @@ MUON2_Select_Bpl2JpsiKpl     = DerivationFramework__Select_onia2mumu(
   Chi2Max                    = MUON2BplJpsiKpl.Chi2Cut)
 
 ToolSvc += MUON2_Select_Bpl2JpsiKpl
-print      MUON2_Select_Bpl2JpsiKpl
+printfunc (     MUON2_Select_Bpl2JpsiKpl)
 
 MUON2_Select_Bpl2JpsiPi      = DerivationFramework__Select_onia2mumu(
   name                       = "MUON2_Select_Bpl2JpsiPi",
@@ -234,14 +234,14 @@ MUON2_Select_Bpl2JpsiPi      = DerivationFramework__Select_onia2mumu(
   Chi2Max                    = MUON2BplJpsiKpl.Chi2Cut)
 
 ToolSvc += MUON2_Select_Bpl2JpsiPi
-print      MUON2_Select_Bpl2JpsiPi
+printfunc (     MUON2_Select_Bpl2JpsiPi)
 
 #expression = "count(BpmJpsiKpmCandidates.passed_Bplus) > 0"
 #from DerivationFrameworkTools.DerivationFrameworkToolsConf import DerivationFramework__xAODStringSkimmingTool
 #MUON2_SelectEvent = DerivationFramework__xAODStringSkimmingTool(name = "MUON2_SelectEvent",
 #                                                                expression = expression)
 #ToolSvc += MUON2_SelectEvent
-#print MUON2_SelectEvent
+#printfunc (MUON2_SelectEvent)
 
 
 #from DerivationFrameworkBPhys.DerivationFrameworkBPhysConf import DerivationFramework__SelectEvent
@@ -253,17 +253,17 @@ if not isSimulation: #Only Skim Data
      expression = "count(BsJpsiKKCandidates.passed_Bs > 0) > 0")
                                                     
    ToolSvc += MUON2_SelectBsJpsiKKEvent
-   print MUON2_SelectBsJpsiKKEvent
+   printfunc (MUON2_SelectBsJpsiKKEvent)
 
    MUON2_SelectBplJpsiKplEvent = DerivationFramework__xAODStringSkimmingTool(name = "MUON2_SelectBplJpsiKplEvent",
                                                                     expression = "count(BpmJpsiKpmCandidates.passed_Bplus>0) > 0")
    ToolSvc += MUON2_SelectBplJpsiKplEvent
-   print      MUON2_SelectBplJpsiKplEvent
+   printfunc (     MUON2_SelectBplJpsiKplEvent)
 
    MUON2_SelectBplJpsiKplEventBc = DerivationFramework__xAODStringSkimmingTool(name = "MUON2_SelectBplJpsiKplEventBc",
                                                                     expression = "count(BpmJpsiKpmCandidates.passed_Bc>0) > 0")
    ToolSvc += MUON2_SelectBplJpsiKplEventBc
-   print      MUON2_SelectBplJpsiKplEventBc
+   printfunc (     MUON2_SelectBplJpsiKplEventBc)
    
    #====================================================================
    # Make event selection based on an OR of the input skimming tools
@@ -272,7 +272,7 @@ if not isSimulation: #Only Skim Data
    MUON2SkimmingOR = CfgMgr.DerivationFramework__FilterCombinationOR("MUON2SkimmingOR",
                                                                      FilterList = [MUON2_SelectBsJpsiKKEvent, MUON2_SelectBplJpsiKplEvent, MUON2_SelectBplJpsiKplEventBc])
    ToolSvc += MUON2SkimmingOR
-   print      MUON2SkimmingOR
+   printfunc (     MUON2SkimmingOR)
 
 from DerivationFrameworkBPhys.DerivationFrameworkBPhysConf import DerivationFramework__Thin_vtxTrk
 MUON2_thinningTool_Tracks = DerivationFramework__Thin_vtxTrk(
@@ -322,7 +322,7 @@ ToolSvc+=MUON2ElectronTPThinningTool
 #====================================================================
 
 thiningCollection = [] 
-print thiningCollection
+printfunc (thiningCollection)
 
 from DerivationFrameworkJetEtMiss.JetCommon import *
 bphy5Seq = CfgMgr.AthSequencer("MUON2Sequence")

PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/share/MUON5.py

@@ -113,7 +113,7 @@ if is_MC:
 
     augmentationTools.append(MUON5BkgElectronClassificationTool)
 
-    print "BkgElectronClassificationTool: ", MUON5BkgElectronClassificationTool
+    printfunc ("BkgElectronClassificationTool: ", MUON5BkgElectronClassificationTool)
 
 #====================================================================
 # THINNING TOOLS

PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/share/MUON6.py

@@ -45,7 +45,7 @@ MUON6AugmentToolSel = DerivationFramework__dimuonTaggingTool(name = 'MUON6Augmen
 
 ToolSvc += MUON6AugmentToolSel
 MUON6AugmentTools.append(MUON6AugmentToolSel)
-print MUON6AugmentToolSel
+printfunc (MUON6AugmentToolSel)
 
 # Isolation decorations
 from DerivationFrameworkMuons.TrackIsolationDecorator import MUON1IDTrackDecorator as MUON6AugmentToolIsoDecID
@@ -55,12 +55,12 @@ MUON6AugmentToolIsoDecID.SelectionFlagValue = 0
 
 ToolSvc += MUON6AugmentToolIsoDecID
 MUON6AugmentTools.append(MUON6AugmentToolIsoDecID)
-print MUON6AugmentToolIsoDecID
+printfunc (MUON6AugmentToolIsoDecID)
 
 from DerivationFrameworkMuons.TrackIsolationDecorator import MUON1MSTrackDecorator as MUON6AugmentToolIsoDecMS
 ToolSvc += MUON6AugmentToolIsoDecMS
 MUON6AugmentTools.append(MUON6AugmentToolIsoDecMS)
-print MUON6AugmentToolIsoDecMS
+printfunc (MUON6AugmentToolIsoDecMS)
 
 #====================================================================
 # SKIMMING