add desciption of data_request

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

crpptbx_new/AUG/gdat_aug.m

@@ -201,7 +201,13 @@ data_request_eff = gdat_params.data_request; % in case was defined in pairs
 
 % if it is a request_keyword copy it:
 ij=strmatch(data_request_eff,data_request_names_all,'exact');
-if ~isempty(ij); gdat_data.gdat_request = data_request_names_all{ij}; end
+if ~isempty(ij); 
+  gdat_data.gdat_request = data_request_names_all{ij};
+  if isfield(data_request_names.all.(data_request_names_all{ij}),'description') && ~isempty(data_request_names.all.(data_request_names_all{ij}).description)
+    % copy description of keyword
+    gdat_data.request_description = data_request_names.all.(data_request_names_all{ij}).description;
+  end
+end
 
 % special treatment if shot and data_request given within pairs
 if isfield(gdat_params,'shot')

crpptbx_new/TCV/gdat_tcv.m

@@ -200,7 +200,13 @@ data_request_eff = gdat_params.data_request; % in case was defined in pairs
 
 % if it is a request_keyword copy it:
 ij=strmatch(data_request_eff,data_request_names_all,'exact');
-if ~isempty(ij); gdat_data.gdat_request = data_request_names_all{ij}; end
+if ~isempty(ij); 
+  gdat_data.gdat_request = data_request_names_all{ij};
+  if isfield(data_request_names.all.(data_request_names_all{ij}),'description') && ~isempty(data_request_names.all.(data_request_names_all{ij}).description)
+    % copy description of keyword
+    gdat_data.request_description = data_request_names.all.(data_request_names_all{ij}).description;
+  end
+end
 
 % special treatment if shot and data_request given within pairs
 if isfield(gdat_params,'shot')

crpptbx_new/gdat.m

@@ -100,7 +100,7 @@ if nargin>=2 % need at least 2 inputs to have 'machine','aug' as arguments (to a
     machine_eff = shot.machine;
   elseif isstruct(data_request) && isfield(data_request,'machine')
     machine_eff = data_request.machine;
-  else
+  elseif nargin>=3
     imachine=[];
     for i=1:length(varargin_eff)
       if ischar(varargin_eff{i})