Merge pull request #406 from sy-c/master

v0.42.1

Author: sy-c

doc/releaseNotes.md

@@ -33,3 +33,6 @@ This file describes the main feature changes for released versions of ReadoutCar
 ## v0.42.0 - 01/03/2023
 - Added support for CRORC ID where missing: roc-status, roc-config JSON.
 - Added FEC counter per link to roc-status (monitoring).
+
+## v0.42.1
+- Fixed bug with roc-config JSON: crorc-id wrongly set in "cru" section. Now named crorcId and to be set under "crorc" section.

src/CardConfigurator.cxx

@@ -182,9 +182,6 @@ void CardConfigurator::parseConfigUriCru(std::string configUri, Parameters& para
         parsedString = subtree.get<std::string>("cruId");
         cruId = Hex::fromString(parsedString);
 
-        parsedString = subtree.get<std::string>("crorc-id");
-        crorcId = Hex::fromString(parsedString);
-
         allowRejection = subtree.get<bool>("allowRejection");
 
         triggerWindowSize = subtree.get<int>("triggerWindowSize");
@@ -208,7 +205,6 @@ void CardConfigurator::parseConfigUriCru(std::string configUri, Parameters& para
         parameters.setDynamicOffsetEnabled(dynamicOffset);
         parameters.setOnuAddress(onuAddress);
         parameters.setCruId(cruId);
-        parameters.setCrorcId(crorcId);
         parameters.setAllowRejection(allowRejection);
         parameters.setTriggerWindowSize(triggerWindowSize);
         parameters.setGbtEnabled(gbtEnabled);
@@ -217,6 +213,14 @@ void CardConfigurator::parseConfigUriCru(std::string configUri, Parameters& para
         parameters.setUserAndCommonLogicEnabled(userAndCommonLogicEnabled);
         parameters.setSystemId(systemId);
         parameters.setTimeFrameLength(timeFrameLength);
+
+      } else if (group == "crorc") {
+
+        parsedString = subtree.get<std::string>("crorcId");
+        crorcId = Hex::fromString(parsedString);
+
+        parameters.setCrorcId(crorcId);
+
       } else if (group == "links") { // Configure all links with default values
 
         enabled = subtree.get<bool>("enabled");

src/ReadoutCardVersion.cxx

@@ -11,7 +11,7 @@
 
 #include "ReadoutCard/Version.h"
 
-#define O2_READOUTCARD_VERSION "0.42.0"
+#define O2_READOUTCARD_VERSION "0.42.1"
 
 namespace o2
 {