Skip to content

Commit 0af32d9

Browse files
committed
migrated from obsolete Configuration API
1 parent f0b68e9 commit 0af32d9

3 files changed

Lines changed: 12 additions & 11 deletions

File tree

Modules/Common/src/MeanIsAbove.cxx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,12 @@
1111
#include <TList.h>
1212
#include <TLine.h>
1313
// O2
14-
#include "Configuration/Configuration.h"
14+
#include "Configuration/ConfigurationFactory.h"
1515

1616
ClassImp(o2::quality_control_modules::common::MeanIsAbove)
1717

1818
using namespace std;
19+
using namespace AliceO2::Configuration;
1920

2021
namespace o2 {
2122
namespace quality_control_modules {
@@ -29,9 +30,8 @@ MeanIsAbove::MeanIsAbove()
2930
void MeanIsAbove::configure(std::string name)
3031
{
3132
// TODO use the configuration system to set the params
32-
AliceO2::Configuration::ConfigFile configFile;
3333
try {
34-
configFile.load("file:../example.ini"); // not ok...
34+
auto configFile = ConfigurationFactory::getConfiguration("file:../example.ini"); // not ok...
3535
} catch (string &exception) {
3636
cout << "error getting config file in MeanIsAbove : " << exception << endl;
3737
mThreshold = 1.0f;

Modules/Example/include/Example/BenchmarkTask.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#include "QualityControl/TaskInterface.h"
1010

1111
#include <vector>
12-
#include "Configuration/Configuration.h"
12+
#include "Configuration/ConfigurationFactory.h"
1313

1414
class TH1F;
1515

@@ -44,7 +44,7 @@ class BenchmarkTask: public TaskInterface
4444
private:
4545

4646
std::vector<TH1F*> mHistos;
47-
AliceO2::Configuration::ConfigFile mConfigFile;
47+
std::unique_ptr<AliceO2::Configuration::ConfigurationInterface> mConfigFile;
4848
size_t mNumberHistos;
4949
size_t mNumberChecks;
5050
std::string mTypeOfChecks;

Modules/Example/src/BenchmarkTask.cxx

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
#include <thread>
1111

1212
using namespace std;
13+
using namespace AliceO2::Configuration;
1314

1415
namespace o2 {
1516
namespace quality_control_modules {
@@ -29,12 +30,12 @@ void BenchmarkTask::initialize()
2930
QcInfoLogger::GetInstance() << "initialize benchmarktask \"" << getName() << "\""
3031
<< AliceO2::InfoLogger::InfoLogger::endm;
3132

32-
mConfigFile.load("file:./example.ini");
33-
string taskDefinitionName = mConfigFile.getValue<string>(getName() + ".taskDefinition");
34-
mNumberHistos = mConfigFile.getValue<size_t>(taskDefinitionName + ".numberHistos");
35-
mNumberChecks = mConfigFile.getValue<size_t>(taskDefinitionName + ".numberChecks");
36-
mTypeOfChecks = mConfigFile.getValue<string>(taskDefinitionName + ".typeOfChecks");
37-
mModuleOfChecks = mConfigFile.getValue<string>(taskDefinitionName + ".moduleOfChecks");
33+
mConfigFile = ConfigurationFactory::getConfiguration("file:./example.ini");
34+
string taskDefinitionName = mConfigFile->get<std::string>(getName() + ".taskDefinition").value();
35+
mNumberHistos = mConfigFile->get<int>(taskDefinitionName + ".numberHistos").value();
36+
mNumberChecks = mConfigFile->get<int>(taskDefinitionName + ".numberChecks").value();
37+
mTypeOfChecks = mConfigFile->get<std::string>(taskDefinitionName + ".typeOfChecks").value();
38+
mModuleOfChecks = mConfigFile->get<std::string>(taskDefinitionName + ".moduleOfChecks").value();
3839

3940
mHistos.reserve(mNumberHistos);
4041

0 commit comments

Comments
 (0)