From 5af410e48b3ef77b0ee90393ea484e8102aade24 Mon Sep 17 00:00:00 2001
From: Olivier Sauter <olivier.sauter@epfl.ch>
Date: Wed, 31 Mar 2010 07:02:41 +0000
Subject: [PATCH] add error
git-svn-id: https://spcsvn.epfl.ch/repos/TCV/gdat/trunk@1983 d63d8f72-b253-0410-a779-e742ad2e26cf
---
crpptbx/TCV/loadTCVdata.m | 4 +++-
crpptbx/gdat.m | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/crpptbx/TCV/loadTCVdata.m b/crpptbx/TCV/loadTCVdata.m
index e880d98f..a4226f89 100644
--- a/crpptbx/TCV/loadTCVdata.m
+++ b/crpptbx/TCV/loadTCVdata.m
@@ -575,10 +575,11 @@ switch TCVkeywrdcase{index}
tracetdi=tdi(nodenameeff);
if avers.data < 2.99
% for earlier version the bug made it to have logically (rho,t)
- if ~isempty(tracetdi.dim)
+ if ~isempty(tracetdi.dim) && ~ischar(tracetdi.data)
trace.x=tracetdi.dim{1};
trace.t=tracetdi.dim{2};
else
+ error=2;
trace.x=[];
trace.t=[];
end
@@ -589,6 +590,7 @@ switch TCVkeywrdcase{index}
trace.x=tracetdi.dim{2};
trace.t=tracetdi.dim{1};
else
+ error=1;
trace.x=[];
trace.t=[];
end
diff --git a/crpptbx/gdat.m b/crpptbx/gdat.m
index 7c1437b4..c614c4ae 100644
--- a/crpptbx/gdat.m
+++ b/crpptbx/gdat.m
@@ -71,7 +71,7 @@ function [trace,error,varargout] = gdat(shot,data_type,varargin)
% trace.dim: cell array of grids, trace.dim{1}, {2}, ...
% trace.dimunits: units of dimensions
%
-% error: error in loading signal (0=> OK, 1=> error)
+% error: error in loading signal (0=> OK, >=1 => error)
%
% Additional Output arguments depending on data_type
%
--
GitLab