Merge branch 'cherry-pick-0438f1d8 [formerly 73f021b540]-master' into 'master'

Sweeping !12865 from 21.0 to master.
RadiationMapsMaker: Store density and norm in E_ion, TID maps for Geantinos

See merge request atlas/athena!12922

Former-commit-id: e8866738