Skip to content

FairLogger changed its interface. Modifications to adapt to it. #836

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Barthelemy merged 1 commit into from
Sep 21, 2021
Merged

FairLogger changed its interface. Modifications to adapt to it. #836

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions Framework/include/QualityControl/ExamplePrinterSpec.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,31 +43,31 @@ class ExamplePrinterSpec : public framework::Task
public:
void run(ProcessingContext& processingContext) final
{
LOG(INFO) << "Received data";
LOG(info) << "Received data";
std::shared_ptr<TObjArray> moArray{ DataRefUtils::as<TObjArray>(*processingContext.inputs().begin()) };

if (moArray->IsEmpty()) {
LOG(INFO) << "Array is empty";
LOG(info) << "Array is empty";
return;
}

// get the object
auto* mo = dynamic_cast<MonitorObject*>(moArray->At(0));
if (mo == nullptr) {
LOG(INFO) << "First element is not a MonitorObject";
LOG(info) << "First element is not a MonitorObject";
return;
}
auto* histo = dynamic_cast<TH1F*>(mo->getObject());
if (histo == nullptr) {
LOG(INFO) << "MonitorObject does not contain a TH1";
LOG(info) << "MonitorObject does not contain a TH1";
return;
}

std::string bins = "BINS:";
for (int i = 0; i < histo->GetNbinsX(); i++) {
bins += " " + std::to_string((int)histo->GetBinContent(i));
}
LOG(INFO) << bins;
LOG(info) << bins;
}
};

Expand All @@ -84,7 +84,7 @@ class ExampleQualityPrinterSpec : public framework::Task
{
auto qo = processingContext.inputs().get<QualityObject*>("checked-mo");

LOG(INFO) << "Received Quality: " << qo->getQuality();
LOG(info) << "Received Quality: " << qo->getQuality();
}
};

Expand Down
2 changes: 1 addition & 1 deletion Framework/test/testQcInfoLogger.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ BOOST_AUTO_TEST_CASE(qc_info_logger_2)
ILOG_INST.log("c. info message");

// Using fairlogger
LOG(INFO) << "fair message in infologger";
LOG(info) << "fair message in infologger";

// using different levels
ILOG(Debug, Devel) << "LogDebugDevel" << ENDM;
Expand Down
10 changes: 5 additions & 5 deletions Modules/CPV/src/PedestalTask.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ void PedestalTask::monitorData(o2::framework::ProcessingContext& ctx)
auto digitsTR = ctx.inputs().get<gsl::span<o2::cpv::TriggerRecord>>("dtrigrec");
//mNEventsTotal += digitsTR.size();//number of events in the current input
for (const auto& trigRecord : digitsTR) {
LOG(DEBUG) << " monitorData() : trigger record #" << mNEventsTotal
LOG(debug) << " monitorData() : trigger record #" << mNEventsTotal
<< " contains " << trigRecord.getNumberOfObjects() << " objects." << ENDM;
if (trigRecord.getNumberOfObjects() > 0) { //at least 1 digit -> pedestal event
mNEventsTotal++;
Expand Down Expand Up @@ -153,13 +153,13 @@ void PedestalTask::monitorData(o2::framework::ProcessingContext& ctx)
// Double_t stats[4];
// h->GetStats(stats);
// auto s = ctx.inputs().get<TObjString*>("string");
// LOG(INFO) << "String is " << s->GetString().Data();
// LOG(info) << "String is " << s->GetString().Data();

// 3. Access CCDB. If it is enough to retrieve it once, do it in initialize().
// Remember to delete the object when the pointer goes out of scope or it is no longer needed.
// TObject* condition = TaskInterface::retrieveCondition("QcTask/example"); // put a valid condition path here
// if (condition) {
// LOG(INFO) << "Retrieved " << condition->ClassName();
// LOG(info) << "Retrieved " << condition->ClassName();
// delete condition;
// }
}
Expand Down Expand Up @@ -411,7 +411,7 @@ void PedestalTask::fillHistograms()

if (channel % 1000 == 0) {
ILOG(Info, Devel) << "fillHistograms(): Start to search peaks in channel " << channel << ENDM;
LOG(INFO) << "fillHistograms(): Start to search peaks in channel " << channel;
LOG(info) << "fillHistograms(): Start to search peaks in channel " << channel;
}

numberOfPeaks = peakSearcher->Search(mHistAmplitudes[channel], 10., "nobackground", 0.2);
Expand Down Expand Up @@ -465,7 +465,7 @@ void PedestalTask::fillHistograms()

//show some info to developer
ILOG(Info, Devel) << "fillHistograms() : at this time, N events = " << mNEventsTotal << ENDM;
LOG(INFO) << "fillPedestals() : I finished filling of histograms";
LOG(info) << "fillPedestals() : I finished filling of histograms";
}

