From 99883c25a690908c38192209e94c28b5386dcff2 Mon Sep 17 00:00:00 2001
From: Olivier Sauter <olivier.sauter@epfl.ch>
Date: Mon, 21 Jan 2002 10:41:12 +0000
Subject: [PATCH] debug sxR
git-svn-id: https://spcsvn.epfl.ch/repos/TCV/gdat/trunk@1859 d63d8f72-b253-0410-a779-e742ad2e26cf
---
JET/loadJETdata.m | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
diff --git a/JET/loadJETdata.m b/JET/loadJETdata.m
index 2eae4799..4fa043bd 100644
--- a/JET/loadJETdata.m
+++ b/JET/loadJETdata.m
@@ -443,18 +443,25 @@ switch JETkeywrdcase{index}
else
status=ones(endi-starti+1,1);
end
+ trace.t=[];
+ trace.x=[];
for i=starti:endi
% Read channels from lowchannel to upchannel if necessary
if status(i)==1
% Status=1 => Not Read Yet
% vertical SXR chords
ppftype='jpf';
- tracename=['db/j3-sxr<v' num2str(i) '''''/1' name_ext]
+ tracename=['db/j3-sxr<v' num2str(i) '''''/1' name_ext];
+ tracename=['db/j3-sxr<v' num2str(i) '/1' name_ext];
[a,x,t,d,e]=rda_eff(shot,ppftype,tracename);
% Convert from raw sxr data to W/m^2
- trace.data(i,:) = a * vconvert(i);
- trace.t=t;
- trace.x(i,:)=x;
+ if ~isempty(a)
+ trace.data(i,:) = a * vconvert(i);
+ trace.t=t;
+ if ~isempty(x)
+ trace.x(i,:)=x;
+ end
+ end
error=e;
end
trace.dim=[{[starti:endi]'} ; {trace.t}];
@@ -473,7 +480,7 @@ switch JETkeywrdcase{index}
radius(i,:)=2.848 + (2.172-zmageff') .* tan(-4.5/180.*3.14159 - atan2(0.99.*(i-18),35.31));
end
varargout={{radius}};
- trace.R=radius.data;
+ trace.R=radius;
end
%&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&
--
GitLab