From 2273b6f5007a788d633a40f6fd382d46d2f1263a Mon Sep 17 00:00:00 2001
From: Olivier Sauter <olivier.sauter@epfl.ch>
Date: Mon, 27 Sep 2004 07:12:28 +0000
Subject: [PATCH] add Halpha
git-svn-id: https://spcsvn.epfl.ch/repos/TCV/gdat/trunk@1894 d63d8f72-b253-0410-a779-e742ad2e26cf
---
JET/loadJETdata.m | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/JET/loadJETdata.m b/JET/loadJETdata.m
index 34640c3a..089321e8 100644
--- a/JET/loadJETdata.m
+++ b/JET/loadJETdata.m
@@ -23,6 +23,7 @@ function [trace,error,varargout]=loadJETdata(shot,data_type,varargin)
% 'ece' = electron cyclotron emission
% 'sxr' = soft x-ray emission
% 'sxR' = soft x-ray emission with varargout{1} option (requires varargin{5}!)
+% 'halpha'= Dalpha signal
%
% Special case compatible with old gdat.m allows (JET related):
% gdat(51994,'ppf','efit/xip',...) % omitting the 'JET' input as assumes JET if 3rd argument is a string
@@ -141,6 +142,9 @@ if size(data_type_eff,1)==1
if ~isempty(strmatch(data_type_eff_noext,[{'deltalow'} {'deltal'} {'triangbot'} {'triangl'} {'trianglow'}],'exact'))
data_type_eff_noext='deltabot';
end
+ if ~isempty(strmatch(data_type_eff_noext,[{'halpha'} {'Halpha'}],'exact'))
+ data_type_eff_noext='halpha';
+ end
if ~isempty(strmatch(data_type_eff_noext,[{'n1'} {'N1'}],'exact'))
data_type_eff_noext='n1';
end
@@ -172,7 +176,7 @@ end
% all keywords and corresponding case to run below
JETkeywrdall=[{'Ip'} {'zmag'} {'rmag'} {'rcont'} {'zcont'} {'vol'} {'qrho'} {'q95'} {'kappa'} ...
- {'delta'} {'deltatop'} {'deltabot'} {'n1'} {'n2'} {'neint'} ...
+ {'delta'} {'deltatop'} {'deltabot'} {'halpha'} {'n1'} {'n2'} {'neint'} ...
{'ne'} {'te'} {'nerho'} {'terho'} ...
{'sxr'} {'sxR'} {'ece'}];
JETsig.iip=strmatch('Ip',JETkeywrdall,'exact');
@@ -187,6 +191,7 @@ JETsig.ikappa=strmatch('kappa',JETkeywrdall,'exact');
JETsig.idelta=strmatch('delta',JETkeywrdall,'exact');
JETsig.ideltatop=strmatch('deltatop',JETkeywrdall,'exact');
JETsig.ideltabot=strmatch('deltabot',JETkeywrdall,'exact');
+JETsig.ihalpha=strmatch('halpha',JETkeywrdall,'exact');
JETsig.in1=strmatch('n1',JETkeywrdall,'exact');
JETsig.in2=strmatch('n2',JETkeywrdall,'exact');
JETsig.ineint=strmatch('neint',JETkeywrdall,'exact');
@@ -230,6 +235,7 @@ JETsiglocation(:,JETsig.iq95)={'ppf'; 'efit/q95'};
JETsiglocation(:,JETsig.ikappa)={'ppf'; 'efit/elon'};
JETsiglocation(:,JETsig.ideltatop)={'ppf'; 'efit/triu'};
JETsiglocation(:,JETsig.ideltabot)={'ppf'; 'efit/tril'};
+JETsiglocation(:,JETsig.ihalpha)={'jpf'; 'dd/s3-ad35'};
JETsiglocation(:,JETsig.in1)={'jpf'; 'da/c1-g101'};
JETsiglocation(:,JETsig.in2)={'jpf'; 'da/c1-g102'};
JETsiglocation(:,JETsig.ineint)={'ppf'; 'kg1v/lid3'};
@@ -525,7 +531,7 @@ switch JETkeywrdcase{index}
if nargin>=4 & ~isempty(varargin{2})
status=varargin{2};
else
- status=ones(endi-starti+1,1);
+ status=ones(endi,1);
end
% Read channels from lowchannel to upchannel if necessary
for i=starti:endi
--
GitLab