Merge branch 'bkerridg_afpedmchange' into 'main'

Adjust AFPTrack to set nHoles to be unsigned int to avoid conflict

See merge request !71402

Event/xAOD/xAODForward/Root/AFPTrack_v1.cxx

@@ -28,7 +28,7 @@ namespace xAOD
   AUXSTORE_PRIMITIVE_SETTER_AND_GETTER (AFPTrack_v1, float, xSlope, setXSlope)
   AUXSTORE_PRIMITIVE_SETTER_AND_GETTER (AFPTrack_v1, float, ySlope, setYSlope)
   // AUXSTORE_PRIMITIVE_SETTER_AND_GETTER (AFPTrack_v1,  float, zSlope, setZSlope)
-  AUXSTORE_PRIMITIVE_SETTER_AND_GETTER (AFPTrack_v1, int, nHoles, setNHoles)
+  AUXSTORE_PRIMITIVE_SETTER_AND_GETTER (AFPTrack_v1, unsigned int, nHoles, setNHoles)
   AUXSTORE_PRIMITIVE_SETTER_AND_GETTER (AFPTrack_v1, int, nHits, setNHits)
   AUXSTORE_PRIMITIVE_SETTER_AND_GETTER (AFPTrack_v1, float, chi2, setChi2)
   AUXSTORE_PRIMITIVE_SETTER_AND_GETTER (AFPTrack_v1, int, algID, setAlgID)

Event/xAOD/xAODForward/Root/AFPTrack_v2.cxx

@@ -27,7 +27,7 @@ namespace xAOD
   AUXSTORE_PRIMITIVE_SETTER_AND_GETTER (AFPTrack_v2, float, zLocal, setZLocal)
   AUXSTORE_PRIMITIVE_SETTER_AND_GETTER (AFPTrack_v2, float, xSlope, setXSlope)
   AUXSTORE_PRIMITIVE_SETTER_AND_GETTER (AFPTrack_v2, float, ySlope, setYSlope)
-  AUXSTORE_PRIMITIVE_SETTER_AND_GETTER (AFPTrack_v2, int, nHoles, setNHoles)
+  AUXSTORE_PRIMITIVE_SETTER_AND_GETTER (AFPTrack_v2, unsigned int, nHoles, setNHoles)
   AUXSTORE_PRIMITIVE_SETTER_AND_GETTER (AFPTrack_v2, int, nClusters, setNClusters)
   AUXSTORE_PRIMITIVE_SETTER_AND_GETTER (AFPTrack_v2, float, chi2, setChi2)
   AUXSTORE_PRIMITIVE_SETTER_AND_GETTER (AFPTrack_v2, int, algID, setAlgID)

Event/xAOD/xAODForward/xAODForward/versions/AFPTrackAuxContainer_v1.h

@@ -44,7 +44,7 @@ namespace xAOD {
     std::vector< float > xSlope;
     std::vector< float > ySlope;
     // float zSlope() const;
-    std::vector< int > nHoles;
+    std::vector< unsigned int > nHoles;
     std::vector< int > nHits;
     std::vector< std::vector<AFPTrack_v1::AFPHitLink_t> > hits;
     std::vector< float > chi2;

Event/xAOD/xAODForward/xAODForward/versions/AFPTrackAuxContainer_v2.h

@@ -43,7 +43,7 @@ namespace xAOD {
     std::vector< float > zLocal;
     std::vector< float > xSlope;
     std::vector< float > ySlope;
-    std::vector< int > nHoles;
+    std::vector< unsigned int > nHoles;
     std::vector< int > nClusters;
     std::vector< std::vector<AFPTrack_v2::AFPClusterLink_t> > clusters;
     std::vector< float > chi2;

Event/xAOD/xAODForward/xAODForward/versions/AFPTrack_v1.h

@@ -159,7 +159,7 @@ namespace xAOD {
      *
      * @return Number of empty pixels that the track passes through
      */
-    int nHoles() const;
+    unsigned int nHoles() const;
 
 
     /** 
@@ -169,7 +169,7 @@ namespace xAOD {
      *
      * @param nHoles number of empty pixels that the track passes through
      */
-    void setNHoles (int nHoles);
+    void setNHoles (unsigned int nHoles);
 
 
     /** 

Event/xAOD/xAODForward/xAODForward/versions/AFPTrack_v2.h

@@ -155,7 +155,7 @@ namespace xAOD {
      *
      * @return Number of empty pixels that the track passes through
      */
-    int nHoles() const;
+    unsigned int nHoles() const;
 
     /** 
      * @brief Set number of empty pixels that the track passes through.
@@ -164,7 +164,7 @@ namespace xAOD {
      *
      * @param nHoles number of empty pixels that the track passes through
      */
-    void setNHoles (int nHoles);
+    void setNHoles (unsigned int nHoles);
 
     /** 
      * @brief Number of clusters used to reconstruct the track.