From 5764a92128049f73039dcb00cb8bbb8b3a22de6f Mon Sep 17 00:00:00 2001 From: Marco Giacalone Date: Wed, 29 Jan 2025 17:21:05 +0100 Subject: [PATCH] Expand trigger macro variable in hybrid --- Generators/src/GeneratorHybrid.cxx | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Generators/src/GeneratorHybrid.cxx b/Generators/src/GeneratorHybrid.cxx index 03a78eb852eb6..296f69815e4f0 100644 --- a/Generators/src/GeneratorHybrid.cxx +++ b/Generators/src/GeneratorHybrid.cxx @@ -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(mTriggerMacros[count][trg], mTriggerFuncs[count][trg], "o2::eventgen::Trigger", "trigger"); + trigger = o2::conf::GetFromMacro(expandedMacro, mTriggerFuncs[count][trg], "o2::eventgen::Trigger", "trigger"); if (!trigger) { LOG(info) << "Trying to retrieve a \'o2::eventgen::DeepTrigger\' type"; - deeptrigger = o2::conf::GetFromMacro(mTriggerMacros[count][trg], mTriggerFuncs[count][trg], "o2::eventgen::DeepTrigger", "deeptrigger"); + deeptrigger = o2::conf::GetFromMacro(expandedMacro, mTriggerFuncs[count][trg], "o2::eventgen::DeepTrigger", "deeptrigger"); } if (!trigger && !deeptrigger) { LOG(warn) << "Failed to retrieve \'external trigger\': problem with configuration";