Skip to content

[QC-563] Set run number in monitoring #652

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
Mar 31, 2021
Merged

[QC-563] Set run number in monitoring #652

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
1 change: 1 addition & 0 deletions Framework/include/QualityControl/TaskRunner.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@ class TaskRunner : public framework::Task
std::string validateDetectorName(std::string name) const;
boost::property_tree::ptree getTaskConfigTree() const;
void updateMonitoringStats(framework::ProcessingContext& pCtx);
void computeRunNumber(const framework::ServiceRegistry& services);

// consider moving these to TaskConfig
framework::Inputs mInputSpecs;
Expand Down
18 changes: 12 additions & 6 deletions Framework/src/TaskRunner.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,18 +218,22 @@ void TaskRunner::endOfStream(framework::EndOfStreamContext& eosContext)
mNoMoreCycles = true;
}

void TaskRunner::start(const ServiceRegistry& services)
void TaskRunner::computeRunNumber(const ServiceRegistry& services)
{
try {
auto temp = services.get<RawDeviceService>().device()->fConfig->GetProperty<std::string>("runNumber", "unspecified");
auto temp = services.get<RawDeviceService>().device()->fConfig->GetProperty<string>("runNumber", "unspecified");
ILOG(Info, Devel) << "Got this property runNumber from RawDeviceService: " << temp << ENDM;
mRunNumber = stoi(temp);
ILOG(Info, Support) << "Run number found in options: " << mRunNumber << ENDM;
} catch (std::invalid_argument& ia) {
ILOG(Info, Support) << "Run number not found in options or is not a number, using 0 instead." << ENDM;
mRunNumber = 0;
} catch (invalid_argument& ia) {
ILOG(Info, Support) << "Run number not found in options or is not a number, using the one from the config file instead." << ENDM;
mRunNumber = mConfigFile->get<int>("qc.config.Activity.number", 0);
}
ILOG(Info, Ops) << "Starting run " << mRunNumber << ENDM;
}

void TaskRunner::start(const ServiceRegistry& services)
{
computeRunNumber(services);

try {
startOfActivity();
Expand Down Expand Up @@ -406,6 +410,8 @@ void TaskRunner::startOfActivity()
int run = mRunNumber > 0 ? mRunNumber : mConfigFile->get<int>("qc.config.Activity.number");
Activity activity(run,
mConfigFile->get<int>("qc.config.Activity.type"));
ILOG(Info, Ops) << "Starting run " << mRunNumber << ENDM;
mCollector->setRunNumber(run);
mTask->startOfActivity(activity);
mObjectsManager->updateServiceDiscovery();
}
Expand Down