diff --git a/crpptbx/AUG/README_mdsplus b/crpptbx/AUG/README_mdsplus index 6797cef0c648c14c3d9d9124d225a3fc42ac2a59..54ae0ddd50be4030ffbc2041c99363a9d0181d62 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 feba603e99adb70c987bf8624a95cfb4fd18395b..afb878666062ec17518f89961b689f395e69d6ac 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