Draft: Fixing supercell emulation to use data

Can't show this merge request because the source branch EmulationFix is missing from project atlas/athena. Close this merge request or update the source branch.