Rewrite two methods to use dictionary comprehensions
Rewrite two methods to use dictionary comprehensions

This removes the clumsy variable names for the dictionaries
and makes the code shorter

angelsanz/mamba_xrays,angelsanz/mamba_xrays