diff --git a/matlab/TCV/tcv_requests_mapping.m b/matlab/TCV/tcv_requests_mapping.m index 7ac36f74ed46c4592e3f2c931c6916b3aa1a3f5f..e2b0fbdbea5dfe03a7b716950e9fa450c0f0f96f 100644 --- a/matlab/TCV/tcv_requests_mapping.m +++ b/matlab/TCV/tcv_requests_mapping.m @@ -602,7 +602,7 @@ switch lower(data_request) mapping.method = 'tdiliuqe'; mapping.expression = '\results::te_x_a[*,12]'; mapping.method = 'expression'; - mapping.expression = ['params_eff = gdat_data.gdat_params;params_eff.data_request=''\results::te_x_a[*,12]''; ' ... + mapping.expression = ['if shot > 78662, disp(''no XTE anymore'');gdat_tmp.data=[];return;end;params_eff = gdat_data.gdat_params;params_eff.data_request=''\results::te_x_a[*,12]''; ' ... 'gdat_tmp=gdat_tcv([],params_eff); ' ... 'params_eff = gdat_data.gdat_params;params_eff.data_request=''\magnetics::iplasma:trapeze''; ' ... 'aa=gdat_tcv([],params_eff);it=find(abs(aa.data)<10e3);it2=iround_os(gdat_tmp.t,aa.t(it));gdat_tmp.data(it2)=NaN;' ... diff --git a/matlab/tests/test_requestnames.m b/matlab/tests/test_requestnames.m index ad90fca1fcc34a3b6183b6e78c7a9326aae116d1..b8fae2bb9ccac94caaa5ce578c70c194bca90eeb 100644 --- a/matlab/tests/test_requestnames.m +++ b/matlab/tests/test_requestnames.m @@ -36,6 +36,10 @@ classdef (SharedTestFixtures={... % need a newer shot for tcv radcam shot = 81102; gdat_call = sprintf(['gdat_' lower(testCase.Machine) '(%s,''%s'')'],shot,request); + case {'mpx', 'xte'} + % need a older shot + shot = 65555; + gdat_call = sprintf(['gdat_' lower(testCase.Machine) '(%s,''%s'')'],shot,request); end % logging diff --git a/matlab/tests/test_requestnames_tcv.m b/matlab/tests/test_requestnames_tcv.m index 6941e96ddac1f9ae3cc07d32ee0dc76e58b0c5d5..872f12c547cfb4325f968844ab22fd351572c39e 100644 --- a/matlab/tests/test_requestnames_tcv.m +++ b/matlab/tests/test_requestnames_tcv.m @@ -7,7 +7,7 @@ classdef (TestTags={'tcv'})test_requestnames_tcv < test_requestnames properties(TestParameter) % parameters that will vary during tests - shot = {'65565'}; + shot = {'82913'}; requests_fast = get_all_gdat_requests('TCV','fast'); requests_slow = get_all_gdat_requests('TCV','slow'); end