Merge branch 'cherry-pick-238bf73034-master' into 'master'

Sweeping !16564 from 21.0 to master.
Fix FastCaloSim Coverity issue 115466 (ATLASSIM-3684)

See merge request atlas/athena!16680

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;
+}