From 6975f74a6f25c62dd427ae53a891e7f9d0f29af3 Mon Sep 17 00:00:00 2001
From: Olivier Sauter <olivier.sauter@epfl.ch>
Date: Wed, 24 Apr 2002 07:53:52 +0000
Subject: [PATCH] no mdsplus from AUG to AUG, and add nth sxr point option
git-svn-id: https://spcsvn.epfl.ch/repos/TCV/gdat/trunk@1880 d63d8f72-b253-0410-a779-e742ad2e26cf
---
AUG/loadAUGdata.m | 6 +++++-
gdat.m | 2 ++
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/AUG/loadAUGdata.m b/AUG/loadAUGdata.m
index 5de09317..208fa2ef 100644
--- a/AUG/loadAUGdata.m
+++ b/AUG/loadAUGdata.m
@@ -296,6 +296,11 @@ switch AUGkeywrdcase{index}
else
timerange=[1 7];
end
+ if nargin>=7 & ~isempty(varargin{5})
+ nth=varargin{5};
+ else
+ nth=13;
+ end
trace.t=[];
trace.x=[];
ppftype='SXR';
@@ -308,7 +313,6 @@ switch AUGkeywrdcase{index}
trace.units='W/m^2';
trace.name=[num2str(shot) '/' ppftype '/' tracename];
% keep only nth points
- nth=13;
trace.t=trace.t(1:nth:end);
trace.data=trace.data(:,1:nth:end);
trace.dim{2}=trace.t;
diff --git a/gdat.m b/gdat.m
index 590c32e0..a0943271 100644
--- a/gdat.m
+++ b/gdat.m
@@ -112,6 +112,8 @@ machine='TCV';
a=which('sawteeth');
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';
end
--
GitLab