From 2238fd5bf35f6ff8d4c8d1efec67b98f3530d8cf Mon Sep 17 00:00:00 2001 From: Olivier Sauter <olivier.sauter@epfl.ch> Date: Wed, 11 Jul 2018 14:12:35 +0000 Subject: [PATCH] correct node for checking NBI should be _FB instead of _RB and ON isntead of OK git-svn-id: https://spcsvn.epfl.ch/repos/TCV/gdat/trunk@10397 d63d8f72-b253-0410-a779-e742ad2e26cf --- crpptbx/TCV/gdat_tcv.m | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/crpptbx/TCV/gdat_tcv.m b/crpptbx/TCV/gdat_tcv.m index 3a544d57..03cdaf09 100644 --- a/crpptbx/TCV/gdat_tcv.m +++ b/crpptbx/TCV/gdat_tcv.m @@ -1105,10 +1105,10 @@ elseif strcmp(mapping_for_tcv.method,'switchcase') NBH_in_TCV = 0; if shot >= 51641 % NBI - moderemote = mdsdata('data(\VSYSTEM::TCV_NBHDB_B["NBI:MODEREMOTE_RB"])'); + moderemote = mdsdata('data(\VSYSTEM::TCV_NBHDB_B["NBI:MODEREMOTE_FB"])'); lcs_mode = mdsdata('data(\VSYSTEM::TCV_NBHDB_I["NBI:LCS_MODE"])'); - % NBH in TCV equiv moderemote='OK' AND lcs_mode = 9 - NBH_in_TCV = strcmpi(strtrim(moderemote),'OK') && lcs_mode == 9; + % NBH in TCV equiv moderemote='ON' AND lcs_mode = 9 + NBH_in_TCV = strcmpi(strtrim(moderemote),'ON') && lcs_mode == 9; else % Nodes used in previous block only exist outside of Vista for shots after 51641 if any(shot == [51458 51459 51460 51461 51463 51465 51470 51472 ... % 29.JAN.2016 @@ -1601,10 +1601,10 @@ elseif strcmp(mapping_for_tcv.method,'switchcase') NBH_in_TCV = 0; if shot >= 51641 % NBI - moderemote = mdsdata('data(\VSYSTEM::TCV_NBHDB_B["NBI:MODEREMOTE_RB"])'); + moderemote = mdsdata('data(\VSYSTEM::TCV_NBHDB_B["NBI:MODEREMOTE_FB"])'); lcs_mode = mdsdata('data(\VSYSTEM::TCV_NBHDB_I["NBI:LCS_MODE"])'); - % NBH in TCV equiv moderemote='OK' AND lcs_mode = 9 - NBH_in_TCV = strcmpi(strtrim(moderemote),'OK') && lcs_mode == 9; + % NBH in TCV equiv moderemote='ON' AND lcs_mode = 9 + NBH_in_TCV = strcmpi(strtrim(moderemote),'ON') && lcs_mode == 9; else % Nodes used in previous block only exist outside of Vista for shots after 51641 if any(shot == [51458 51459 51460 51461 51463 51465 51470 51472 ... % 29.JAN.2016 -- GitLab