diff --git a/matlab/JET/gdat_jet.m b/matlab/JET/gdat_jet.m index 8c3102be3373ecc67c3e4173fe80a72e9df32f9f..17a407b30d6b5ab3b06868257eec3482b935332f 100644 --- a/matlab/JET/gdat_jet.m +++ b/matlab/JET/gdat_jet.m @@ -73,7 +73,7 @@ default_machine = 'jet'; gdat_params.machine=default_machine; gdat_params.doplot = 0; gdat_params.nverbose = 1; - +keyboard % construct list of keywords from global set of keywords and specific JET set % get data_request names from centralized table %%% data_request_names = get_data_request_names; % do not use xlsx anymore but scan respective machine_requests_mapping.m files diff --git a/matlab/JET/rda_jet.m b/matlab/JET/rda_jet.m index d1d52bbbfa96fa303478d2445a55724e6409c67e..7dd31b3888ce46de0798a902ec3eb35f7243ab97 100644 --- a/matlab/JET/rda_jet.m +++ b/matlab/JET/rda_jet.m @@ -32,7 +32,7 @@ if usemdsplus if ~unix('test -d /home/duval/mdsplus') % addpath('/home/duval/mdsplus') end - mdsconnect('mdsplus.jet.efda.org'); + mdsconnect('ssh://osauter@mdsplus.jetdata.eu'); mdsvalue('reset_public()'); % defines trace to fetch % after '?' specific details @@ -111,7 +111,7 @@ if usemdsplus traceeff=[traceeff '/' num2str(seq)]; end user=getenv('USER'); - mdsconnect('mdsplus.jet.efda.org'); + mdsconnect('ssh://osauter@mdsplus.jetdata.eu'); eval(['[data,error]=mdsvalue(''_rdaeff' user '=jet("' traceeff '",' num2str(shot) ')'');']) hsig=[]; ss=size(data); @@ -120,13 +120,13 @@ if usemdsplus nbofdim=max(nbofdim,1); switch nbofdim case 1 - mdsconnect('mdsplus.jet.efda.org'); + mdsconnect('ssh://osauter@mdsplus.jetdata.eu'); eval(['time=mdsvalue(''dim_of(_rdaeff' user ',0)'');']); x=[]; if isempty(time) & length(data)>1e6 & strcmpi(type,'lpf') & strcmpi(diag,'kc1f') mdsdisconnect; - mdsconnect('mdsplus.jet.efda.org'); - mdsconnect('mdsplus.jet.efda.org'); + mdsconnect('ssh://osauter@mdsplus.jetdata.eu'); + mdsconnect('ssh://osauter@mdsplus.jetdata.eu'); eval(['aaa=mdsvalue(''_tc91=jet("jpf/da/c1-tc91",' num2str(shot) ');1'');']) taaa=mdsvalue('_ttc91=dim_of(_tc91,0);_ttc91[0]'); time=linspace(taaa+1e-6,taaa+4,length(data))'; @@ -135,23 +135,23 @@ if usemdsplus ichannel=findstr(':00',maintrace); iblock=str2num(maintrace(ichannel+3)); mdsdisconnect; - mdsconnect('mdsplus.jet.efda.org'); + mdsconnect('ssh://osauter@mdsplus.jetdata.eu'); taaa=39.9989+(iblock-1)*8; time=linspace(taaa,taaa+8-4e-6,length(data))'; end case 2 - mdsconnect('mdsplus.jet.efda.org'); + mdsconnect('ssh://osauter@mdsplus.jetdata.eu'); eval(['x=mdsvalue(''dim_of(_rdaeff' user ',0)'');']); - mdsconnect('mdsplus.jet.efda.org'); + mdsconnect('ssh://osauter@mdsplus.jetdata.eu'); eval(['time=mdsvalue(''dim_of(_rdaeff' user ',1)'');']); case 3 - mdsconnect('mdsplus.jet.efda.org'); + mdsconnect('ssh://osauter@mdsplus.jetdata.eu'); eval(['x=mdsvalue(''dim_of(_rdaeff' user ',0)'');']); - mdsconnect('mdsplus.jet.efda.org'); + mdsconnect('ssh://osauter@mdsplus.jetdata.eu'); eval(['time=mdsvalue(''dim_of(_rdaeff' user ',1)'');']); disp('3rd dimension in hsig!!!!!!!!!!!!!!!!!!!!!!!!!') - mdsconnect('mdsplus.jet.efda.org'); + mdsconnect('ssh://osauter@mdsplus.jetdata.eu'); eval(['hsig=mdsvalue(''dim_of(_rdaeff' user ',2)'');']); otherwise