From 887529965aa3af286e5716839c4834151d8cc4c4 Mon Sep 17 00:00:00 2001 From: Olivier Sauter <olivier.sauter@epfl.ch> Date: Wed, 18 Jun 2003 00:46:40 +0000 Subject: [PATCH] add D3D git-svn-id: https://spcsvn.epfl.ch/repos/TCV/gdat/trunk@1893 d63d8f72-b253-0410-a779-e742ad2e26cf --- gdat.m | 6 ++++-- gdatpaths.m | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/gdat.m b/gdat.m index a0943271..236cdbe2 100644 --- a/gdat.m +++ b/gdat.m @@ -109,13 +109,15 @@ end doplot=0; if (nargineff>=3 & ~isempty(varargin{1})); doplot=varargin{1}; end machine='TCV'; -a=which('sawteeth'); +a=which('gdat'); if ~isempty(findstr('ipp',a)) | ~isempty(findstr('/u/osauter',a)); machine='AUG'; global usemdsplus; % so far from AUG, do not use mdsplus usemdsplus=0; elseif ~isempty(findstr('/home/osauter',a)); machine='JET'; +elseif ~isempty(findstr('/u/sauter',a)); + machine='D3D'; end if (nargineff>=4 & ~isempty(varargin{2})); machine=varargin{2}; end @@ -127,7 +129,7 @@ else end % PLOT DATA (if required) -if doplot==1 & length(trace.data)>1 +if doplot==1 & length(trace.data)>1 & ~ischar(trace.data) figure;zoom on if length(size(trace.data))<=2 plot(trace.t,trace.data); diff --git a/gdatpaths.m b/gdatpaths.m index a14d9c37..4c8d8313 100644 --- a/gdatpaths.m +++ b/gdatpaths.m @@ -7,7 +7,7 @@ a=which('gdat'); ii=findstr('/',a); a=a(1:ii(end)); -machines=[{'JET'} {'TCV'} {'AUG'}]; +machines=[{'JET'} {'TCV'} {'AUG'} {'D3D'}]; for i=1:length(machines) addpath([a machines{i}]) -- GitLab