Skip to content

further fixes on table enabling & process switches #14

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
ChSonnabend merged 1 commit into from
Feb 19, 2024
Merged

further fixes on table enabling & process switches #14

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
9 changes: 8 additions & 1 deletion Common/TableProducer/PID/pidTPC.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,11 @@ struct tpcPid {

void init(o2::framework::InitContext& initContext)
{
// Protection for process flags
if ((doprocessStandard && doprocessMcTuneOnData) || (!doprocessStandard && !doprocessMcTuneOnData)) {
LOG(fatal) << "pid-tpc must have only one of the options 'processStandard' OR 'processMcTuneOnData' enabled. Please check your configuration.";
}

response = new o2::pid::tpc::Response();
// Checking the tables are requested in the workflow and enabling them
auto enableFlag = [&](const std::string particle, Configurable<int>& flag) {
Expand All @@ -154,7 +159,9 @@ struct tpcPid {
enableFlag("Tr", pidTr);
enableFlag("He", pidHe);
enableFlag("Al", pidAl);
enableFlagIfTableRequired(initContext, "mcTPCTuneOnData", enableTuneOnDataTable);
if (doprocessMcTuneOnData) {
enableFlagIfTableRequired(initContext, "mcTPCTuneOnData", enableTuneOnDataTable);
}

// Initialise metadata object for CCDB calls
if (recoPass.value == "") {
Expand Down
10 changes: 8 additions & 2 deletions Common/TableProducer/PID/pidTPCFull.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ struct tpcPidFull {
Configurable<int> pidTr{"pid-tr", -1, {"Produce PID information for the Triton mass hypothesis, overrides the automatic setup: the corresponding table can be set off (0) or on (1)"}};
Configurable<int> pidHe{"pid-he", -1, {"Produce PID information for the Helium3 mass hypothesis, overrides the automatic setup: the corresponding table can be set off (0) or on (1)"}};
Configurable<int> pidAl{"pid-al", -1, {"Produce PID information for the Alpha mass hypothesis, overrides the automatic setup: the corresponding table can be set off (0) or on (1)"}};
// Configurable<int> enableTuneOnDataTable{"enableTuneOnDataTable", -1, {"Produce tuned dE/dx signal table for MC to be used as raw signal in other tasks (default -1, 'only if needed'"}};
Configurable<int> enableTuneOnDataTable{"enableTuneOnDataTable", -1, {"Produce tuned dE/dx signal table for MC to be used as raw signal in other tasks (default -1, 'only if needed'"}};

// Parametrization configuration
bool useCCDBParam = false;
Expand Down Expand Up @@ -140,6 +140,10 @@ struct tpcPidFull {

void init(o2::framework::InitContext& initContext)
{
// Protection for process flags
if ((doprocessStandard && doprocessMcTuneOnData) || (!doprocessStandard && !doprocessMcTuneOnData)) {
LOG(fatal) << "pid-tpc-full must have only one of the options 'processStandard' OR 'processMcTuneOnData' enabled. Please check your configuration.";
}
response = new o2::pid::tpc::Response();
// Checking the tables are requested in the workflow and enabling them
auto enableFlag = [&](const std::string particle, Configurable<int>& flag) {
Expand All @@ -154,7 +158,9 @@ struct tpcPidFull {
enableFlag("Tr", pidTr);
enableFlag("He", pidHe);
enableFlag("Al", pidAl);
// enableFlagIfTableRequired(initContext, "mcTPCTuneOnData", enableTuneOnDataTable);
if (doprocessMcTuneOnData) {
enableFlagIfTableRequired(initContext, "mcTPCTuneOnData", enableTuneOnDataTable);
}

// Initialise metadata object for CCDB calls
if (recoPass.value == "") {
Expand Down