minor diagnostics added

git-svn-id: https://spcsvn.epfl.ch/repos/TCV/gdat/trunk@1845 d63d8f72-b253-0410-a779-e742ad2e26cf

JET/geteqdskJET.m

@@ -59,7 +59,9 @@ Rbnd=gdat(shot,['ppf/' efitlab '/RBND' s_extra],0,'JET');
 tefit=Rbnd.t;
 [zz index_efit]=min(abs(tefit-time));
 time_efit=tefit(index_efit);
+disp('&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&')
 disp(['efit at t=' num2str(time_efit)])
+disp('&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&')
 
 Rbnd=Rbnd.data(:,index_efit);
 Zbnd=gdat(shot,['ppf/' efitlab '/ZBND' s_extra],0,'JET');
@@ -100,6 +102,12 @@ bttd=gdat(shot,['ppf/' efitlab '/bttd' s_extra],0,'JET');
 bttd=bttd.data(index_efit);
 btnd=gdat(shot,['ppf/' efitlab '/btnd' s_extra],0,'JET');
 btnd=btnd.data(index_efit);
+btpm=gdat(shot,['ppf/' efitlab '/btpm' s_extra],0,'JET');
+btpm=btpm.data(index_efit);
+bttm=gdat(shot,['ppf/' efitlab '/bttm' s_extra],0,'JET');
+bttm=bttm.data(index_efit);
+btnm=gdat(shot,['ppf/' efitlab '/btnm' s_extra],0,'JET');
+btnm=btnm.data(index_efit);
 xli=gdat(shot,['ppf/' efitlab '/xli' s_extra],0,'JET');
 xli=xli.data(index_efit);
 
@@ -147,12 +155,14 @@ fprintf(fid,'%16.9e%16.9e%16.9e%16.9e%16.9e\n',zmag+deltaz,0.0,fbnd,-1,-1);
 
 % 6th entry: F(psi) on nr equidistant psi mesh
 psieq=[0:1/(nrg-1):1];
-[G Gprime]=interpos(13,psi_efit,-F,psieq);
+psi_efit_eff=faxs+psi_efit.*(fbnd-faxs);
+psieq_eff=faxs+psieq.*(fbnd-faxs);
+[G Gprime]=interpos(13,psi_efit_eff,-F,psieq_eff);
 fprintf(fid,'%16.9e%16.9e%16.9e%16.9e%16.9e\n',G(1:end-1));
 fprintf(fid,'%16.9e\n',G(end));
 
 % 7th entry: p(psi) on nr equidistant psi mesh
-[press pressprime]=interpos(13,psi_efit,P,psieq);
+[press pressprime]=interpos(13,psi_efit_eff,P,psieq_eff);
 fprintf(fid,'%16.9e%16.9e%16.9e%16.9e%16.9e\n',press(1:end-1));
 fprintf(fid,'%16.9e\n',press(end));
 
@@ -205,9 +215,12 @@ fprintf(fid,'%18.8e   q_edge, from int: %18.8e\n',Q(end),y(end));
 fprintf(fid,'%18.8e   q_95, from int: %18.8e\n',q95,y(96));
 [qmin ind]=min(y);
 fprintf(fid,'%18.8e   q_min, at psinorm= %18.8e\n',qmin,y(ind));
-fprintf(fid,'%18.8e   beta_pol\n',btpd);
-fprintf(fid,'%18.8e   beta_tor\n',bttd);
-fprintf(fid,'%18.8e   beta_N\n',btnd);
+fprintf(fid,'%18.8e   beta_pol(wdia)\n',btpd);
+fprintf(fid,'%18.8e   beta_pol(efit)\n',btpm);
+fprintf(fid,'%18.8e   beta_tor(wdia)\n',bttd);
+fprintf(fid,'%18.8e   beta_tor(efit)\n',bttm);
+fprintf(fid,'%18.8e   beta_N(wdia)\n',btnd);
+fprintf(fid,'%18.8e   beta_N(efit)\n',btnm);
 fprintf(fid,'%18.8e   li\n',xli);
 
 fprintf(fid,'\n%18.8e   time\n',time);

JET/loadJETdata.m

@@ -238,9 +238,9 @@ if size(data_type_eff,1)==2
     index=[];
   end
   if isempty(index)
-    disp('********************')
-    disp('trace not yet registered.')
-    disp('If standard data, ask andrea.scarabosio@epfl.ch or olivier.sauter@epfl.ch to create a keyqord entry for this data')
+% $$$     disp('********************')
+% $$$     disp('trace not yet registered.')
+% $$$     disp('If standard data, ask andrea.scarabosio@epfl.ch or olivier.sauter@epfl.ch to create a keyqord entry for this data')
 %    eval(['!mail -s ''' data_type_eff{1} ' ' data_type_eff{2} ' ' num2str(shot) ' ' ...
 %          getenv('USER') ' JET'' olivier.sauter@epfl.ch < /dev/null'])
     disp('********************')