Skip to content

[ATR-20755] Refactor TrigCompositeUtils. Point all current clients to new header location. Add explicit linking.

Tim Martin requested to merge tamartin/athena:TrigCompCleanup into master

This is a mostly programmatic update

git grep -l '#include "DecisionHandling/TrigCompositeUtils.h"' | xargs sed -i 's|#include "DecisionHandling/TrigCompositeUtils.h"|#include "TrigCompositeUtils/TrigCompositeUtils.h"|g'
git grep -l '#include "DecisionHandling/HLTIdentifier.h"' | xargs sed -i 's|#include "DecisionHandling/HLTIdentifier.h"|#include "TrigCompositeUtils/HLTIdentifier.h"|g'
git grep -l '#include "DecisionHandling/Combinators.h"' | xargs sed -i 's|#include "DecisionHandling/Combinators.h"|#include "TrigCompositeUtils/Combinators.h"|g'

The cmake of the affected packages were then edited by hand to be explicit about the new linking (code can also link through DecisionHandlingLib).

The forwarding headers are left in place a little while longer, but in another few months these too will be removed.

Merge request reports