From 9a7452251002f7270a44d74a1fc8a0b247386ca4 Mon Sep 17 00:00:00 2001
From: Olivier Sauter <olivier.sauter@epfl.ch>
Date: Thu, 25 Apr 2002 15:21:09 +0000
Subject: [PATCH] add cats lpf
git-svn-id: https://spcsvn.epfl.ch/repos/TCV/gdat/trunk@1884 d63d8f72-b253-0410-a779-e742ad2e26cf
---
JET/loadJETdata.m | 6 ++++--
JET/rda_eff.m | 8 ++++++++
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/JET/loadJETdata.m b/JET/loadJETdata.m
index 870b175a..1d0f0eac 100644
--- a/JET/loadJETdata.m
+++ b/JET/loadJETdata.m
@@ -26,8 +26,10 @@ function [trace,error,varargout]=loadJETdata(shot,data_type,varargin)
% 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
%
-% for simplicity also allows:
-% gdat(51994,'ppf/efit/xip',1,'JET',....)
+% examples:
+% aa=gdat(51994,'ppf/efit/xip',1,'JET');
+% aa=gdat(55379,'jpf/di/c1f-chan8/131?type=lpf+diag=kc1f',1); % KC1F
+% aa=gdat(53290,'jpf/di/c3-cats<c:001?type=lpf+diag=cats1',0,'JET') % long magnetic 8s by 001, 002, 003, 004 blocks
%
% INPUT:
% shot: shot number
diff --git a/JET/rda_eff.m b/JET/rda_eff.m
index 07990e24..f0c13b85 100644
--- a/JET/rda_eff.m
+++ b/JET/rda_eff.m
@@ -128,6 +128,14 @@ if usemdsplus
taaa=mdsvalue('_ttc91=dim_of(_tc91,0);_ttc91[0]');
time=linspace(taaa+1e-6,taaa+4,length(data))';
end
+ if isempty(time) & length(data)>1e6 & strcmpi(type,'lpf') & strcmpi(diag,'cats1')
+ ichannel=findstr(':00',maintrace);
+ iblock=str2num(maintrace(ichannel+3));
+ mdsdisconnect;
+ mdsconnect('mdsplus.jet.efda.org');
+ taaa=40+(iblock-1)*8;
+ time=linspace(taaa,taaa+8-4e-6,length(data))';
+ end
case 2
eval(['x=mdsvalue(''dim_of(_rdaeff' user ',0)'');']);
eval(['time=mdsvalue(''dim_of(_rdaeff' user ',1)'');']);
--
GitLab