handling crorcId in config file

Author: sy-c

README.md

@@ -171,11 +171,11 @@ The `Data Source` parameter for the CRU DMA Channel should be used as follows:
 
 Card Configurator
 -------------------
-The `CardConfigurator` class offers an interface to configure the Readout Card (_currently only implemented for the CRU_). In
-order to configure the CRU one has to create a `CardConfigurator` object. The constructor can either be called with a list of
+The `CardConfigurator` class offers an interface to configure the Readout Card. In
+order to configure the CRU or CRORC, one has to create a `CardConfigurator` object. The constructor can either be called with a list of
 parameters, or a path to a configuration file, specifying these parameters.
 
-### Parameters
+### CRU Parameters
 
 The `CardConfigurator` utilizes the `Parameters` class, the same class where Parameters are specified for DMA channels. For the
 Card Configurator, the parameters need to be initialized for the card on BAR2. The command that
@@ -244,6 +244,11 @@ Likewise for `OnuAddress`, passing the int is enough.
 params.setOnuAddress(42)
 ```
 
+### CRORC Parameters
+
+The CRORC parameters which can be defined from configuration file are: `crorcId`, `dynamicOffset`, `timeframeLength`.
+
+
 ### Configuration File
 
 The string containing the path to the configuration file has to start with "file:", otherwise the

doc/releaseNotes.md

@@ -36,3 +36,6 @@ This file describes the main feature changes for released versions of ReadoutCar
 
 ## v0.42.1 - 06/03/2023
 - Fixed bug with roc-config JSON: crorc-id wrongly set in "cru" section. Now named crorcId and to be set under "crorc" section.
+
+## next version
+- Fix for crorId field in configuration file.

src/CardConfigurator.cxx

@@ -86,6 +86,7 @@ void CardConfigurator::parseConfigUriCrorc(std::string configUri, Parameters& pa
 {
   bool dynamicOffset = false;
   uint16_t timeFrameLength = 0x100;
+  uint16_t crorcId = 0x0;
 
   std::unique_ptr<o2::configuration::ConfigurationInterface> conf;
   try {
@@ -104,10 +105,13 @@ void CardConfigurator::parseConfigUriCrorc(std::string configUri, Parameters& pa
       if (group == "crorc") { // Configure the CRORC
         dynamicOffset = subtree.get<bool>("dynamicOffset");
         timeFrameLength = subtree.get<int>("timeFrameLength");
+        std::string parsedString = subtree.get<std::string>("crorcId");
+        crorcId = Hex::fromString(parsedString);
       }
 
       parameters.setDynamicOffsetEnabled(dynamicOffset);
       parameters.setTimeFrameLength(timeFrameLength);
+      parameters.setCrorcId(crorcId);
     }
   } catch (...) {
     BOOST_THROW_EXCEPTION(ParseException() << ErrorInfo::ConfigParse(group));
@@ -129,7 +133,6 @@ void CardConfigurator::parseConfigUriCru(std::string configUri, Parameters& para
   bool dynamicOffset = false;
   uint32_t onuAddress = 0x0;
   uint16_t cruId = 0x0;
-  uint16_t crorcId = 0x0;
   GbtMode::type gbtMode = GbtMode::type::Gbt;
   DownstreamData::type downstreamData = DownstreamData::type::Ctp;
   uint32_t triggerWindowSize = 1000;
@@ -213,14 +216,6 @@ 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");