Merge pull request #404 from sy-c/master

crorc-id support

Author: sy-c

doc/releaseNotes.md

@@ -29,3 +29,6 @@ This file describes the main feature changes for released versions of ReadoutCar
 - Added glitchCounter to roc-status (monitoring + JSON output).
 - Added DMA status (enabled / disabled) to roc-status (all output styles, including monitoring).
 - Added FEC counter per link to roc-status (stdout + JSON output).
+
+## next version
+- Added support for CRORC ID where missing: roc-status, roc-config JSON.

src/CardConfigurator.cxx

@@ -129,6 +129,7 @@ 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;
@@ -181,6 +182,9 @@ 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");
@@ -204,6 +208,7 @@ 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);

src/CommandLineUtilities/ProgramStatus.cxx

@@ -122,6 +122,7 @@ class ProgramStatus : public Program
       if (mOptions.monitoring) {
         monitoring->send(Metric{ "CRORC" }
                            .addValue(card.pciAddress.toString(), "pciAddress")
+                           .addValue(reportInfo.crorcId, "crorcId")
                            .addValue(reportInfo.qsfpEnabled, "qsfp")
                            .addValue(reportInfo.dynamicOffset, "dynamicOffset")
                            .addValue(reportInfo.timeFrameDetectionEnabled, "timeFrameDetection")
@@ -132,12 +133,14 @@ class ProgramStatus : public Program
       } else if (mOptions.jsonOut) {
         root.put("pciAddress", card.pciAddress.toString());
         root.put("serial", card.serialId.getSerial());
+        root.put("crocId", reportInfo.crorcId);
         root.put("qsfp", qsfpEnabled);
         root.put("offset", offset);
         root.put("timeFrameDetection", timeFrameDetectionEnabled);
         root.put("timeFrameLength", reportInfo.timeFrameLength);
       } else {
         std::cout << "-----------------------------" << std::endl;
+        std::cout << "CRORC ID: " << reportInfo.crorcId << std::endl;
         std::cout << "QSFP " << qsfpEnabled << std::endl;
         std::cout << offset << " offset" << std::endl;
         std::cout << "-----------------------------" << std::endl;