Adpot to new Configuration

Author: awegrzyn

Framework/src/CcdbDatabase.cxx

@@ -43,7 +43,7 @@ void CcdbDatabase::connect(std::string host, std::string database, std::string u
 
 void CcdbDatabase::connect(std::unique_ptr<ConfigurationInterface>& config)
 {
-  mUrl = config->get<string>("qc/config/database/host").value();
+  mUrl = config->get<string>("qc/config/database/host");
   ccdbApi.init(mUrl);
 }
 
@@ -185,4 +185,4 @@ void CcdbDatabase::truncate(std::string taskName, std::string objectName)
 
 } // namespace repository
 } // namespace quality_control
-} // namespace o2
+} // namespace o2

Framework/src/Checker.cxx

@@ -66,7 +66,7 @@ void Checker::init(framework::InitContext&)
   try {
     std::unique_ptr<ConfigurationInterface> config = ConfigurationFactory::getConfiguration(mConfigurationSource);
     // configuration of the database
-    mDatabase = DatabaseFactory::create(config->get<std::string>("qc/config/database/implementation").value());
+    mDatabase = DatabaseFactory::create(config->get<std::string>("qc/config/database/implementation"));
     mDatabase->connect(config);
   } catch (
     std::string const& e) { // we have to catch here to print the exception because the device will make it disappear

Framework/src/MySqlDatabase.cxx

@@ -59,10 +59,10 @@ void MySqlDatabase::connect(std::string host, std::string database, std::string
 
 void MySqlDatabase::connect(std::unique_ptr<ConfigurationInterface>& config)
 {
-  this->connect(config->get<string>("qc/config/database/host").value(),
-                config->get<string>("qc/config/database/name").value(),
-                config->get<string>("qc/config/database/username").value(),
-                config->get<string>("qc/config/database/password").value());
+  this->connect(config->get<string>("qc/config/database/host"),
+                config->get<string>("qc/config/database/name"),
+                config->get<string>("qc/config/database/username"),
+                config->get<string>("qc/config/database/password"));
 }
 
 void MySqlDatabase::prepareTaskDataContainer(std::string taskName)

Framework/src/TaskRunner.cxx

@@ -142,25 +142,25 @@ void TaskRunner::populateConfig(std::string taskName)
 {
   try {
     std::string prefix = std::string("qc/tasks_config/");
-    std::string taskDefinitionName = mConfigFile->get<std::string>(prefix + taskName + "/taskDefinition").value();
+    std::string taskDefinitionName = mConfigFile->get<std::string>(prefix + taskName + "/taskDefinition");
 
     mTaskConfig.taskName = taskName;
-    mTaskConfig.moduleName = mConfigFile->get<std::string>(prefix + taskDefinitionName + "/moduleName").value();
-    mTaskConfig.className = mConfigFile->get<std::string>(prefix + taskDefinitionName + "/className").value();
+    mTaskConfig.moduleName = mConfigFile->get<std::string>(prefix + taskDefinitionName + "/moduleName");
+    mTaskConfig.className = mConfigFile->get<std::string>(prefix + taskDefinitionName + "/className");
     mTaskConfig.cycleDurationSeconds =
-      mConfigFile->get<int>(prefix + taskDefinitionName + "/cycleDurationSeconds").value_or(10);
-    mTaskConfig.maxNumberCycles = mConfigFile->get<int>(prefix + taskDefinitionName + "/maxNumberCycles").value_or(-1);
+      mConfigFile->get<int>(prefix + taskDefinitionName + "/cycleDurationSeconds", 10);
+    mTaskConfig.maxNumberCycles = mConfigFile->get<int>(prefix + taskDefinitionName + "/maxNumberCycles", -1);
 
     // maybe it should be moved somewhere else?
-    std::string taskInputsNames = mConfigFile->getString(prefix + taskDefinitionName + "/inputs").value();
+    std::string taskInputsNames = mConfigFile->get<std::string>(prefix + taskDefinitionName + "/inputs");
     std::vector<std::string> taskInputsSplit;
     boost::split(taskInputsSplit, taskInputsNames, boost::is_any_of(","));
 
     for (auto&& input : taskInputsSplit) {
       InputSpec inputSpec;
-      inputSpec.binding = mConfigFile->getString(prefix + input + "/inputName").value();
-      inputSpec.origin.runtimeInit(mConfigFile->getString(prefix + input + "/dataOrigin").value().c_str());
-      inputSpec.description.runtimeInit(mConfigFile->getString(prefix + input + "/dataDescription").value().c_str());
+      inputSpec.binding = mConfigFile->get<std::string>(prefix + input + "/inputName");
+      inputSpec.origin.runtimeInit(mConfigFile->get<std::string>(prefix + input + "/dataOrigin").c_str());
+      inputSpec.description.runtimeInit(mConfigFile->get<std::string>(prefix + input + "/dataDescription").c_str());
       size_t len = strlen(inputSpec.description.str);
       if (len < inputSpec.description.size - 2) {
         inputSpec.description.str[len] = '_';
@@ -189,15 +189,15 @@ void TaskRunner::populateConfig(std::string taskName)
 void TaskRunner::startOfActivity()
 {
   mTimerTotalDurationActivity.reset();
-  Activity activity(mConfigFile->get<int>("qc/config/Activity/number").value(),
-                    mConfigFile->get<int>("qc/config/Activity/type").value());
+  Activity activity(mConfigFile->get<int>("qc/config/Activity/number"),
+                    mConfigFile->get<int>("qc/config/Activity/type"));
   mTask->startOfActivity(activity);
 }
 
 void TaskRunner::endOfActivity()
 {
-  Activity activity(mConfigFile->get<int>("qc/config/Activity/number").value(),
-                    mConfigFile->get<int>("qc/config/Activity/type").value());
+  Activity activity(mConfigFile->get<int>("qc/config/Activity/number"),
+                    mConfigFile->get<int>("qc/config/Activity/type"));
   mTask->endOfActivity(activity);
 
   double rate = mTotalNumberObjectsPublished / mTimerTotalDurationActivity.getTime();

Modules/Example/src/BenchmarkTask.cxx

@@ -30,11 +30,11 @@ void BenchmarkTask::initialize(o2::framework::InitContext& ctx)
 
   mConfigFile = ConfigurationFactory::getConfiguration("file:./example.ini");
   string prefix = "/qc/tasks_config/" + getName();
-  string taskDefinitionName = mConfigFile->get<std::string>(prefix + ".taskDefinition").value();
-  mNumberHistos = mConfigFile->get<int>(taskDefinitionName + ".numberHistos").value();
-  mNumberChecks = mConfigFile->get<int>(taskDefinitionName + ".numberChecks").value();
-  mTypeOfChecks = mConfigFile->get<std::string>(taskDefinitionName + ".typeOfChecks").value();
-  mModuleOfChecks = mConfigFile->get<std::string>(taskDefinitionName + ".moduleOfChecks").value();
+  string taskDefinitionName = mConfigFile->get<std::string>(prefix + ".taskDefinition");
+  mNumberHistos = mConfigFile->get<int>(taskDefinitionName + ".numberHistos");
+  mNumberChecks = mConfigFile->get<int>(taskDefinitionName + ".numberChecks");
+  mTypeOfChecks = mConfigFile->get<std::string>(taskDefinitionName + ".typeOfChecks");
+  mModuleOfChecks = mConfigFile->get<std::string>(taskDefinitionName + ".moduleOfChecks");
 
   mHistos.reserve(mNumberHistos);