From 73c96bc8654861a3ebc3f82f2cd7edec5828185b Mon Sep 17 00:00:00 2001
From: Olivier Sauter <olivier.sauter@epfl.ch>
Date: Fri, 8 Feb 2019 18:01:46 +0000
Subject: [PATCH] get mdsplususe for AUG working, rm mdsconnect and disconnect
from rdaaUG_eff
git-svn-id: https://spcsvn.epfl.ch/repos/TCV/gdat/trunk@11417 d63d8f72-b253-0410-a779-e742ad2e26cf
---
crpptbx/AUG/README_mdsplus | 2 ++
crpptbx/AUG/rdaAUG_eff.m | 31 ++++++++++++++++++-------------
2 files changed, 20 insertions(+), 13 deletions(-)
diff --git a/crpptbx/AUG/README_mdsplus b/crpptbx/AUG/README_mdsplus
index 6797cef0..54ae0ddd 100644
--- a/crpptbx/AUG/README_mdsplus
+++ b/crpptbx/AUG/README_mdsplus
@@ -6,6 +6,8 @@ need 2 windows
slogin -losauter -L 8001:seaug.ipp.mpg.de:8000 gate1.aug.ipp.mpg.de
(mdsplus too slow now)
+test 2019:
+ssh -losauter -L 8001:mdsplus.aug.ipp.mpg.de:8000 gate1.aug.ipp.mpg.de
In other window, open matlab and do:
mdsconnect('localhost:8001')
diff --git a/crpptbx/AUG/rdaAUG_eff.m b/crpptbx/AUG/rdaAUG_eff.m
index feba603e..afb87866 100644
--- a/crpptbx/AUG/rdaAUG_eff.m
+++ b/crpptbx/AUG/rdaAUG_eff.m
@@ -36,15 +36,15 @@ if usemdsplus
% use mdsplus
- if ~unix('test -d /home/duval/mdsplus')
- addpath('/home/duval/mdsplus')
- end
+% $$$ if ~unix('test -d /home/duval/mdsplus')
+% $$$ addpath('/home/duval/mdsplus')
+% $$$ end
- if ~unix('test -d /home/osauter/gdat')
- mdsconnect('localhost:8001');
- else
- mdsconnect('localhost');
- end
+% $$$ if ~unix('test -d /home/osauter/gdat')
+% $$$ mdsconnect('localhost:8001');
+% $$$ else
+% $$$ mdsconnect('localhost');
+% $$$ end
user=getenv('USER');
if nargin>=5 & ~isempty(varargin{1})
@@ -59,7 +59,7 @@ if usemdsplus
hsig=[];
ss=size(data);
nbofdim=length(ss);
- if ss(end)==1; nbofdim=nbofdim-1; end
+ if prod(ss)==length(data); nbofdim=1; end
nbofdim=max(nbofdim,1);
switch nbofdim
case 1
@@ -81,13 +81,16 @@ if usemdsplus
error('in rdaAUG_eff')
end
+
adata.t=time;
adata.x=x;
adata.hsig=hsig;
- mdsdisconnect;
- if ~unix('test -d /home/duval/mdsplus')
- rmpath('/home/duval/mdsplus')
- end
+ eval(['adata.units=mdsvalue(''units_of(_rdaeff' user diagname ')'');']);
+ adata.units=deblank(adata.units);
+ %mdsdisconnect;
+% $$$ if ~unix('test -d /home/duval/mdsplus')
+% $$$ rmpath('/home/duval/mdsplus')
+% $$$ end
else
% use sf2sig
@@ -119,6 +122,8 @@ else
end
end
+ adata.units = [];
+
if isempty(adata.value)
return
end
--
GitLab