rm artificial wdml corr but wait for updated dml

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

crpptbx/JET/jet_requests_mapping.m

@@ -201,21 +201,21 @@ switch lower(data_request)
   mapping.label = 'nG=Ip[MA]/(\pi a^2)*1e20 on nel times';
   mapping.method = 'expression';
   mapping.expression = ['params_eff = gdat_data.gdat_params;params_eff.data_request=''nel'';' ...
-                    'gdat_tmp=gdat_aug(shot,params_eff);params_eff.data_request=''ip'';' ...
-		    'gdat_tmp2=gdat_aug(shot,params_eff);ij=find(gdat_tmp2.data==0);gdat_tmp2.data(ij)=NaN;' ...
+                    'gdat_tmp=gdat_jet(shot,params_eff);params_eff.data_request=''ip'';' ...
+		    'gdat_tmp2=gdat_jet(shot,params_eff);ij=find(gdat_tmp2.data==0);gdat_tmp2.data(ij)=NaN;' ...
 		    'tmp_data2=interp1(gdat_tmp2.t,gdat_tmp2.data,gdat_tmp.t,[],NaN);' ...
                     'params_eff.data_request=''a_minor'';' ...
-		    'gdat_tmp3=gdat_aug(shot,params_eff);ij=find(gdat_tmp3.data==0);gdat_tmp3.data(ij)=NaN;' ...
+		    'gdat_tmp3=gdat_jet(shot,params_eff);ij=find(gdat_tmp3.data==0);gdat_tmp3.data(ij)=NaN;' ...
 		    'tmp_data3=interp1(gdat_tmp3.t,gdat_tmp3.data,gdat_tmp.t,[],NaN);' ...
-		    'gdat_tmp.data = tmp_data2*1e-6./pi./(tmp_data3.^2+1e-5);' ...
+		    'gdat_tmp.data = abs(tmp_data2*1e-6./pi./(tmp_data3.^2+1e-5));' ...
 		    'ij=find(gdat_tmp.data<0 | gdat_tmp.data>4);gdat_tmp.data(ij)=NaN;gdat_tmp.data = gdat_tmp.data * 1e20;'];
  case {'ngf','greenwald_fraction','f_greenwald','ng_fraction'}
   mapping.timedim = 1;
   mapping.label = 'Greenwald\_fraction=n\_el/n\_G';
   mapping.method = 'expression';
   mapping.expression = ['params_eff = gdat_data.gdat_params;params_eff.data_request=''nel'';' ...
-                    'gdat_tmp=gdat_aug(shot,params_eff);params_eff.data_request=''n_greenwald'';' ...
-		    'gdat_tmp2=gdat_aug(shot,params_eff);ij=find(gdat_tmp2.data==0);gdat_tmp2.data(ij)=NaN;' ...
+                    'gdat_tmp=gdat_jet(shot,params_eff);params_eff.data_request=''n_greenwald'';' ...
+		    'gdat_tmp2=gdat_jet(shot,params_eff);ij=find(gdat_tmp2.data==0);gdat_tmp2.data(ij)=NaN;' ...
 		    'tmp_data2=interp1(gdat_tmp2.t,gdat_tmp2.data,gdat_tmp.t,[],NaN);' ...
 		    'gdat_tmp.data = gdat_tmp.data./(tmp_data2+1e-5);'];
  case 'ni'

crpptbx/TCV/tcv_requests_mapping.m

@@ -362,22 +362,22 @@ switch lower(data_request)
   % mapping.expression = '\results::psitbx:vol'; (if exists for liuqe2 and 3 as well)
  case {'wmhd', 'w_mhd'}
   mapping.timedim = 1;
-  if shot==57716 || shot==57732
-    time_for_corr = [0.5,1.03];
-    corr = [4e3,4.5e3];
-    if shot==57732; corr=[4650,4650]; end
-    mapping.method = 'expression';
-    mapping.expression = ['params_eff = gdat_data.gdat_params;params_eff.data_request=''tcv_eq(''''''''w_mhd'''''''',''''''''LIUQE.M'''''''')'';' ...
-                    'gdat_tmp=gdat_tcv(shot,params_eff);ij=find(gdat_tmp.t>0.5&gdat_tmp.t<1.03);' ...
-                    'aa=interp1([' num2str(time_for_corr(1)) ' ' num2str(time_for_corr(2)) ...
-                    '],[' num2str(corr(1)) ' ' num2str(corr(2)) '],gdat_tmp.t(ij));' ...
-		    'gdat_tmp.data(ij)=max(gdat_tmp.data(ij),aa);'];
-  else
+% $$$   if shot==57716 || shot==57732
+% $$$     time_for_corr = [0.5,1.03];
+% $$$     corr = [4e3,4.5e3];
+% $$$     if shot==57732; corr=[4650,4650]; end
+% $$$     mapping.method = 'expression';
+% $$$     mapping.expression = ['params_eff = gdat_data.gdat_params;params_eff.data_request=''tcv_eq(''''''''w_mhd'''''''',''''''''LIUQE.M'''''''')'';' ...
+% $$$                     'gdat_tmp=gdat_tcv(shot,params_eff);ij=find(gdat_tmp.t>0.5&gdat_tmp.t<1.03);' ...
+% $$$                     'aa=interp1([' num2str(time_for_corr(1)) ' ' num2str(time_for_corr(2)) ...
+% $$$                     '],[' num2str(corr(1)) ' ' num2str(corr(2)) '],gdat_tmp.t(ij));' ...
+% $$$ 		    'gdat_tmp.data(ij)=max(gdat_tmp.data(ij),aa);'];
+% $$$   else
     mapping.method = 'tdiliuqe';
     mapping.expression = '\results::total_energy';
     mapping.expression = '\tcv_shot::top.results.equil_1.results:w_mhd';
     mapping.expression = 'tcv_eq(''''w_mhd'''',''''LIUQE.M'''')';
-  end
+% $$$   end
  case 'z_contour'
   mapping.timedim = 2;
   mapping.method = 'tdiliuqe';