Second fix for ATLASRECTS-6000
I made a stupid mistake in copying and pasting and used z instead of r for ordering the pseudomeasurements. Additionally, the special exceptions for comparing RPC and MDT hits should only apply to the case when the hits are in the same chamber, otherwise they can simply be ordered by r.
Closes ATLASRECTS-6000