diff --git a/matlab/TCV/gdat_tcv.m b/matlab/TCV/gdat_tcv.m index 56d436ce8f5e95f0e72dac0763d3cb3aca775138..516e2f1995804b278e701b98186d957dab13cb93 100644 --- a/matlab/TCV/gdat_tcv.m +++ b/matlab/TCV/gdat_tcv.m @@ -1675,15 +1675,15 @@ elseif strcmp(mapping_for_tcv.method,'switchcase') rmesh=psitdi.dim{1}; zmesh=psitdi.dim{2}; zthom=mdsdata(['dim_of(\thomson' edge_str_dot ':te,1)']); - zeffshift=zshift; - % set zeffshift time array same as psitdi - switch length(zeffshift) + zshifteff=zshift; + % set zshifteff time array same as psitdi + switch length(zshifteff) case 1 - zeffshift=zeffshift * ones(size(psitdi.dim{3})); + zshifteff=zshifteff * ones(size(psitdi.dim{3})); case length(psitdi.dim{3}) % ok case length(gdat_data.t) - zeffshift=interp1(gdat_data.t,zeffshift,psitdi.dim{3}); + zshifteff=interp1(gdat_data.t,zshifteff,psitdi.dim{3}); otherwise if (gdat_params.nverbose>=1); disp(' bad time dimension for zshift') @@ -1693,9 +1693,9 @@ elseif strcmp(mapping_for_tcv.method,'switchcase') for it=1:length(gdat_data.t) itpsitdi=iround_os(psitdi.dim{3},gdat_data.t(it)); psirz=psitdi.data(:,:,itpsitdi); - %psiscatvol0=interp2(rmesh,zmesh,psirz',0.9*ones(size(zthom)),zthom-zeffshift(itpsitdi),'spline'); % faster with interpos - psiscatvol0=interpos2Dcartesian(rmesh,zmesh,psirz,0.9*ones(size(zthom)),zthom-zeffshift(itpsitdi),-0.1,-0.1); - %psiscatvol0=interp2(rmesh,zmesh,psirz',0.9*ones(size(zthom)),zthom-zeffshift(itpsitdi),'linear'); + %psiscatvol0=interp2(rmesh,zmesh,psirz',0.9*ones(size(zthom)),zthom-zshifteff(itpsitdi),'spline'); % faster with interpos + psiscatvol0=interpos2Dcartesian(rmesh,zmesh,psirz,0.9*ones(size(zthom)),zthom-zshifteff(itpsitdi),-0.1,-0.1); + %psiscatvol0=interp2(rmesh,zmesh,psirz',0.9*ones(size(zthom)),zthom-zshifteff(itpsitdi),'linear'); psiscatvol.data(it,:)=psiscatvol0; % since take closest psi(R,Z) from psitdi, should also take closest for psi_max and not interpolating itpsiaxis = iround_os(psiaxis.dim{1},gdat_data.t(it));