Compatibility and other fixes for FRED

* Program arguments take precedence over env variables
* 76-bit words for SWT operations
* Uppercase DIM Service names

Author: kostorr

apps/ProgramAlf.cxx

@@ -60,32 +60,32 @@ class ProgramAlf : public AliceO2::Common::Program
 
     getLogger() << "ALF server initializations..." << endm;
 
-    if (const char* dimDnsNode = std::getenv("DIM_DNS_NODE")) {
+    if (mOptions.dimDnsNode != "") {
+      getLogger() << "Setting DIM_DNS_NODE from argument." << endm;
+      getLogger() << "DIM_DNS_NODE=" << mOptions.dimDnsNode << endm;
+    } else if (const char* dimDnsNode = std::getenv("DIM_DNS_NODE")) {
       getLogger() << "Picked up DIM_DMS_NODE from the environment." << endm;
       getLogger() << "DIM_DNS_NODE=" << dimDnsNode << endm;
-    } else if (mOptions.dimDnsNode != "") {
-      getLogger() << "DIM_DNS_NODE env variable not set. Setting it from argument." << endm;
-      setenv("DIM_DNS_NODE", mOptions.dimDnsNode.c_str(), 1); // Don't be afraid to overwrite since we ended up here
-      getLogger() << "DIM_DNS_NODE=" << std::getenv("DIM_DNS_NODE") << endm;
+      mOptions.dimDnsNode = dimDnsNode;
     } else {
       BOOST_THROW_EXCEPTION(AlfException() << ErrorInfo::Message("DIM_DNS_NODE env variable not set, and no relevant argument provided.")); // InfoLogger and errors?
     }
 
     int alfId;
 
     if (const char* alfIdString = std::getenv("ALF_ID")) {
+      getLogger() << "Setting ALF_ID from argument." << endm;
+      alfId = mOptions.alfId;
+      getLogger() << "ALF_ID=" << alfId << endm;
+    } else {
       getLogger() << "Picked up ALF_ID from the environment." << endm;
       getLogger() << "ALF_ID=" << alfIdString << endm;
       alfId = atoi(alfIdString);
-    } else {
-      getLogger() << "ALF_ID env variable not set. Setting it from argument." << endm;
-      alfId = mOptions.alfId;
-      getLogger() << "ALF_ID=" << alfId << endm;
-      /* Do I need to set the env var for ALF_ID? */
     }
 
+
     getLogger() << "Starting the DIM Server" << endm;
-    DimServer::setDnsNode("localhost", 2505);
+    DimServer::setDnsNode(mOptions.dimDnsNode.c_str(), 2505);
     DimServer::start(alfId == -1 ? "ALF" : ("ALF" + std::to_string(alfId)).c_str());
 
     AlfServer alfServer = AlfServer();

src/AlfServer.cxx

@@ -112,7 +112,7 @@ Sca::CommandData AlfServer::stringToScaPair(std::string stringPair)
   return commandData;
 }
 
-/// Converts a 96-bit hex number string
+/// Converts a 76-bit hex number string
 std::pair<SwtWord, Swt::Operation> AlfServer::stringToSwtPair(const std::string stringPair)
 {
   std::vector<std::string> swtPair = Util::split(stringPair, pairSeparator());
@@ -129,17 +129,17 @@ std::pair<SwtWord, Swt::Operation> AlfServer::stringToSwtPair(const std::string
     hexString.erase(i, leadingHex.size());
   }
 
-  if (hexString.length() > 20) {
-    BOOST_THROW_EXCEPTION(std::out_of_range("Parameter does not fit in 96-bit unsigned int"));
+  if (hexString.length() > 19) {
+    BOOST_THROW_EXCEPTION(std::out_of_range("Parameter does not fit in 76-bit unsigned int"));
   }
 
   std::stringstream ss;
-  ss << std::setw(20) << std::setfill('0') << hexString;
+  ss << std::setw(19) << std::setfill('0') << hexString;
 
   SwtWord word;
-  word.setHigh(std::stoul(ss.str().substr(0, 4), NULL, 16));
-  word.setMed(std::stoul(ss.str().substr(4, 8), NULL, 16));
-  word.setLow(std::stoul(ss.str().substr(12, 8), NULL, 16));
+  word.setHigh(std::stoul(ss.str().substr(0, 3), NULL, 16));
+  word.setMed(std::stoul(ss.str().substr(3, 8), NULL, 16));
+  word.setLow(std::stoul(ss.str().substr(11, 8), NULL, 16));
 
   Swt::Operation operation;
 

src/DimServices/ServiceNames.cxx

@@ -38,9 +38,9 @@ DEFSERVICENAME(icGbtI2cWrite, "IC_GBT_I2C_write")
 std::string ServiceNames::format(std::string name) const
 {
   if (mAlfId != "-1")
-    return ((boost::format("ALF%1%/serial_%2%/link_%3%/%4%") % mAlfId % mSerial % mLink % name)).str();
+    return ((boost::format("ALF%1%/SERIAL_%2%/LINK_%3%/%4%") % mAlfId % mSerial % mLink % name)).str();
   else
-    return ((boost::format("ALF/serial_%1%/link_%2%/%3%") % mSerial % mLink % name)).str();
+    return ((boost::format("ALF/SERIAL_%1%/LINK_%2%/%3%") % mSerial % mLink % name)).str();
 }
 
 } // namespace Alf

src/Swt/SwtWord.cxx

@@ -95,7 +95,7 @@ uint16_t SwtWord::getHigh() const
 
 std::ostream& operator<<(std::ostream& output, const SwtWord& swtWord)
 {
-  output << "0x" << std::setfill('0') << std::hex << std::setw(4) << swtWord.getHigh()
+  output << "0x" << std::setfill('0') << std::hex << std::setw(3) << swtWord.getHigh()
          << std::setfill('0') << std::setw(8) << swtWord.getMed() << std::setfill('0') << std::setw(8) << swtWord.getLow();
   return output;
 }