Skip to content
Merged
Changes from all commits
Commits
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
7 changes: 4 additions & 3 deletions Generators/src/GeneratorHybrid.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -192,13 +192,14 @@ Bool_t GeneratorHybrid::Init()
if (mTriggerMacros[count][trg].empty() || mTriggerFuncs[count][trg].empty()) {
continue;
}
std::string expandedMacro = o2::utils::expandShellVarsInFileName(mTriggerMacros[count][trg]);
LOG(info) << "Setting trigger " << trg << " of generator " << gen << " with following parameters";
LOG(info) << "Macro filename: " << mTriggerMacros[count][trg];
LOG(info) << "Macro filename: " << expandedMacro;
LOG(info) << "Function name: " << mTriggerFuncs[count][trg];
trigger = o2::conf::GetFromMacro<o2::eventgen::Trigger>(mTriggerMacros[count][trg], mTriggerFuncs[count][trg], "o2::eventgen::Trigger", "trigger");
trigger = o2::conf::GetFromMacro<o2::eventgen::Trigger>(expandedMacro, mTriggerFuncs[count][trg], "o2::eventgen::Trigger", "trigger");
if (!trigger) {
LOG(info) << "Trying to retrieve a \'o2::eventgen::DeepTrigger\' type";
deeptrigger = o2::conf::GetFromMacro<o2::eventgen::DeepTrigger>(mTriggerMacros[count][trg], mTriggerFuncs[count][trg], "o2::eventgen::DeepTrigger", "deeptrigger");
deeptrigger = o2::conf::GetFromMacro<o2::eventgen::DeepTrigger>(expandedMacro, mTriggerFuncs[count][trg], "o2::eventgen::DeepTrigger", "deeptrigger");
}
if (!trigger && !deeptrigger) {
LOG(warn) << "Failed to retrieve \'external trigger\': problem with configuration";
Expand Down