Change defining Parameter interface for NeutralParticle to be the same as...

Change defining Parameter interface for NeutralParticle to be the same as TrackParticle, cleaner and MT compatible

Event/xAOD/xAODTracking/Root/NeutralParticle_v1.cxx

@@ -109,8 +109,8 @@ namespace xAOD {
   AUXSTORE_PRIMITIVE_GETTER(NeutralParticle_v1, float, theta)
   AUXSTORE_PRIMITIVE_GETTER(NeutralParticle_v1, float, oneOverP)
 
-  const DefiningParameters_t& NeutralParticle_v1::definingParameters() const{
-      static DefiningParameters_t tmp;
+  const DefiningParameters_t NeutralParticle_v1::definingParameters() const{
+      DefiningParameters_t tmp;
       tmp << d0(),z0(),phi0(),theta(),oneOverP();
       return tmp;
   }
@@ -154,11 +154,12 @@ namespace xAOD {
             v.push_back(cov(icol,irow));
   }
 
-  const xAOD::ParametersCovMatrix_t& NeutralParticle_v1::definingParametersCovMatrix() const {
+  const xAOD::ParametersCovMatrix_t NeutralParticle_v1::definingParametersCovMatrix() const {
     static const Accessor< std::vector<float> > acc( "definingParametersCovMatrix" );
     std::vector<float> v = acc(*this);
     std::vector<float>::const_iterator it = v.begin();
-    static xAOD::ParametersCovMatrix_t cov; cov.setZero();
+    xAOD::ParametersCovMatrix_t cov; 
+    cov.setZero();
     for (size_t irow = 0; irow<5; ++irow)
         for (size_t icol =0; icol<=irow; ++icol)
             cov.fillSymmetric(icol,irow, *it++);

Event/xAOD/xAODTracking/xAODTracking/versions/NeutralParticle_v1.h

@@ -100,9 +100,9 @@ namespace xAOD {
       /// @brief Returns a SVector of the Perigee track parameters. 
       /// i.e. a vector of
       ///  \f$\left(\begin{array}{c}d_0\\z_0\\\phi_0\\\theta\\q/p\end{array}\right)\f$
-      const DefiningParameters_t& definingParameters() const;
+      const DefiningParameters_t definingParameters() const;
       /// Returns the 5x5 symmetric matrix containing the defining parameters covariance matrix.
-      const ParametersCovMatrix_t& definingParametersCovMatrix() const;  
+      const ParametersCovMatrix_t definingParametersCovMatrix() const;  
       /// Returns the vector of the covariance values - 15 elements
       const std::vector<float>& definingParametersCovMatrixVec() const;