dev:ctpcfg

Author: lietava

DataFormats/Detectors/CTP/include/DataFormatsCTP/Configuration.h

@@ -208,7 +208,7 @@ std::ostream& operator<<(std::ostream& in, const CTPConfiguration& conf);
 struct CtpCfg {
   CtpCfg() = default;
   std::string filename = "ctp.cfg";
-  CtpCfg readAndSave(std::string& path);
+  CtpCfg readAndSave(std::string& path, int& ret);
   uint32_t TFOrbits = 0;
   int ccdb = -1; // -1 means def constructor was called
   uint32_t orbitShift = 0;

DataFormats/Detectors/CTP/src/Configuration.cxx

@@ -1177,9 +1177,11 @@ int CTPInputsConfiguration::getInputIndexFromName(std::string& name)
   return 0xff;
 }
 
-CtpCfg CtpCfg::readAndSave(std::string& path)
+CtpCfg CtpCfg::readAndSave(std::string& path, int& ret)
 {
-  std::ifstream ctpcfg(path + filename);
+  ret = 0;
+  std::string file = path + filename;
+  std::ifstream ctpcfg(file);
   if (ctpcfg.is_open()) {
     std::string line;
     while (std::getline(ctpcfg, line)) {
@@ -1194,7 +1196,7 @@ CtpCfg CtpCfg::readAndSave(std::string& path)
       size_t ntokens = tokens.size();
       if (ntokens < 2) {
         LOG(warn) << "Not enough tokens";
-        return *this;
+        continue;
       }
       if (tokens[0].find("TForbits") != std::string::npos) {
         TFOrbits = std::atol(tokens[1].c_str());
@@ -1209,8 +1211,10 @@ CtpCfg CtpCfg::readAndSave(std::string& path)
         LOG(warn) << " Token not found:" << tokens[0];
       }
     }
+    LOG(warn) << "Open file success:" << file;
   } else {
-    LOG(warn) << "Can not open file:" << filename;
+    LOG(warn) << "Can not open file:" << file;
+    ret = 1;
   }
   return *this;
 }

Detectors/CTP/workflowScalers/src/RunManager.cxx

@@ -123,8 +123,9 @@ int CTPRunManager::loadRun(const std::string& cfg)
   //
   mRunsLoaded[runnumber] = activerun;
   saveRunConfigToCCDB(&activerun->cfg, timeStamp);
-  if (mCtpCfgDir != "none")
+  if (mCtpCfgDir != "none") {
     saveCtpCfg(runnumber, timeStamp);
+  }
   return 0;
 }
 int CTPRunManager::setRunConfigBK(uint32_t runNumber, const std::string& cfg)
@@ -274,6 +275,9 @@ int CTPRunManager::processMessage(std::string& topic, const std::string& message
     }
     return ret;
   }
+  if(topic.find("rocnts") != std::string::npos) {
+    return 0;
+  }
   static int nerror = 0;
   if (topic.find("sox") != std::string::npos) {
     // get config

Detectors/CTP/workflowScalers/src/ctpCCDBManager.cxx

@@ -174,26 +174,29 @@ int ctpCCDBManager::saveCtpCfg(uint32_t runNumber, long timeStart)
     return 0;
   }
   CtpCfg ctpcfg;
-  ctpcfg.readAndSave(mCtpCfgDir);
-  using namespace std::chrono_literals;
-  std::chrono::seconds days3 = 259200s;
-  std::chrono::seconds min10 = 600s;
-  long time3days = std::chrono::duration_cast<std::chrono::milliseconds>(days3).count();
-  long time10min = std::chrono::duration_cast<std::chrono::milliseconds>(min10).count();
-  long tmin = timeStart - time10min;
-  long tmax = timeStart + time3days;
-  o2::ccdb::CcdbApi api;
-  map<string, string> metadata; // can be empty
-  metadata["runNumber"] = std::to_string(runNumber);
-  api.init(mCCDBHost.c_str()); // or http://localhost:8080 for a local installation
-  // store abitrary user object in strongly typed manner
-  int ret = api.storeAsTFileAny(&ctpcfg, mCCDBPathCtpCfg, metadata, tmin, tmax);
-  if (ret == 0) {
-    LOG(info) << "CtpCfg  saved in ccdb:" << mCCDBHost << " tmin:" << tmin << " tmax:" << tmax;
-  } else {
-    LOG(error) << "CtpCfg Problem writing to database ret:" << ret;
-  }
-  return 0;
+  int ret;
+  ctpcfg.readAndSave(mCtpCfgDir, ret);
+  if(ret == 0) {
+    using namespace std::chrono_literals;
+    std::chrono::seconds days3 = 259200s;
+    std::chrono::seconds min10 = 600s;
+    long time3days = std::chrono::duration_cast<std::chrono::milliseconds>(days3).count();
+    long time10min = std::chrono::duration_cast<std::chrono::milliseconds>(min10).count();
+    long tmin = timeStart - time10min;
+    long tmax = timeStart + time3days;
+    o2::ccdb::CcdbApi api;
+    map<string, string> metadata; // can be empty
+    metadata["runNumber"] = std::to_string(runNumber);
+    api.init(mCCDBHost.c_str()); // or http://localhost:8080 for a local installation
+    // store abitrary user object in strongly typed manner
+    ret = api.storeAsTFileAny(&ctpcfg, mCCDBPathCtpCfg, metadata, tmin, tmax);
+    if (ret == 0) {
+      LOG(info) << "CtpCfg  saved in ccdb:" << mCCDBHost << " tmin:" << tmin << " tmax:" << tmax;
+    } else {
+      LOG(error) << "CtpCfg Problem writing to database ret:" << ret;
+    }
+  } 
+  return ret;
 }
 CTPConfiguration ctpCCDBManager::getConfigFromCCDB(long timestamp, std::string run, bool& ok)
 {