Merge pull request #273 from sy-c/master

v2.21.9

Author: sy-c

doc/releaseNotes.md

@@ -606,3 +606,6 @@ This file describes the main feature changes for each readout.exe released versi
 
 ## v2.21.8 - 29/11/2023
 - Fixed spurious readout warning("TF non-contiguous ordering") when doing Start/Stop/Start with DD is enabled.
+
+## v2.21.9 - 06/12/2023
+- When equipment-*-rdhCheckFirstOrbit is set (default), the run is stopped if the first RDH received for an equipment does not passes validation, as in the case when first orbits mismatch.

src/ReadoutEquipment.cxx

@@ -438,6 +438,17 @@ Thread::CallbackResult ReadoutEquipment::threadCallback(void* arg)
 	}
         updatePageStateFromDataBlockContainerReference(nextBlock, MemoryPage::PageState::InEquipment);
 
+        // here some test code to artifically corrupt RDH of block X of equipment id Y
+	// used to test error conditions, eg first RDH received is wrong
+        /*
+	int X=1;
+	int Y=33;
+        if ((ptr->currentBlockId==X)&&(ptr->id==Y)) {
+	  o2::Header::RAWDataHeader* h = (o2::Header::RAWDataHeader*) nextBlock->getData()->data;
+	  h->version=99;
+	}
+        */
+
 	// handle RDH-formatted data
 	if (ptr->cfgRdhUseFirstInPageEnabled) {
           if ((ptr->processRdh(nextBlock)) && ptr->cfgDropPagesWithError) {
@@ -852,6 +863,12 @@ int ReadoutEquipment::processRdh(DataBlockContainerReference& block)
 
     if (tagDatablockFromRdh(h, blockHeader) == 0) {
       blockHeader.isRdhFormat = 1;
+    } else {
+      if ((cfgRdhCheckFirstOrbit) && (currentBlockId == 0)) {
+        // if 1st RDH received is wrong, it's the same as a wrong orbit
+        theLog.log(LogErrorSupport_(3241), "Equipment %s : first RDH is wrong", name.c_str());
+        isFatalError++;
+      }
     }
 
     if (cfgRdhDumpFirstInPageEnabled) {

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.21.8"
+#define READOUT_VERSION "2.21.9"