Merge branch 'release/release-2.0.0'
Merge branch 'master' into develop
changed ion optics, instead of using a relative_position correction to convert to axial units mftable now has mappings for each detector