From 74c74a718e7dfb05855d45c668c2ec9a6f5ced5e Mon Sep 17 00:00:00 2001
From: Olivier Sauter <olivier.sauter@epfl.ch>
Date: Tue, 5 Apr 2011 09:16:35 +0000
Subject: [PATCH] fix in case no firrat set NaN
git-svn-id: https://spcsvn.epfl.ch/repos/TCV/gdat/trunk@2669 d63d8f72-b253-0410-a779-e742ad2e26cf
---
crpptbx/TCV/loadTCVdata.m | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/crpptbx/TCV/loadTCVdata.m b/crpptbx/TCV/loadTCVdata.m
index 23e42333..9c3ef996 100644
--- a/crpptbx/TCV/loadTCVdata.m
+++ b/crpptbx/TCV/loadTCVdata.m
@@ -576,17 +576,24 @@ switch TCVkeywrdcase{index}
tracestd=tdi('\results::thomson:ne:error_bar');
if shot>=23801
tracefirrat=tdi('\results::thomson.profiles.auto:fir_thom_rat'); %time base not same!!
- if isempty(tracefirrat.data)
+ if isempty(tracefirrat.data) || ischar(tracefirrat.data)
disp('problem with \results::thomson.profiles.auto:fir_thom_rat: empty')
end
else
tracefirrat=tdi('\results::thomson:fir_thom_rat');
- tracefirrat.dim{1}=time;
+ if isempty(tracefirrat.data) || ischar(tracefirrat.data)
+ disp('problem with \results::thomson.profiles.auto:fir_thom_rat: empty')
+ tracefirrat.dim{1}=[];
+ else
+ tracefirrat.dim{1}=time;
+ end
end
- tracefirrat_data=NaN*ones(size(tracetdi.dim{1}));
- if ~isempty(tracefirrat.data)
+ if ~isempty(tracefirrat.data) || ischar(tracefirrat.data)
+ tracefirrat_data=NaN*ones(size(tracetdi.dim{1}));
itim=iround(time,tracefirrat.dim{1});
tracefirrat_data(itim)=tracefirrat.data;
+ else
+ tracefirrat_data=NaN;
end
else
nodenameeff='\results::thomson:te';
--
GitLab