Merge branch 'cherry-pick-e903c0ae16-master' into 'master'

Sweeping !28953 from 21.0 to master.
Fix discrepancy seen when creating param files with single and multiple energy slices

See merge request atlas/athena!29012