moved 'cheat' in SWAP_NVST to explicit modification of iSWAP_NV_1 to iSWAP_NV_1_mod
moved 'cheat' in SWAP_NVST to explicit modification of iSWAP_NV_1 to iSWAP_NV_1_mod

perlinm/qcdg-nv-simulation,perlinm/qcdg-nv-simulation,perlinm/qcdg-nv-simulation