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

fix indenting (not yet ok at ipp new cluster)

parent ec9728d4
No related branches found
No related tags found
1 merge request!164Fix mdsplus aug type
Pipeline #205071 passed
...@@ -166,7 +166,7 @@ if usemdsplus ...@@ -166,7 +166,7 @@ if usemdsplus
if isempty(param_name) && isempty(param_set_name) && ~area_base && ~time_base if isempty(param_name) && isempty(param_set_name) && ~area_base && ~time_base
% use augsignal to get effective layout as in ISIS and sf2sig, for example for EQI/PFM % use augsignal to get effective layout as in ISIS and sf2sig, for example for EQI/PFM
eval(['[data,error]=mdsvalue(''_rdaeff' user diagname '=augsignal(' num2str(shot) ',"' diagname '","' sigtype '","' shotfile_exp ... eval(['[data,error]=mdsvalue(''_rdaeff' user diagname '=augsignal(' num2str(shot) ',"' diagname '","' sigtype '","' shotfile_exp ...
'",' ed_number ',' tstart ',' tend ',_oshot' user diagname ',_oed' user diagname ',' ask_raw ')'');']); '",' ed_number ',' tstart ',' tend ',_oshot' user diagname ',_oed' user diagname ',' ask_raw ')'');']);
if isnumeric(data), data=double(data); end if isnumeric(data), data=double(data); end
elseif isempty(param_set_name) && ~area_base && ~time_base elseif isempty(param_set_name) && ~area_base && ~time_base
% use augparam % use augparam
...@@ -246,46 +246,46 @@ if usemdsplus ...@@ -246,46 +246,46 @@ if usemdsplus
if prod(ss)==length(data); 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
adata.data=reshape(adata.data,1,length(adata.data)); adata.data=reshape(adata.data,1,length(adata.data));
idim0 = 0; idim0 = 0;
eval(['time=mdsvalue(''dim_of(_rdaeff' user diagname ',' num2str(idim0) ')'');']);
if isnumeric(time), time=double(time); end
if numel(time) ~= numel(adata.data)
idim0 = 1;
eval(['time=mdsvalue(''dim_of(_rdaeff' user diagname ',' num2str(idim0) ')'');']); eval(['time=mdsvalue(''dim_of(_rdaeff' user diagname ',' num2str(idim0) ')'');']);
if isnumeric(time), time=double(time); end if isnumeric(time), time=double(time); end
if numel(time) ~= numel(adata.data) && (ischar(adata.data) && isempty(strfind(lower(adata.data),'abort'))) if numel(time) ~= numel(adata.data)
warning(['problem with dim for: ' diagname ', ' sigtype]) idim0 = 1;
eval(['time=mdsvalue(''dim_of(_rdaeff' user diagname ',' num2str(idim0) ')'');']);
if isnumeric(time), time=double(time); end
if numel(time) ~= numel(adata.data) && (ischar(adata.data) && isempty(strfind(lower(adata.data),'abort')))
warning(['problem with dim for: ' diagname ', ' sigtype])
end
end end
end time = reshape(time,1,length(time));
time = reshape(time,1,length(time)); x=[];
x=[]; adata.dim = {time};
adata.dim = {time}; eval(['tunits=mdsvalue(''units_of(dim_of(_rdaeff' user diagname ',' num2str(idim0) '))'');']);
eval(['tunits=mdsvalue(''units_of(dim_of(_rdaeff' user diagname ',' num2str(idim0) '))'');']); adata.dimunits = {tunits};
adata.dimunits = {tunits}; case 2
case 2 if strcmp(upper(diagname),'IDA') && ~usemdsplus
if strcmp(upper(diagname),'IDA') && ~usemdsplus % rho, time in original dimension, so do not transpose (seems different with mdsplus... to check)
% rho, time in original dimension, so do not transpose (seems different with mdsplus... to check) idim_x = 0;
idim_x = 0; idim_t = 1;
idim_t = 1; else
else adata.data = adata.data';
adata.data = adata.data'; did_transpose = 1;
did_transpose = 1; idim_x = 1;
idim_x = 1; idim_t = 0;
idim_t = 0; end
end % transposed because of C relation and backward compatibility with sf2sig part
% transposed because of C relation and backward compatibility with sf2sig part eval(['x=mdsvalue(''dim_of(_rdaeff' user diagname ',' num2str(idim_x) ')'');']);
eval(['x=mdsvalue(''dim_of(_rdaeff' user diagname ',' num2str(idim_x) ')'');']); if isnumeric(x), x=double(x); end
if isnumeric(x), x=double(x); end if prod(size(x))==length(x); x = reshape(x,1,length(x)); end
if prod(size(x))==length(x); x = reshape(x,1,length(x)); end eval(['time=mdsvalue(''dim_of(_rdaeff' user diagname ',' num2str(idim_t) ')'');']);
eval(['time=mdsvalue(''dim_of(_rdaeff' user diagname ',' num2str(idim_t) ')'');']); if isnumeric(time), time=double(time); end
if isnumeric(time), time=double(time); end time = reshape(time,1,length(time));
time = reshape(time,1,length(time)); adata.dim = {x, time};
adata.dim = {x, time}; eval(['xunits=deblank(mdsvalue(''units_of(dim_of(_rdaeff' user diagname ',' num2str(idim_x) '))''));']);
eval(['xunits=deblank(mdsvalue(''units_of(dim_of(_rdaeff' user diagname ',' num2str(idim_x) '))''));']); eval(['tunits=deblank(mdsvalue(''units_of(dim_of(_rdaeff' user diagname ',' num2str(idim_t) '))''));']);
eval(['tunits=deblank(mdsvalue(''units_of(dim_of(_rdaeff' user diagname ',' num2str(idim_t) '))''));']); adata.dimunits = {xunits, tunits};
adata.dimunits = {xunits, tunits};
% $$$ case 3 % $$$ case 3
% $$$ eval(['x=mdsvalue(''dim_of(_rdaeff' user diagname ',0)'');']); % $$$ eval(['x=mdsvalue(''dim_of(_rdaeff' user diagname ',0)'');']);
...@@ -315,14 +315,14 @@ if usemdsplus ...@@ -315,14 +315,14 @@ if usemdsplus
% $$$ hsigunits = adata.dimunits{ihsig}; % $$$ hsigunits = adata.dimunits{ihsig};
% $$$ adata.dimunits = {xunits, tunits, hsigunits}; % $$$ adata.dimunits = {xunits, tunits, hsigunits};
otherwise otherwise
itime = 1; % default itime = 1; % default
for i=1:nbofdim for i=1:nbofdim
eval(['dimarray=mdsvalue(''dim_of(_rdaeff' user diagname ',' num2str(i-1) ')'');']); eval(['dimarray=mdsvalue(''dim_of(_rdaeff' user diagname ',' num2str(i-1) ')'');']);
if isnumeric(dimarray), dimarray=double(dimarray); end if isnumeric(dimarray), dimarray=double(dimarray); end
if prod(size(dimarray)) == length(dimarray) if prod(size(dimarray)) == length(dimarray)
eval(['adata.dim{' num2str(i) '}=reshape(dimarray,1,length(dimarray));']); eval(['adata.dim{' num2str(i) '}=reshape(dimarray,1,length(dimarray));']);
else else
eval(['adata.dim{' num2str(i) '} = dimarray;']); eval(['adata.dim{' num2str(i) '} = dimarray;']);
end end
eval(['adata.dimunits{' num2str(i) '}=deblank(mdsvalue(''units_of(dim_of(_rdaeff' user diagname ',' num2str(i-1) '))''));']); eval(['adata.dimunits{' num2str(i) '}=deblank(mdsvalue(''units_of(dim_of(_rdaeff' user diagname ',' num2str(i-1) '))''));']);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment