Skip to content
Snippets Groups Projects
Commit ed75b4f6 authored by Frank Winklmeier's avatar Frank Winklmeier
Browse files

Merge branch 'py3.HeavyIonRec-20200302' into 'master'

HeavyIonRec: Python 3 fixes

See merge request atlas/athena!30799
parents 6b7a6eaf 70ef11ce
No related branches found
No related tags found
No related merge requests found
# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
from __future__ import print_function
from HIJetRec.HIJetRecFlags import HIJetFlags
import AthenaCommon.SystemOfUnits as Units
from RecExConfig.RecFlags import rec
......@@ -7,7 +9,7 @@ from JetRec.JetRecFlags import jetFlags
def SetHIPMode() :
if not rec.doHIP() : return
print 'Setting HIJetRec in HIPMode'
print ('Setting HIJetRec in HIPMode')
HIJetFlags.HarmonicsForSubtraction.set_Value_and_Lock([])
HIJetFlags.ExtraFlowMoments.set_Value_and_Lock(False)
HIJetFlags.SeedPtMin.set_Value_and_Lock(8*Units.GeV)
......@@ -15,7 +17,7 @@ def SetHIPMode() :
HIJetFlags.TrackJetPtMin.set_Value_and_Lock(4*Units.GeV)
def SetDebugMode():
print 'Setting HIJetRec in DEBUG mode'
print ('Setting HIJetRec in DEBUG mode')
HIJetFlags.ExtraFlowMoments.set_Value_and_Lock(True)
HIJetFlags.RecoOutputPtMin.set_Value_and_Lock(8*Units.GeV)
HIJetFlags.WriteSeeds.set_Value_and_Lock(True)
......
......@@ -37,12 +37,12 @@ if jetFlags.useTruth():
inputcontent = objKeyStore['inputFile'].list()
for t in inputcontent :
if tname in t:
print 'Truth collection %s already exists, no need to rebuild it' % tname
printfunc ('Truth collection %s already exists, no need to rebuild it' % tname)
collExists=True
break
if collExists: continue
f=jtm.addJetFinder(tname,"AntiKt", R,"truth", ptmin= HIJetFlags.TruthJetPtMin())
print 'Adding %s' %tname
printfunc ('Adding %s' %tname)
AddToOutputList(tname)
jtm.HIJetRecs+=[f]
......@@ -151,9 +151,9 @@ if HIJetFlags.DoHIBTagging():
jetname.JetModifiers += [ btagger ]
jetname.lock()
if BTaggingFlags.OutputLevel < 3:
print ConfInstance.getJetCollectionTool(jet[:-4])
printfunc (ConfInstance.getJetCollectionTool(jet[:-4]))
except AttributeError as error:
print '#BTAG# --> ' + str(error)
printfunc ('#BTAG# --> ' + str(error))
NotInJetToolManager.append(AuthorSubString[i])
if len(NotInJetToolManager) > 0:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment