Merge branch 'FIXFlags' into 'master'

fix print for python 3

See merge request atlas/athena!34095

Reconstruction/HeavyIonRec/HIJetRec/share/HIJetRec_jobOptions.py

@@ -108,12 +108,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
+                    print("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
+        print("Adding %s" %tname)
         AddToOutputList(tname)
         #jtm.HIJetRecs+=[f]
 
@@ -143,13 +143,13 @@ modulator0=iter0.Modulator
 subtr1=MakeSubtractionTool(iter0.OutputEventShapeKey,modulator=modulator0)
 
 #now iterate
-print 'Now moving to iteration 1'
+print("Now moving to iteration 1")
 
 seeds1=jtm.addJetCopier("%s_%s1" % (seed_prefix,HIJetFlags.SeedSuffix()),"%s_Unsubtracted" % seed_prefix,[subtr1,jtm.HICalibMap[seed_prefix],jtm.jetfilHISeeds],shallow=False)
 jtm.HIJetRecs+=[seeds1]
 iteration_dict=dict(suffix="iter1")
 if jetFlags.useTracks() and HIJetFlags.TrackJetSeeds() : iteration_dict['track_jet_seeds']=HIJetFlags.TrackJetContainerName()
-print 'Adding iteration 1'
+print("Adding iteration 1")
 iter1=AddIteration(seed_container=seeds1.OutputContainer,shape_name=EventShapeKey,**iteration_dict)
 
 HIJetFlags.IteratedEventShapeKey=iter1.OutputEventShapeKey
@@ -243,9 +243,9 @@ if HIJetFlags.DoHIBTagging():
             jetname.JetModifiers += [ btagger ]
             jetname.lock()
             if BTaggingFlags.OutputLevel < 3:
-              print ConfInstance.getJetCollectionTool(jet[:-4])
+              print(ConfInstance.getJetCollectionTool(jet[:-4]))
           except AttributeError as error:
-            print '#BTAG# --> ' + str(error)
+            print("#BTAG# --> " + str(error))
             NotInJetToolManager.append(AuthorSubString[i])
 
       if len(NotInJetToolManager) > 0:

Reconstruction/HeavyIonRec/HIRecExample/share/HIRec_jobOptions.py

@@ -3,7 +3,7 @@
 #--------------------------------
 include.block ('HIRecExample/HIRec_jobOptions.py')
 
-print 'IN HEAVY ION REC'
+print("IN HEAVY ION REC")
 
 # # General adjustments
 # topSequence.TimeOut=3600* Units.s
@@ -20,7 +20,7 @@ from HIRecExample.HIRecExampleFlags import jobproperties
 # include reconstruction algorithms
 # only in ESD step
 if rec.doESD:
-    print "Including HI algorithms in ESD step"
+    print("Including HI algorithms in ESD step")
     if jobproperties.HIRecExampleFlags.doHIGlobal:
         include( "HIGlobal/HIGlobal_jobOptions.py" )
 

Reconstruction/HeavyIonRec/HIRecExample/share/heavyion_flagsESD.py

@@ -13,7 +13,7 @@ rec.doDPD.set_Value_and_Lock(False)
 if not jobproperties.HIRecExampleFlags.ppMode :
 
    if rec.doESD :
-      print "Applying HI ESD flags mods"
+      print("Applying HI ESD flags mods")
 
       # AO general
       rec.Commissioning.set_Value_and_Lock(True)
@@ -51,7 +51,7 @@ if not jobproperties.HIRecExampleFlags.ppMode :
          jobproperties.egammaRecFlags.cellContainerName.set_On()
          jobproperties.egammaRecFlags.cellContainerName.set_Value_and_Lock("SubtractedCells")
 
-         print 'AO: CaloRecFlags doCaloCluster=False'
+         print("AO: CaloRecFlags doCaloCluster=False")
          jobproperties.CaloRecFlags.doCaloCluster=False  # not working?
          jobproperties.CaloRecFlags.doEmCluster=False
          #turning off TopoClusters
@@ -90,9 +90,9 @@ if not jobproperties.HIRecExampleFlags.ppMode :
       ptCutVal = 0.5
       if jobproperties.HIRecExampleFlags.ptCutOn():
          ptCutVal = jobproperties.HIRecExampleFlags.ptCut()
-         print "ptCutOn: Modify ptCutVal to ", ptCutVal," GeV"
+         print("ptCutOn: Modify ptCutVal to ", ptCutVal," GeV")
          if ( rec.triggerStream() == "HardProbes" ) or ( globalflags.DataSource == "geant4" ):
-            print "Modify ConfiguredNewTrackingCuts__minPT to ", ptCutVal," GeV"
+            print("Modify ConfiguredNewTrackingCuts__minPT to ", ptCutVal," GeV")
             from InDetRecExample.ConfiguredNewTrackingCuts import ConfiguredNewTrackingCuts
             InDetNewTrackingCuts      = ConfiguredNewTrackingCuts("HeavyIon")
             InDetNewTrackingCuts._ConfiguredNewTrackingCuts__minPT = ptCutVal * Units.GeV