Skip to content
Snippets Groups Projects
Commit 73c96bc8 authored by Olivier Sauter's avatar Olivier Sauter
Browse files

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
parent 5a48b159
No related branches found
No related tags found
No related merge requests found
...@@ -6,6 +6,8 @@ need 2 windows ...@@ -6,6 +6,8 @@ need 2 windows
slogin -losauter -L 8001:seaug.ipp.mpg.de:8000 gate1.aug.ipp.mpg.de slogin -losauter -L 8001:seaug.ipp.mpg.de:8000 gate1.aug.ipp.mpg.de
(mdsplus too slow now) (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: In other window, open matlab and do:
mdsconnect('localhost:8001') mdsconnect('localhost:8001')
......
...@@ -36,15 +36,15 @@ if usemdsplus ...@@ -36,15 +36,15 @@ if usemdsplus
% use mdsplus % use mdsplus
if ~unix('test -d /home/duval/mdsplus') % $$$ if ~unix('test -d /home/duval/mdsplus')
addpath('/home/duval/mdsplus') % $$$ addpath('/home/duval/mdsplus')
end % $$$ end
if ~unix('test -d /home/osauter/gdat') % $$$ if ~unix('test -d /home/osauter/gdat')
mdsconnect('localhost:8001'); % $$$ mdsconnect('localhost:8001');
else % $$$ else
mdsconnect('localhost'); % $$$ mdsconnect('localhost');
end % $$$ end
user=getenv('USER'); user=getenv('USER');
if nargin>=5 & ~isempty(varargin{1}) if nargin>=5 & ~isempty(varargin{1})
...@@ -59,7 +59,7 @@ if usemdsplus ...@@ -59,7 +59,7 @@ if usemdsplus
hsig=[]; hsig=[];
ss=size(data); ss=size(data);
nbofdim=length(ss); nbofdim=length(ss);
if ss(end)==1; nbofdim=nbofdim-1; end if prod(ss)==length(data); nbofdim=1; end
nbofdim=max(nbofdim,1); nbofdim=max(nbofdim,1);
switch nbofdim switch nbofdim
case 1 case 1
...@@ -81,13 +81,16 @@ if usemdsplus ...@@ -81,13 +81,16 @@ if usemdsplus
error('in rdaAUG_eff') error('in rdaAUG_eff')
end end
adata.t=time; adata.t=time;
adata.x=x; adata.x=x;
adata.hsig=hsig; adata.hsig=hsig;
mdsdisconnect; eval(['adata.units=mdsvalue(''units_of(_rdaeff' user diagname ')'');']);
if ~unix('test -d /home/duval/mdsplus') adata.units=deblank(adata.units);
rmpath('/home/duval/mdsplus') %mdsdisconnect;
end % $$$ if ~unix('test -d /home/duval/mdsplus')
% $$$ rmpath('/home/duval/mdsplus')
% $$$ end
else else
% use sf2sig % use sf2sig
...@@ -119,6 +122,8 @@ else ...@@ -119,6 +122,8 @@ else
end end
end end
adata.units = [];
if isempty(adata.value) if isempty(adata.value)
return return
end end
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment