From 77a285def2ebef9b2307f7a38cac0c27fb33a40a Mon Sep 17 00:00:00 2001
From: Hass AbouZeid <hass.abouzeid@cern.ch>
Date: Mon, 22 May 2017 11:00:10 +0000
Subject: [PATCH] Merge branch 'ATLASRECTS-4005_SAfix' into '21.0'

Fix for extremely rare bug in muon extrapolation

See merge request !1902
---
 .../MuidTrackBuilder/src/CombinedMuonTrackBuilder.cxx         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Reconstruction/MuonIdentification/MuidTrackBuilder/src/CombinedMuonTrackBuilder.cxx b/Reconstruction/MuonIdentification/MuidTrackBuilder/src/CombinedMuonTrackBuilder.cxx
index 04ee7eb24b61..34324a7f4387 100755
--- a/Reconstruction/MuonIdentification/MuidTrackBuilder/src/CombinedMuonTrackBuilder.cxx
+++ b/Reconstruction/MuonIdentification/MuidTrackBuilder/src/CombinedMuonTrackBuilder.cxx
@@ -1599,9 +1599,9 @@ CombinedMuonTrackBuilder::standaloneFit	(const Trk::Track&	inputSpectrometerTrac
                 break;
               }
             }
-            if ((**s).trackParameters()
+            if (s != prefit->trackStateOnSurfaces()->end()
 		&& s != prefit->trackStateOnSurfaces()->begin()
-		&& s != prefit->trackStateOnSurfaces()->end())
+		&& (**s).trackParameters())
 	    {
 		parameters	= (**s).trackParameters()->clone();
 		caloParameters	= parameters;
-- 
GitLab