Commit 190fa41b authored by Ewelina Maria Lobodzinska's avatar Ewelina Maria Lobodzinska
Browse files

Merge branch 'cherry-pick-c6646656-21.6' into '21.6'

Sweeping !27452 from 21.2 to 21.6.
Configure AnaToolHandles from athena joboptions

See merge request !27679
parents 59e0f3ec 1e05d0a9
......@@ -526,7 +526,7 @@ namespace asg
ANA_MSG_ERROR ("trying to initialize ToolHandleArray property " << val_name << " with empty handle");
return StatusCode::FAILURE;
}
//strip the parent name
std::string tool_name = toolHandle.name();
tools.push_back (toolHandle.type() + "/" + tool_name);
......@@ -1130,6 +1130,9 @@ namespace asg
return detail::AnaToolHandleMode::USER;
#endif
if (m_config.empty() && !m_handleUser->typeAndName().empty() && (m_handleUser->type() != this->type() || m_handleUser->name() != this->name()))
return detail::AnaToolHandleMode::USER;
if (m_config.empty() && m_name.empty())
return detail::AnaToolHandleMode::EMPTY;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment