From 148b1907bf23ef1db13de51f96cbe6cdf4e27ba8 Mon Sep 17 00:00:00 2001
From: Olivier Sauter <olivier.sauter@epfl.ch>
Date: Tue, 17 Sep 2024 23:18:21 +0200
Subject: [PATCH] use more recent shot nb for tests, add exceptions
---
matlab/TCV/tcv_requests_mapping.m | 2 +-
matlab/tests/test_requestnames.m | 4 ++++
matlab/tests/test_requestnames_tcv.m | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/matlab/TCV/tcv_requests_mapping.m b/matlab/TCV/tcv_requests_mapping.m
index 7ac36f74..e2b0fbdb 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 ad90fca1..b8fae2bb 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 6941e96d..872f12c5 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
--
GitLab