Merge branch 'muon_mt_migration' into 'master'

Reverting an unneeded change on the TGC RDO's

See merge request atlas/athena!27206

MuonSpectrometer/MuonCnv/MuonEventTPCnv/MuonEventTPCnv/MuonTrigCoinData/TgcCoinDataCnv_p3.h

@@ -26,7 +26,7 @@ class TgcCoinDataCnv_p3
 {
 public:
   //    TgcCoinDataCnv_p3() : m_coindataCnv(0) {}
- TgcCoinDataCnv_p3() : m_localPosCnv(0), m_errorMxCnv(0), m_numErrsPrinted(0) {}
+    TgcCoinDataCnv_p3() : m_localPosCnv(0), m_errorMxCnv(0) {}
 
     void persToTrans( const Muon::TgcCoinData_p3 *persObj,
         Muon::TgcCoinData    *transObj,
@@ -38,7 +38,7 @@ public:
  protected:        
     LocalPositionCnv_p1   *m_localPosCnv;
     ErrorMatrixCnv_p1     *m_errorMxCnv;
-    unsigned int          m_numErrsPrinted;
+
 };
 
 #endif 

MuonSpectrometer/MuonCnv/MuonEventTPCnv/src/MuonTrigCoinData/TgcCoinDataCnv_p3.cxx

@@ -123,8 +123,9 @@ transToPers( const Muon::TgcCoinData *transObj, Muon::TgcCoinData_p3 *persObj, M
   if (transObj->hasErrMat() )
   {
     if (! transObj->errMat().cols() || !transObj->errMat().rows()) {
-      if (m_numErrsPrinted<10) {
-        m_numErrsPrinted++;
+      static unsigned int numErrsPrinted=0;
+      if (numErrsPrinted<10) {
+        numErrsPrinted++;
         log << MSG::WARNING << "Have been given a TgcCoinData error matrix with size = ["
             <<transObj->errMat().rows()<<","<<transObj->errMat().cols()<<"]. Skipping writing of the matrix."<<endmsg;
       }