Follows what is done in !53236 (merged) for the current athena implementation.
These changes allow to build same number of strip space points using old and new EDM and workflows.
FYI: @pagessin @cvarni @lgagnon @nstyles @npetters @tadej
