Remove if-else block to ease vectorisation

[njansson]

The if-else block prevented vectorisation of the loop over xyz. By replacing the logical block with a msk, the entire xyz vectorises fine.