From 66cce11b149d557f0079f5abd67c0887b0e8cf0a Mon Sep 17 00:00:00 2001
From: Olivier Sauter <olivier.sauter@epfl.ch>
Date: Mon, 10 Jul 2017 13:48:40 +0000
Subject: [PATCH] tested ngreenwald (abs(Ip)) and do not copy data_request nor
label form expression result gdat_tmp
git-svn-id: https://spcsvn.epfl.ch/repos/TCV/gdat/trunk@7857 d63d8f72-b253-0410-a779-e742ad2e26cf
---
crpptbx/TCV/gdat_tcv.m | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/crpptbx/TCV/gdat_tcv.m b/crpptbx/TCV/gdat_tcv.m
index d872c08c..4e812e38 100644
--- a/crpptbx/TCV/gdat_tcv.m
+++ b/crpptbx/TCV/gdat_tcv.m
@@ -297,7 +297,6 @@ end
% Specifications on how to get the data provided in tcv_requests_mapping
mapping_for_tcv = tcv_requests_mapping(data_request_eff,shot);
gdat_data.label = mapping_for_tcv.label;
-
ishot=NaN;
if do_mdsopen_mdsclose
% mdsdefaultserver tcv1.epfl.ch; % should be in tcv general path, but set-it in the meantime...
@@ -485,7 +484,7 @@ elseif strcmp(mapping_for_tcv.method,'expression')
error_status=801;
return
end
- tmp_fieldnames = fieldnames(gdat_tmp);
+ tmp_fieldnames = setdiff(fieldnames(gdat_tmp),{'gdat_request','label'}); % could/should also remove label in any case
if sum(strcmp(tmp_fieldnames,'data'))==0 % note: cannot do isfield since gdat_tmp might be an object
if (gdat_params.nverbose>=1); warning(['expression does not return a child name ''data'' for ' data_request_eff]); end
end
--
GitLab