Simplify/unify match criteria in MC/MPdisks

[aryd]

In reviewing PR #242 we realized that the cuts used to select matches in the disks uses a combination of cuts on phi and r*phi. This code should be simplified, but this requires also changing the code in the emulation. We decided not to address this as part of this PR, but we entered this as an issue that we should track.