Skip to content

Simplify & unify MinBias CA/wrapper configuration, follow CA naming conventions

Teng Jian Khoo requested to merge khoo/athena:TMMT-MinBias-CANaming into main

This consolidates the CA and legacy step configuration, via a helper function for calling the appropriate (native CA or wrapper) configuration generator. In the previous parallel configuration, several steps were skipped in the CA version.

@tbold, as you had some objections to a similar change by @smh, do you agree with this change? I retained the independent function calls like getMinBiasMbtsStep in assembleChainImpl for uniformity, although IMO it suffices to directly call getStep here.

In the process I also did a bit of refactoring of the AFP config sequences to conform to CA naming conventions (i.e. renamed CA-returning functions to end in Cfg). However, I still had to give up on the AFP sequences because the migration is ongoing by @hanfei in ATR-28356. They fail on the use of legacy JobProperties (see pipeline 6).

The RecoFragmentsPool invocation in getStep requires some finesse -- as originally written, I suspect the callGenerator function became part of the cache key, causing the same function to be invoked for multiple steps. Using the actual step configuration as stepArgs ensures that RecoFragmentsPool sees the actual sequence generator as part of the args. When we clean up the legacy configuration, this can be simplified to call the sequence generator directly.

Edited by Teng Jian Khoo

Merge request reports