From 03649997b5b02ead6cd7edad86f57e2f9cf0dc07 Mon Sep 17 00:00:00 2001
From: John Kenneth Anders <john.kenneth.anders@cern.ch>
Date: Tue, 11 Dec 2018 23:14:57 +0000
Subject: [PATCH] Merge branch 'fcs/coverity-115466' into '21.0'

Fix FastCaloSim Coverity issue 115466 (ATLASSIM-3684)

See merge request atlas/athena!16564

(cherry picked from commit 238bf730348220e68c0799ce8e0706fb2325a2eb)

0b40a606 Fix FastCaloSim coverity issue 115466
---
 .../src/TFCSExtrapolationState.cxx            | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/src/TFCSExtrapolationState.cxx b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/src/TFCSExtrapolationState.cxx
index 679071913fa..61fd008a163 100644
--- a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/src/TFCSExtrapolationState.cxx
+++ b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/src/TFCSExtrapolationState.cxx
@@ -37,11 +37,18 @@ void TFCSExtrapolationState::clear()
       m_distetaCaloBorder[i][j]=0;
     }
   }
-  
-  m_IDCaloBoundary_eta=-999;
-  m_IDCaloBoundary_phi=-999;
-  m_IDCaloBoundary_r=0;
-  m_IDCaloBoundary_z=0;
-}
 
+  m_CaloSurface_sample = -1;
+  m_CaloSurface_eta = -999;
+  m_CaloSurface_phi = -999;
+  m_CaloSurface_r = 0;
+  m_CaloSurface_z = 0;
+
+  m_IDCaloBoundary_eta = -999;
+  m_IDCaloBoundary_phi = -999;
+  m_IDCaloBoundary_r = 0;
+  m_IDCaloBoundary_z = 0;
 
+  m_IDCaloBoundary_AngleEta = -999;
+  m_IDCaloBoundary_Angle3D = -999;
+}
-- 
GitLab