void PedestalTask::resetHistograms()
Expand Down
8 changes: 4 additions & 4 deletions Modules/EMCAL/src/DigitCheck.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,14 +104,14 @@ void DigitCheck::beautify(std::shared_ptr<MonitorObject> mo, Quality checkResult
//
h->SetFillColor(kGreen);
} else if (checkResult == Quality::Bad) {
LOG(INFO) << "Quality::Bad, setting to red";
LOG(info) << "Quality::Bad, setting to red";
msg->Clear();
msg->AddText("Mean outside limits or no entries");
msg->AddText("If NOT a technical run,");
msg->AddText("call EMCAL on-call.");
h->SetFillColor(kRed);
} else if (checkResult == Quality::Medium) {
LOG(INFO) << "Quality::medium, setting to orange";
LOG(info) << "Quality::medium, setting to orange";
h->SetFillColor(kOrange);
}
h->SetLineColor(kBlack);
Expand All @@ -130,14 +130,14 @@ void DigitCheck::beautify(std::shared_ptr<MonitorObject> mo, Quality checkResult
//
h->SetFillColor(kGreen);
} else if (checkResult == Quality::Bad) {
LOG(INFO) << "Quality::Bad, setting to red";
LOG(info) << "Quality::Bad, setting to red";
msg->Clear();
msg->AddText("Mean outside limits or no entries");
msg->AddText("If NOT a technical run,");
msg->AddText("call EMCAL on-call.");
h->SetFillColor(kRed);
} else if (checkResult == Quality::Medium) {
LOG(INFO) << "Quality::medium, setting to orange";
LOG(info) << "Quality::medium, setting to orange";
h->SetFillColor(kOrange);
}
h->SetLineColor(kBlack);
Expand Down
4 changes: 2 additions & 2 deletions Modules/EMCAL/src/RawCheck.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,14 +68,14 @@ void RawCheck::beautify(std::shared_ptr<MonitorObject> mo, Quality checkResult)
//
h->SetFillColor(kGreen);
} else if (checkResult == Quality::Bad) {
LOG(INFO) << "Quality::Bad, setting to red";
LOG(info) << "Quality::Bad, setting to red";
msg->Clear();
msg->AddText("Presence of Error Code"); //Type of the Error, in SM XX
msg->AddText("If NOT a technical run,");
msg->AddText("call EMCAL on-call.");
h->SetFillColor(kRed);
} else if (checkResult == Quality::Medium) {
LOG(INFO) << "Quality::medium, setting to orange";
LOG(info) << "Quality::medium, setting to orange";
h->SetFillColor(kOrange);
}
h->SetLineColor(kBlack);
Expand Down
2 changes: 1 addition & 1 deletion Modules/EMCAL/src/runQCEMCALDigits.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ o2::framework::WorkflowSpec defineDataProcessing(o2::framework::ConfigContext co

// Path to the config file
std::string qcConfigurationSource = getConfigPath(config);
LOG(INFO) << "Using config file '" << qcConfigurationSource << "'";
LOG(info) << "Using config file '" << qcConfigurationSource << "'";

if (!config.options().get<bool>("local") && !config.options().get<bool>("remote")) {
ILOG(Info, Support) << "Creating a standalone QC topology." << ENDM;
Expand Down
12 changes: 6 additions & 6 deletions Modules/ITS/src/ITSClusterTask.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,10 +93,10 @@ void ITSClusterTask::initialize(o2::framework::InitContext& /*ctx*/)
std::ifstream file(mDictPath.c_str());

if (file.good()) {
LOG(INFO) << "Running with dictionary: " << mDictPath;
LOG(info) << "Running with dictionary: " << mDictPath;
mDict.readBinaryFile(mDictPath);
} else {
LOG(INFO) << "Running without dictionary !";
LOG(info) << "Running without dictionary !";
}
}

Expand Down Expand Up @@ -305,12 +305,12 @@ void ITSClusterTask::getJsonParameters()
mRunNumberPath = mCustomParameters["runNumberPath"];
mGeomPath = mCustomParameters["geomPath"];
mNThreads = stoi(mCustomParameters.find("nThreads")->second);
LOG(INFO) << "#################### mNThreads : " << mNThreads;
LOG(info) << "#################### mNThreads : " << mNThreads;
for (int ilayer = 0; ilayer < NLayer; ilayer++) {

if (mCustomParameters["layer"][ilayer] != '0') {
mEnableLayers[ilayer] = 1;
LOG(INFO) << "enable layer : " << ilayer;
LOG(info) << "enable layer : " << ilayer;
} else {
mEnableLayers[ilayer] = 0;
}
Expand All @@ -320,7 +320,7 @@ void ITSClusterTask::getJsonParameters()
void ITSClusterTask::addObject(TObject* aObject)
{
if (!aObject) {
LOG(INFO) << " ERROR: trying to add non-existent object ";
LOG(info) << " ERROR: trying to add non-existent object ";
return;
} else
mPublishedObjects.push_back(aObject);
Expand All @@ -338,7 +338,7 @@ void ITSClusterTask::publishHistos()
{
for (unsigned int iObj = 0; iObj < mPublishedObjects.size(); iObj++) {
getObjectsManager()->startPublishing(mPublishedObjects.at(iObj));
LOG(INFO) << " Object will be published: " << mPublishedObjects.at(iObj)->GetName();
LOG(info) << " Object will be published: " << mPublishedObjects.at(iObj)->GetName();
}
}

Expand Down
2 changes: 1 addition & 1 deletion Modules/ITS/src/ITSRawTask.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ void ITSRawTask::monitorData(o2::framework::ProcessingContext& ctx)

auto digits = ctx.inputs().get<const std::vector<o2::itsmft::Digit>>("digits");
auto events = ctx.inputs().get<DigitEvent*>("Events");
LOG(INFO) << "Digit Size Getting For This TimeFrame (Event) = " << digits.size();
LOG(info) << "Digit Size Getting For This TimeFrame (Event) = " << digits.size();

mErrors = ctx.inputs().get<const std::array<unsigned int, NError>>("Error");

Expand Down
8 changes: 4 additions & 4 deletions Modules/ITS/src/ITSTrackTask.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,10 @@ void ITSTrackTask::initialize(o2::framework::InitContext& /*ctx*/)
std::ifstream file(dictfile.c_str());

if (file.good()) {
LOG(INFO) << "Running with dictionary: " << dictfile.c_str();
LOG(info) << "Running with dictionary: " << dictfile.c_str();
mDict.readBinaryFile(dictfile);
} else {
LOG(INFO) << "Running without dictionary !";
LOG(info) << "Running without dictionary !";
}
}

Expand Down Expand Up @@ -182,7 +182,7 @@ void ITSTrackTask::createAllHistos()
void ITSTrackTask::addObject(TObject* aObject)
{
if (!aObject) {
LOG(INFO) << " ERROR: trying to add non-existent object ";
LOG(info) << " ERROR: trying to add non-existent object ";
return;
} else {
mPublishedObjects.push_back(aObject);
Expand All @@ -201,7 +201,7 @@ void ITSTrackTask::publishHistos()
{
for (unsigned int iObj = 0; iObj < mPublishedObjects.size(); iObj++) {
getObjectsManager()->startPublishing(mPublishedObjects.at(iObj));
LOG(INFO) << " Object will be published: " << mPublishedObjects.at(iObj)->GetName();
LOG(info) << " Object will be published: " << mPublishedObjects.at(iObj)->GetName();
}
}

Expand Down
2 changes: 1 addition & 1 deletion Modules/ITS/src/runITS.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ WorkflowSpec defineDataProcessing(const ConfigContext& config)

// Path to the config file
std::string qcConfigurationSource = getConfigPath(config);
LOG(INFO) << "Using config file '" << qcConfigurationSource << "'";
LOG(info) << "Using config file '" << qcConfigurationSource << "'";

// Generation of Data Sampling infrastructure
auto configInterface = ConfigurationFactory::getConfiguration(qcConfigurationSource);
Expand Down
6 changes: 3 additions & 3 deletions Modules/MFT/src/QcMFTClusterCheck.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,19 +67,19 @@ void QcMFTClusterCheck::beautify(std::shared_ptr<MonitorObject> mo, Quality chec
auto* histogram = dynamic_cast<TH1F*>(mo->getObject());

if (checkResult == Quality::Good) {
LOG(INFO) << "Quality::Good";
LOG(info) << "Quality::Good";
histogram->SetLineColor(kGreen + 2);
TLatex* tl = new TLatex(350, 1.05 * histogram->GetMaximum(), "#color[418]{Dummy check status: Good!}");
histogram->GetListOfFunctions()->Add(tl);
tl->Draw();
} else if (checkResult == Quality::Bad) {
LOG(INFO) << "Quality::Bad";
LOG(info) << "Quality::Bad";
histogram->SetLineColor(kRed + 1);
TLatex* tl = new TLatex(350, 1.05 * histogram->GetMaximum(), "#color[633]{Dummy check status: Bad!}");
histogram->GetListOfFunctions()->Add(tl);
tl->Draw();
} else if (checkResult == Quality::Medium) {
LOG(INFO) << "Quality::Medium";
LOG(info) << "Quality::Medium";
histogram->SetLineColor(kOrange);
TLatex* tl = new TLatex(350, 1.05 * histogram->GetMaximum(), "#color[800]{Dummy check status: Medium!}");
histogram->GetListOfFunctions()->Add(tl);
Expand Down
6 changes: 3 additions & 3 deletions Modules/MFT/src/QcMFTDigitCheck.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,17 +69,17 @@ void QcMFTDigitCheck::beautify(std::shared_ptr<MonitorObject> mo, Quality checkR
auto* histogram = dynamic_cast<TH1F*>(mo->getObject());

if (checkResult == Quality::Good) {
LOG(INFO) << "Quality::Good";
LOG(info) << "Quality::Good";
TLatex* tl = new TLatex(350, 1.05 * histogram->GetMaximum(), "#color[418]{Dummy check status: Good!}");
histogram->GetListOfFunctions()->Add(tl);
tl->Draw();
} else if (checkResult == Quality::Bad) {
LOG(INFO) << "Quality::Bad";
LOG(info) << "Quality::Bad";
TLatex* tl = new TLatex(350, 1.05 * histogram->GetMaximum(), "#color[633]{Dummy check status: Bad!}");
histogram->GetListOfFunctions()->Add(tl);
tl->Draw();
} else if (checkResult == Quality::Medium) {
LOG(INFO) << "Quality::Medium";
LOG(info) << "Quality::Medium";
TLatex* tl = new TLatex(350, 1.05 * histogram->GetMaximum(), "#color[800]{Dummy check status: Medium!}");
histogram->GetListOfFunctions()->Add(tl);
tl->Draw();
Expand Down
4 changes: 2 additions & 2 deletions Modules/MFT/src/QcMFTReadoutCheck.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,13 +65,13 @@ void QcMFTReadoutCheck::beautify(std::shared_ptr<MonitorObject> mo, Quality chec
auto* histogram = dynamic_cast<TH1F*>(mo->getObject());

if (checkResult == Quality::Good) {
LOG(INFO) << "Quality::Good, setting to green";
LOG(info) << "Quality::Good, setting to green";
histogram->SetLineColor(kGreen + 2);
TLatex* tl = new TLatex(1.4, 1.05 * histogram->GetMaximum(), "#color[418]{Check status: Good!}");
histogram->GetListOfFunctions()->Add(tl);
tl->Draw();
} else if (checkResult == Quality::Bad) {
LOG(INFO) << "Quality::Bad, setting to red";
LOG(info) << "Quality::Bad, setting to red";
histogram->SetLineColor(kRed + 1);
TLatex* tl = new TLatex(1.4, 1.05 * histogram->GetMaximum(), "#color[633]{Check status: Bad!}");
histogram->GetListOfFunctions()->Add(tl);
Expand Down
6 changes: 3 additions & 3 deletions Modules/MFT/src/QcMFTTrackCheck.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,13 +60,13 @@ void QcMFTTrackCheck::beautify(std::shared_ptr<MonitorObject> mo, Quality checkR
auto* histogram = dynamic_cast<TH1F*>(mo->getObject());

if (checkResult == Quality::Good) {
LOG(INFO) << "Quality::Good, setting to green";
LOG(info) << "Quality::Good, setting to green";
histogram->SetLineColor(kGreen);
} else if (checkResult == Quality::Bad) {
LOG(INFO) << "Quality::Bad, setting to red";
LOG(info) << "Quality::Bad, setting to red";
histogram->SetLineColor(kRed);
} else if (checkResult == Quality::Medium) {
LOG(INFO) << "Quality::Medium, setting to orange";
LOG(info) << "Quality::Medium, setting to orange";
histogram->SetLineColor(kOrange);
}
histogram->SetLineColor(kBlack);
Expand Down
8 changes: 4 additions & 4 deletions Modules/MFT/src/runMFTClustersRootFileReader.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,13 @@ class MFTClustersRootFileReader : public o2::framework::Task
//_________________________________________________________________________________________________
void init(framework::InitContext& ic)
{
LOG(INFO) << " In MFTClustersRootFileReader::init ... entering ";
LOG(info) << " In MFTClustersRootFileReader::init ... entering ";

// open the input file
auto filename = ic.options().get<std::string>("mft-cluster-infile");
mFile = std::make_unique<TFile>(filename.c_str(), "OLD");
if (!mFile->IsOpen()) {
LOG(ERROR) << "MFTClustersRootFileReader::init. Cannot open the file: " << filename.c_str();
LOG(error) << "MFTClustersRootFileReader::init. Cannot open the file: " << filename.c_str();
ic.services().get<ControlService>().endOfStream();
ic.services().get<ControlService>().readyToQuit(QuitRequest::Me);
return;
Expand All @@ -70,7 +70,7 @@ class MFTClustersRootFileReader : public o2::framework::Task
// check that it has entries
mNumberOfTF = mTree->GetEntries();
if (mNumberOfTF == 0) {
LOG(ERROR) << "MFTClustersRootFileReader::init. No TFs ";
LOG(error) << "MFTClustersRootFileReader::init. No TFs ";
ic.services().get<ControlService>().endOfStream();
ic.services().get<ControlService>().readyToQuit(QuitRequest::Me);
return;
Expand All @@ -84,7 +84,7 @@ class MFTClustersRootFileReader : public o2::framework::Task

// Check if this is the last TF
if (mCurrentTF == mNumberOfTF) {
LOG(INFO) << " MFTClustersRootFileReader::run. End of file reached";
LOG(info) << " MFTClustersRootFileReader::run. End of file reached";
pc.services().get<ControlService>().endOfStream();
pc.services().get<ControlService>().readyToQuit(QuitRequest::Me);
return;
Expand Down
Loading