Merge pull request #283 from sy-c/master

v2.26.1

Author: sy-c

doc/releaseNotes.md

@@ -639,3 +639,6 @@ This file describes the main feature changes for each readout.exe released versi
 ## v2.26.0 - 26/07/2024
 - Error reporting: fatal error messages logged to operator when there is a state transition error. The first error (if any) that happened is added to the message.
   This covers the cases of (among many others): wrong CRU fw version, inconsistent first orbits, no links enabled.
+
+## v2.26.1 - 20/08/2024
+- Fixed missing details in "invalid RDH" log messages.

src/ReadoutEquipment.cxx

@@ -953,12 +953,12 @@ int ReadoutEquipment::processRdh(DataBlockContainerReference& block)
           printf("\n");
           printf("Page 0x%p + %ld\n%s\n", (void*)baseAddress, pageOffset, errorDescription.c_str());
           h.dumpRdh(pageOffset, 1);
-          errorDescription.clear();
         }
         statsRdhCheckErr++;
 	isPageError = 1;
         theLog.log(logRdhErrorsToken, "Equipment %d RDH %d @ 0x%X : invalid RDH: %s", id, rdhIndexInPage, (unsigned int)pageOffset, errorDescription.c_str());
         // stop on first RDH error (should distinguich valid/invalid block length)
+	errorDescription.clear();
         break;
       } else {
         statsRdhCheckOk++;

src/ReadoutVersion.h

@@ -9,5 +9,5 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#define READOUT_VERSION "2.26.0"
+#define READOUT_VERSION "2.26.1"