Small fix in NSW validation alg + update macros
This MR contains a one-line fix for a segfault in the NSW validation alg.
Besides the fix, I have redone part of the macros containing the NSW offline matching. This will not effect athena, as macros are not used in any runs. Rather, they are there for personal use.