Modified CCDB server configration in MFT condition

Author: syano0822

Detectors/ITSMFT/MFT/condition/macros/makeMFTCCDBEntryForDCS.C

@@ -22,13 +22,10 @@
 
 using DPID = o2::dcs::DataPointIdentifier;
 
-int makeMFTCCDBEntryForDCS(const std::string url = "http://ccdb-test.cern.ch:8080")
+int makeMFTCCDBEntryForDCS(std::string ccdb_path = o2::base::NameConf::getCCDBServer())
 {
 
-  //  std::string url(argv[0]);
-  // macro to populate CCDB for TOF with the configuration for DCS
   std::unordered_map<DPID, std::string> dpid2DataDesc;
-
   std::vector<std::string> aliases = {"MFT_PSU_ZONE/H[0..1]/D[0..4]/F[0..1]/Z[0..3]/Current/Analog",
                                       "MFT_PSU_ZONE/H[0..1]/D[0..4]/F[0..1]/Z[0..3]/Current/BackBias",
                                       "MFT_PSU_ZONE/H[0..1]/D[0..4]/F[0..1]/Z[0..3]/Current/Digital",
@@ -63,7 +60,7 @@ int makeMFTCCDBEntryForDCS(const std::string url = "http://ccdb-test.cern.ch:808
   }
 
   o2::ccdb::CcdbApi api;
-  api.init(url); // or http://localhost:8080 for a local installation
+  api.init(ccdb_path);
   std::map<std::string, std::string> md;
   long ts = std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now().time_since_epoch()).count();
   api.storeAsTFileAny(&dpid2DataDesc, "MFT/Config/DCSDPconfig", md, ts);

Detectors/ITSMFT/MFT/condition/macros/readMFTDCSentries.C

@@ -23,14 +23,14 @@
 #include <bitset>
 #endif
 
-void readMFTDCSentries(long ts = 9999999999000, const char* ccdb = "http://ccdb-test.cern.ch:8080")
+void readMFTDCSentries(long ts = 9999999999000, std::string ccdb_path = o2::base::NameConf::getCCDBServer())
 {
 
   o2::mft::DCSNameResolver namer;
   namer.init();
 
   o2::ccdb::CcdbApi api;
-  api.init(ccdb); // or http://ccdb-test.cern.ch:8080
+  api.init(ccdb_path); // or http://ccdb-test.cern.ch:8080
   std::map<std::string, std::string> metadata;
   if (ts == 9999999999000) {
     ts = std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now().time_since_epoch()).count();

Detectors/ITSMFT/MFT/condition/testWorkflow/MFTDCSDataProcessorSpec.h

@@ -57,22 +57,26 @@ class MFTDCSDataProcessor : public o2::framework::Task
   //________________________________________________________________
   void init(o2::framework::InitContext& ic) final
   {
+
+    // o2::conf::ConfigurableParam::updateFromString(ic.options().get<std::string>("configKeyValues"));
+
     std::vector<DPID> vect;
     mDPsUpdateInterval = ic.options().get<int64_t>("DPs-update-interval");
     if (mDPsUpdateInterval == 0) {
       LOG(error) << "MFT DPs update interval set to zero seconds --> changed to 60";
       mDPsUpdateInterval = 60;
     }
+
     bool useCCDBtoConfigure = ic.options().get<bool>("use-ccdb-to-configure");
 
     mStart = ic.options().get<int64_t>("tstart");
     mEnd = ic.options().get<int64_t>("tend");
 
     if (useCCDBtoConfigure) {
       LOG(info) << "Configuring via CCDB";
-      std::string ccdbpath = ic.options().get<std::string>("ccdb-path");
+
       auto& mgr = CcdbManager::instance();
-      mgr.setURL(ccdbpath);
+      mgr.setURL(o2::base::NameConf::getCCDBServer());
       CcdbApi api;
       api.init(mgr.getURL());
       long ts = std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now().time_since_epoch()).count();
@@ -219,11 +223,11 @@ DataProcessorSpec getMFTDCSDataProcessorSpec()
     outputs,
     AlgorithmSpec{adaptFromTask<o2::mft::MFTDCSDataProcessor>()},
     Options{
-      {"ccdb-path", VariantType::String, "http://localhost:8080", {"Path to CCDB"}},
       {"tstart", VariantType::Int64, -1ll, {"Start of validity timestamp"}},
       {"tend", VariantType::Int64, -1ll, {"End of validity timestamp"}},
       {"use-ccdb-to-configure", VariantType::Bool, false, {"Use CCDB to configure"}},
       {"use-verbose-mode", VariantType::Bool, false, {"Use verbose mode"}},
+      //{"configKeyValues", VariantType::String, "", {"Semicolon separated key=value strings"}},
       {"DPs-update-interval", VariantType::Int64, 600ll, {"Interval (in s) after which to update the DPs CCDB entry"}}}};
 }
 

Detectors/ITSMFT/MFT/condition/testWorkflow/mft-dcs-data-workflow.cxx

@@ -28,6 +28,9 @@ using namespace o2::framework;
 void customize(std::vector<o2::framework::ConfigParamSpec>& workflowOptions)
 {
   // option allowing to set parameters
+  std::vector<o2::framework::ConfigParamSpec> options{
+    {"configKeyValues", VariantType::String, "", {"Semicolon separated key=value strings"}}};
+  std::swap(workflowOptions, options);
 }
 
 // ------------------------------------------------------------------
@@ -37,6 +40,7 @@ void customize(std::vector<o2::framework::ConfigParamSpec>& workflowOptions)
 WorkflowSpec defineDataProcessing(ConfigContext const& configcontext)
 {
   WorkflowSpec specs;
+  o2::conf::ConfigurableParam::updateFromString(configcontext.options().get<std::string>("configKeyValues"));
   specs.emplace_back(getMFTDCSDataProcessorSpec());
   return specs;
 }