Merge branch 'HI_adapt_ATLJETMET-1248' into 'master'

Accommodate the phase out of PseudoJetGetter (ATLJETMET-1248) in HIJetRec

See merge request atlas/athena!34139

Reconstruction/HeavyIonRec/HIJetRec/python/HIJetRecTools.py

@@ -8,10 +8,10 @@ import AthenaCommon.SystemOfUnits as Units
 #configuring getter tools
 #selection for track jets
 from InDetTrackSelectionTool.InDetTrackSelectionToolConf import InDet__InDetTrackSelectionTool
+from JetRec.JetRecConf import PseudoJetAlgorithm
 from JetRecTools.JetRecToolsConf import JetTrackSelectionTool
 from JetRecTools.JetRecToolsConf import SimpleJetTrackSelectionTool
 from JetRecTools.JetRecToolsConf import TrackVertexAssociationTool
-from JetRecTools.JetRecToolsConf import PseudoJetAlgorithm
 from JetMomentTools.JetMomentToolsConf import JetCaloQualityTool
 from JetMomentTools.JetMomentToolsConf import JetCaloCellQualityTool
 
@@ -45,9 +45,7 @@ if HIJetFlags.UseHITracks() :
                                 InputContainer = jtm.tracksel_HI.OutputContainer,
                                 Label = "Track",
                                 OutputContainer = "PseudoJetTracks_HI",
-                                TrackVertexAssociation = jtm.tvassoc_HI.TrackVertexAssociation,
-                                SkipNegativeEnergy = True,
-                                GhostScale = 0.0)
+                                SkipNegativeEnergy = True )
     #now for ghost tracks
     jtm += InDet__InDetTrackSelectionTool("trk_gtracksel_HI",
                                           minPt                = 400.*Units.MeV,
@@ -67,9 +65,7 @@ if HIJetFlags.UseHITracks() :
                                 InputContainer = jtm.gtracksel_HI.OutputContainer,
                                 Label = "GhostTrack",
                                 OutputContainer = "PseudoJetGhostTracks_HI_ghost",
-                                TrackVertexAssociation = jtm.tvassoc_HI.TrackVertexAssociation,
-                                SkipNegativeEnergy = True,
-                                GhostScale = 1e-20)
+                                SkipNegativeEnergy = True )
 
     jtm.jvf.unlock()
     jtm.jvf.TrackVertexAssociation=jtm.tvassoc_HI.TrackVertexAssociation
@@ -88,16 +84,14 @@ jtm += PseudoJetAlgorithm("get_HI",
                                 Label = "LCTopo", #Label = "Tower",
                                 OutputContainer = "PseudoJet" + ClusterKey,
                                 SkipNegativeEnergy = False,
-                                TreatNegativeEnergyAsGhost=True,
-                                GhostScale = 1.e-20
+                                TreatNegativeEnergyAsGhost=True
                                 )
 
 jtm += PseudoJetAlgorithm("gakt4trackget_HI",
                        InputContainer = HIJetFlags.TrackJetContainerName(),
                        Label = "Ghost" + HIJetFlags.TrackJetContainerName(),
                        SkipNegativeEnergy = True,
-                       OutputContainer = "PseudoJetGhost" +  HIJetFlags.TrackJetContainerName(),
-                       GhostScale = 1.e-20)
+                       OutputContainer = "PseudoJetGhost" +  HIJetFlags.TrackJetContainerName() )
 
 HIgetters_ghost_track = []
 HIgetters_common=[]

Reconstruction/HeavyIonRec/HIJetRec/python/HIJetRecUtils.py

@@ -273,14 +273,16 @@ def JetAlgFromTools(rtools, suffix="HI",persistify=True) :
         topsequence += JetAlgorithm("jetalgconstit"+suffix,
                                     Tools=[jtm.jetrunconstitHI])
 
-    #### test : add the PseudoJetAlgorithm
-    from JetRec.JetRecConf import PseudoJetAlgorithm
+    # Add the PseudoJetAlgorithm
+    # To avoid massive refactoring and to preserve familiarity,
+    # jet guys kept calling things "getters", but these are already
+    # PseudoJetAlgorithms as they eliminated the wrappers 
     for getter in jtm.allGetters:
-        print ('Adding PseudoJetAlgorithm for PseudoJetGetter %s' % getter.name)
+        print ('Adding PseudoJetAlgorithm %s' % getter.name)
         print ('Input Container %s' % getter.InputContainer)
         print ('Output Container %s' % getter.OutputContainer)
         print ('Label %s' % getter.Label)
-        topsequence += PseudoJetAlgorithm("pjalg_"+suffix+getter.Label,PJGetter=getter)
+        topsequence += getter
 
     runner=JetToolRunner("jetrun"+suffix,
                          Tools=rtools,