From b83724e477f4fbd4cfa1fc8d7e7febd4fe02fa09 Mon Sep 17 00:00:00 2001
From: Olivier Sauter <olivier.sauter@epfl.ch>
Date: Wed, 24 Jan 2007 19:17:44 +0000
Subject: [PATCH] prepare for ppfdat
git-svn-id: https://spcsvn.epfl.ch/repos/TCV/gdat/trunk@1906 d63d8f72-b253-0410-a779-e742ad2e26cf
---
JET/loadJETdata.m | 41 ++++++++++++++++++++++++++---------------
1 file changed, 26 insertions(+), 15 deletions(-)
diff --git a/JET/loadJETdata.m b/JET/loadJETdata.m
index 2b48d445..48cd88d6 100644
--- a/JET/loadJETdata.m
+++ b/JET/loadJETdata.m
@@ -580,25 +580,36 @@ switch JETkeywrdcase{index}
ppftype='ppf';
tracename=['kk3/te' num2str(i,'%2.2d') name_ext];
disp(tracename)
- [a,x,t,d,e]=rda_eff(shot,ppftype,tracename);
- if isempty(a) & size(trace.data,2)>1
- trace.data(i,:)=NaN;
+ a=which('ppfdat');
+ if ~isempty(a)
+ [a,x,t,d,e]=rda_eff(shot,ppftype,tracename);
+ if isempty(a) & size(trace.data,2)>1
+ trace.data(i,:)=NaN;
+ else
+ trace.data(i,:)=a;
+ trace.t=t;
+ end
+ if ~isempty(x); trace.x(i,:)=x'; end;
+ error=e;
else
- trace.data(i,:)=a;
- trace.t=t;
+ [nx, nt, data, x, t, ierr, matlabErr, szErr ] = ...
+ ppfdat(shot, 'kk3', ['te' num2str(i,'%2.2d')])
end
- if ~isempty(x); trace.x(i,:)=x'; end;
- error=e;
+
ppftypeR='ppf';
tracenameR=['kk3/rc' num2str(i,'%2.2d') name_ext];
- [a,x,t,d,e]=rda_eff(shot,ppftypeR,tracenameR);
- if isempty(a) & size(trace.data,2)>1
- radius.data(i,:)=NaN;
- else
- radius.data(i,:)=a;
- radius.t=t;
- radius.x=x;
- end
+ a=which('ppfdat');
+ if ~isempty(a)
+ [a,x,t,d,e]=rda_eff(shot,ppftypeR,tracenameR);
+ if isempty(a) & size(trace.data,2)>1
+ radius.data(i,:)=NaN;
+ else
+ radius.data(i,:)=a;
+ radius.t=t;
+ radius.x=x;
+ end
+ else
+ end
end
end
trace.dim=[{[starti:endi]'} ; {trace.t}];
--
GitLab