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

working before change source to equil for setting efit source to match previous setup for aug

git-svn-id: https://spcsvn.epfl.ch/repos/TCV/gdat/trunk@7306 d63d8f72-b253-0410-a779-e742ad2e26cf
parent 85a0b9c0
No related branches found
No related tags found
No related merge requests found
...@@ -67,7 +67,7 @@ default_machine = 'd3d'; ...@@ -67,7 +67,7 @@ default_machine = 'd3d';
gdat_params.machine=default_machine; gdat_params.machine=default_machine;
gdat_params.doplot = 0; gdat_params.doplot = 0;
gdat_params.exp_name = 'D3DD'; gdat_params.exp_name = 'D3D';
gdat_params.nverbose = 1; gdat_params.nverbose = 1;
% construct list of keywords from global set of keywords and specific D3D set % construct list of keywords from global set of keywords and specific D3D set
...@@ -257,7 +257,11 @@ if strcmp(mapping_for_d3d.method,'signal') ...@@ -257,7 +257,11 @@ if strcmp(mapping_for_d3d.method,'signal')
mapping_for_d3d.expression{1} = gdat_data.gdat_params.source; mapping_for_d3d.expression{1} = gdat_data.gdat_params.source;
end end
shoteff = []; shoteff = [];
aa=mdscurrent; if exist('mdscurrent') > 0
aa=mdscurrent;
else
aa='will connect';
end
if ~isempty(shot) if ~isempty(shot)
if isempty(aa) && mdsremotelist==0 && any(findstr('epfl',getenv('HOSTNAME'))) if isempty(aa) && mdsremotelist==0 && any(findstr('epfl',getenv('HOSTNAME')))
mdsconnect('localhost:5556'); mdsconnect('localhost:5556');
...@@ -708,6 +712,7 @@ elseif strcmp(mapping_for_d3d.method,'switchcase') ...@@ -708,6 +712,7 @@ elseif strcmp(mapping_for_d3d.method,'switchcase')
gdat_data.gdat_params.source = 'efit03'; gdat_data.gdat_params.source = 'efit03';
else else
end end
gdat_data.gdat_params.equil = gdat_data.gdat_params.source;
if exist('read_mds_eq_func')<=0 if exist('read_mds_eq_func')<=0
if gdat_params.nverbose>=3; disp(['addpath(''/m/GAtools/matlab/efit'',''end'') since needs function read_mds_eq_func']); end if gdat_params.nverbose>=3; disp(['addpath(''/m/GAtools/matlab/efit'',''end'') since needs function read_mds_eq_func']); end
addpath('/m/GAtools/matlab/efit','end'); addpath('/m/GAtools/matlab/efit','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