MuTagMatchingTool - Add explicit geometry dependence & resolve FPE

Hi @rlangenb,

while I tried to track down the FPE reported in ATLASRECTS-6139, I noticed that the MuTagMatchingTool locally retrieves the tracking geometry. Following the recipe for the other muon tools, I added the tracking geometry in this tool as well. I do not know which MR goes in first (this one or !42105 (merged)). In any case, I wanted to inform you that there is a new official geometry client.

The FPE reported in the ticket has been resolved.

Cheers, Johannes

Reconstruction/MuonIdentification/MuonSegmentTaggers/MuonSegmentTaggerTools/src/MuTagMatchingTool.cxx

@@ -24,7 +24,6 @@
 #include "TrkParameters/TrackParameters.h"
 #include "TrkSurfaces/Surface.h"
 #include "TrkTrack/Track.h"
-#include  "FourMomUtils/xAODP4Helpers.h"
 
 
 MuTagMatchingTool::MuTagMatchingTool(const std::string& t, const std::string& n, const IInterface* p)
@@ -358,11 +357,9 @@ MuTagMatchingTool::phiMatch(const Trk::TrackParameters* atSurface, const Muon::M
         } else
             ATH_MSG_DEBUG(" track not extrapolated to a disc ");
     }
-
+    if (std::abs(cosphi) > 1.) return false;
     double errPhi = std::hypot(PHI_CUT, sigma_phi);
-
     // if the difference between exTrk and Segment phi position falls within the errPhi, accept as rough match
-    //  if( std::acos(cosphi) < errPhi ) return true;
     if (std::acos(std::abs(cosphi)) < errPhi)
         return true;  // BRes: TEMPORARY - segment direction not sure, so I'm making this match symmetric wrt Pi/2
     //  else ATH_MSG_DEBUG( std::setw(30) << "roughPhi failed:  d_phi = " << std::setw(10) << std::acos(cosphi)