diff --git a/crpptbx/AUG/loadAUGdata.m b/crpptbx/AUG/loadAUGdata.m index 3887eb8adece10d0f76e6822a27f01a21ac0dd87..9d03424fda5d70f09b8d0025acddfe2a0e85270c 100644 --- a/crpptbx/AUG/loadAUGdata.m +++ b/crpptbx/AUG/loadAUGdata.m @@ -775,10 +775,11 @@ switch AUGkeywrdcase{index} catch end try - % [aZ,e]=rdaAUG_eff(shot,ppftype,'z-A',shotfile_exp_eff,timerange); (problem now) - aZ=aR; - aZ.data=ones(size(aR.data)); + [aZ,e]=rdaAUG_eff(shot,ppftype,'z-A',shotfile_exp_eff,timerange); % (problem now) + %aZ=aR; + %aZ.data=ones(size(aR.data)); catch + disp(['problem with getting z-A in ' ppftype]) end domatchRtime=0; if domatchRtime @@ -824,7 +825,7 @@ switch AUGkeywrdcase{index} zout=trace.Z.data(iok,it_ece_inequil); psi_at_routzout = interpos2Dcartesian(rr,zz,psirz_in,rout,zout); psi_out(iok,it_ece_inequil) = reshape(psi_at_routzout,length(iok),length(it_ece_inequil)); - rhopsinorm_out(iok,it_ece_inequil) = sqrt((psi_out(iok,it_ece_inequil)-equil.psi_axis(itequil))./(equil.psi_lcfs(itequil)-equil.psi_axis(itequil))); + rhopsinorm_out(iok,it_ece_inequil) = sqrt(abs((psi_out(iok,it_ece_inequil)-equil.psi_axis(itequil))./(equil.psi_lcfs(itequil)-equil.psi_axis(itequil)))); for it_cx=1:length(it_ece_inequil) rhotornorm_out(iok,it_ece_inequil(it_cx)) = interpos(equil.rhopolnorm(:,itequil),equil.rhotornorm(:,itequil),rhopsinorm_out(iok,it_ece_inequil(it_cx)),-3,[2 2],[0 1]); rhovolnorm_out(iok,it_ece_inequil(it_cx)) = interpos(equil.rhopolnorm(:,itequil),equil.rhovolnorm(:,itequil),rhopsinorm_out(iok,it_ece_inequil(it_cx)),-3,[2 2],[0 1]);