From 072fa64b4c5c0123b1dee73c3b4dffb9623d8480 Mon Sep 17 00:00:00 2001
From: Olivier Sauter <olivier.sauter@epfl.ch>
Date: Fri, 16 Jun 2017 14:40:23 +0000
Subject: [PATCH] check better for no data
git-svn-id: https://spcsvn.epfl.ch/repos/TCV/gdat/trunk@7543 d63d8f72-b253-0410-a779-e742ad2e26cf
---
crpptbx/TCV/gdat_tcv.m | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/crpptbx/TCV/gdat_tcv.m b/crpptbx/TCV/gdat_tcv.m
index ff2e7d3a..f8ae59eb 100644
--- a/crpptbx/TCV/gdat_tcv.m
+++ b/crpptbx/TCV/gdat_tcv.m
@@ -328,7 +328,7 @@ if strcmp(mapping_for_tcv.method(1:3),'tdi')
end
aatmp=eval(eval_expr);
end
- if isempty(aatmp.data) || isempty(aatmp.dim) % || ischar(aatmp.data) (to add?)
+ if isempty(aatmp.data) || (isempty(aatmp.dim) && ischar(aatmp.data) && findstr(lower(aatmp.data),'no data'))% || ischar(aatmp.data) (to add?)
if (gdat_params.nverbose>=1); warning(['problems loading data for ' eval_expr ' for data_request= ' data_request_eff]); end
if (gdat_params.nverbose>=3); disp('check .gdat_request list'); end
return
@@ -359,7 +359,7 @@ if strcmp(mapping_for_tcv.method(1:3),'tdi')
if mapping_for_tcv.timedim==-1
% assume last one except if of length 1
mapping_for_tcv.timedim = nbdims;
- if (size(gdat_data.data,nbdims)==1 && nbdims>1); mapping_for_tcv.timedim = nbdims-1; end
+ if (nbdims>1 && size(gdat_data.data,nbdims)==1); mapping_for_tcv.timedim = nbdims-1; end
end
end
dim_nontim = setdiff([1:nbdims],mapping_for_tcv.timedim);
@@ -371,7 +371,7 @@ if strcmp(mapping_for_tcv.method(1:3),'tdi')
gdat_data.x = gdat_data.dim(dim_nontim);
end
end
- gdat_data.t = gdat_data.dim{mapping_for_tcv.timedim};
+ if mapping_for_tcv.timedim>0; gdat_data.t = gdat_data.dim{mapping_for_tcv.timedim}; end
gdat_data.units = aatmp.units;
gdat_data.dimunits = aatmp.dimunits;
if mapping_for_tcv.gdat_timedim>0 && mapping_for_tcv.gdat_timedim ~= mapping_for_tcv.timedim
--
GitLab