Merge branch 'reset_Cache' into 'master'

add resetCache() to reset the cache for Neutral/Track Particle like the Vertex

See merge request atlas/athena!20970

Event/xAOD/xAODTracking/Root/NeutralParticle_v1.cxx

@@ -212,6 +212,7 @@ namespace xAOD {
   }
 #endif // not XAOD_STANDALONE and not XAOD_MANACORE
 
-  // AUXSTORE_OBJECT_SETTER_AND_GETTER(NeutralParticle_v1, ElementLink< VertexContainer >, vertex, setVertex)
-
+  void NeutralParticle_v1::resetCache(){
+     m_perigeeParameters.reset();
+   }
 } // namespace xAOD

Event/xAOD/xAODTracking/Root/TrackParticle_v1.cxx

@@ -507,8 +507,12 @@ namespace xAOD {
       }
 
       return *( acc( *this ) );
-   }
-   
+   } 
 #endif // not XAOD_STANDALONE and not XAOD_MANACORE
+   
+   void TrackParticle_v1::resetCache(){
+     m_perigeeParameters.reset();
+   }
 
+ 
 } // namespace xAOD

Event/xAOD/xAODTracking/xAODTracking/selection.xml

@@ -31,7 +31,12 @@
   <class name="xAOD::TrackParticle_v1">
          <field name="m_perigeeParameters" transient="true"/>
   </class>
-
+  <read sourceClass="xAOD::TrackParticle_v1" version="[1-]"
+        targetClass="xAOD::TrackParticle_v1" source="" target="" >
+    <![CDATA[
+       newObj->resetCache();
+    ]]> 
+  </read>
   <class name="xAOD::TrackParticleAuxContainer_v1"
          id="C3B01EA0-CA87-4C96-967F-E0F9A75BD370"/>
   <class name="xAOD::TrackParticleContainer_v1"
@@ -74,7 +79,12 @@
   <class name="xAOD::NeutralParticle_v1">
          <field name="m_perigeeParameters" transient="true"/>
   </class>
-  
+  <read sourceClass="xAOD::NeutralParticle_v1" version="[1-]"
+        targetClass="xAOD::NeutralParticle_v1" source="" target="" >
+    <![CDATA[
+       newObj->resetCache();
+    ]]> 
+  </read>
   <class name="xAOD::NeutralParticleAuxContainer_v1"
          id="006862BC-5CEB-11E3-9FB4-02163E00A92F"/>
   <class name="xAOD::NeutralParticleContainer_v1"

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

@@ -134,12 +134,10 @@ namespace xAOD {
       const Trk::NeutralPerigee& perigeeParameters() const;
 #endif // not XAOD_STANDALONE and not XAOD_MANACORE
 
-      // /// @brief Returns a link (which can be invalid) to the xAOD::Vertex associated with this NeutralParticle.
-      // const ElementLink< VertexContainer >& vertex() const;
-      // /// @brief Set the link to the vertex
-      //  void setVertex(const ElementLink< VertexContainer >& vertex);
-
-    private:
+      /// Reset the internal cache of the object
+      void resetCache();
+ 
+  private:
 #if ( ! defined(XAOD_STANDALONE) ) && ( ! defined(XAOD_MANACORE) ) && ( ! defined(__GCCXML__) ) && !defined(__CLING__)
       /// @brief Cached NeutralPerigee, built from this object.
       /// @note This is only available in Athena.

Event/xAOD/xAODTracking/xAODTracking/versions/TrackParticle_v1.h

@@ -316,7 +316,11 @@ namespace xAOD {
 #endif // not XAOD_STANDALONE and not XAOD_MANACORE
         
       /// @}
-    private:
+
+      /// Reset the internal cache of the object
+      void resetCache();
+ 
+private:
 
 #if ( ! defined(XAOD_STANDALONE) ) && ( ! defined(XAOD_MANACORE) ) && ( ! defined(__GCCXML__) )  && !defined(__CLING__)
       /// @brief Cached MeasuredPerigee, built from this object.