add eced_rmd and eced

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

crpptbx/AUG/loadAUGdata.m

@@ -7,11 +7,13 @@ function [trace,error,varargout]=loadAUGdata(shot,data_type,varargin)
 % 'sxr'  =  soft x-ray emission 
 % 'sxR'  =  soft x-ray emission with varargout{1} option (requires varargin{5}!)
 % 'SXB'  =  soft x-ray emission from (by default camera J) SXB/J_xx camera (sxb, sxB, etc all work)
+% 'SXF'  =  soft x-ray emission from (by default camera J) SXF/I_xx camera (sxf, sxF, etc all work)
 %
 %     gdat(15133,'MAG/Ipa',1,'AUG') % uses experiment=AUGD shotfiles per default
 %     gdat(15133,'MAG/Ipa',1) (sufficient at AUG since 'AUG' per defaut, same with gdat(15133,'ip',1)
 %     gdat(15133,'AUGD/MAG/Ipa',1,'AUG') % to specify experiment explicitely like in:
 %     gdat(30230,'ECED/RMD/Trad-A',1,'AUG') % 
+%     gdat(30230,'ECED/CEC/Trad-A',1,'AUG') % 
 %
 % INPUT:
 % shot: shot number
@@ -23,7 +25,7 @@ function [trace,error,varargout]=loadAUGdata(shot,data_type,varargin)
 %
 % Meaning of varargin depends on data_type:
 %
-% data_type=sxr, sxb or ece, eced:
+% data_type=sxr, sxb, sxf or ece, eced:
 %                  varargin{1}:  [i1 i2] : if not empty, assumes need many chords from i1 to i2
 %                  varargin{2}:  channel status: 1=unread yet, 0=read
 %                                (for traces with many channel, enables to load additional channels,
@@ -77,8 +79,10 @@ function [trace,error,varargout]=loadAUGdata(shot,data_type,varargin)
 % sxr : from SXR/A or B (from old stuff, not sure still OK)
 % sxR : from SXR/A or B adding R of chords (from old stuff, not sure still OK)
 % sxb : 'SXB/J' chords
+% sxf : 'SXF/I' chords
 % ece : 
 % eced : 
+% eced_rmd : 
 % Halpha : 
 % pgyro : for each gyrotrons, power, freq, etc (ask for more)
 % powers : power traces for each sources
@@ -158,12 +162,18 @@ if size(data_type_eff,1)==1
   if ~isempty(strmatch(data_type_eff_noext,[{'SXB'} {'sxb'} {'Sxb'} {'sXb'} {'sxB'} {'SXb'}],'exact'))
     data_type_eff_noext='sxb';
   end
+  if ~isempty(strmatch(data_type_eff_noext,[{'SXF'} {'sxf'} {'Sxf'} {'sXf'} {'sxf'} {'SXf'}],'exact'))
+    data_type_eff_noext='sxf';
+  end
   if ~isempty(strmatch(data_type_eff_noext,[{'ECE'}],'exact'))
     data_type_eff_noext='ece';
   end
   if ~isempty(strmatch(upper(data_type_eff_noext),[{'ECED'}],'exact'))
     data_type_eff_noext='eced';
   end
+  if ~isempty(strmatch(upper(data_type_eff_noext),[{'ECED_RMD'}],'exact'))
+    data_type_eff_noext='eced_rmd';
+  end
   if ~isempty(strmatch(data_type_eff_noext,[{'VOL'} {'volume'}],'exact'))
     data_type_eff_noext='vol';
   end
@@ -234,7 +244,7 @@ end
 AUGkeywrdall=[{'Ip'} {'b0'} {'zmag'} {'rmag'}  {'rgeo'} {'zgeo'} {'rcont'} {'zcont'} {'vol'} {'qrho'} {'qrho_fpp'} {'q0'} {'q95'} {'kappa'} ...
 	      {'delta'} {'deltatop'} {'deltabot'} {'neint'} {'ne'} {'te'}  ...
 	      {'nerho'} {'neterho'} {'terho'} {'cxrs'} {'cxrs_rho'} {'equil'} {'equil_fpp'} {'equil_eqm'} ...
-	      {'equil_eqr'} {'sxr'} {'sxR'} {'sxb'} {'ece'} {'eced'} {'Halpha'} {'pgyro'} {'powers'}];
+	      {'equil_eqr'} {'sxr'} {'sxR'} {'sxb'} {'sxf'} {'ece'} {'eced'} {'eced_rmd'} {'Halpha'} {'pgyro'} {'powers'}];
 AUGsig.iip=strmatch('Ip',AUGkeywrdall,'exact');
 AUGsig.ib0=strmatch('b0',AUGkeywrdall,'exact');
 AUGsig.izmag=strmatch('zmag',AUGkeywrdall,'exact');
@@ -267,8 +277,10 @@ AUGsig.icxrs_rho=strmatch('cxrs_rho',AUGkeywrdall,'exact');
 AUGsig.isxr=strmatch('sxr',AUGkeywrdall,'exact');
 AUGsig.isxR=strmatch('sxR',AUGkeywrdall,'exact');
 AUGsig.isxb=strmatch('sxb',AUGkeywrdall,'exact');
+AUGsig.isxf=strmatch('sxf',AUGkeywrdall,'exact');
 AUGsig.iece=strmatch('ece',AUGkeywrdall,'exact');
 AUGsig.ieced=strmatch('eced',AUGkeywrdall,'exact');
+AUGsig.ieced_rmd=strmatch('eced_rmd',AUGkeywrdall,'exact');
 AUGsig.iHalpha=strmatch('Halpha',AUGkeywrdall,'exact');
 AUGsig.ipgyro=strmatch('pgyro',AUGkeywrdall,'exact');
 AUGsig.ipowers=strmatch('powers',AUGkeywrdall,'exact');
@@ -292,6 +304,7 @@ AUGkeywrdcase(AUGsig.iterho)=AUGkeywrdall(AUGsig.iterho); % idem
 AUGkeywrdcase(AUGsig.isxr)=AUGkeywrdall(AUGsig.isxr);
 AUGkeywrdcase(AUGsig.isxR)=AUGkeywrdall(AUGsig.isxR);
 AUGkeywrdcase(AUGsig.isxb)=AUGkeywrdall(AUGsig.isxb);
+AUGkeywrdcase(AUGsig.isxf)=AUGkeywrdall(AUGsig.isxf);
 %AUGkeywrdcase(AUGsig.iece)=AUGkeywrdall(AUGsig.iece);
 AUGkeywrdcase(AUGsig.icxrs)=AUGkeywrdall(AUGsig.icxrs);
 AUGkeywrdcase(AUGsig.icxrs_rho)=AUGkeywrdall(AUGsig.icxrs_rho);
@@ -322,7 +335,8 @@ AUGsiglocation(:,AUGsig.ideltatop)={''; ''};
 AUGsiglocation(:,AUGsig.ideltabot)={''; ''};
 AUGsiglocation(:,AUGsig.ineint)={'DCN'; 'H-1'};
 AUGsiglocation(:,AUGsig.iece)={'CEC'; 'Trad-A'};
-AUGsiglocation(:,AUGsig.ieced)={'RMD'; 'Trad-A'}; % ECED
+AUGsiglocation(:,AUGsig.ieced)={'CEC'; 'Trad-A'}; % ECED
+AUGsiglocation(:,AUGsig.ieced_rmd)={'RMD'; 'Trad-A'}; % ECED_RMD
 AUGsiglocation(:,AUGsig.iHalpha)={'POT'; 'ELMa-Han'};
 
 % For the 'simplereaddata' cases, we need the full node in case gdat was called with full location directly
@@ -331,6 +345,7 @@ AUGexplocation=cell(size(AUGkeywrdall,2),1);
 AUGexplocation(:)={'AUGD'};
 % cases with a "private" shotfile:
 AUGexplocation(AUGsig.ieced)={'ECED'};
+AUGexplocation(AUGsig.ieced_rmd)={'ECED'};
 
 % initialize order of substructures and allows just a "return" if data empty
 trace.data=[];
@@ -504,7 +519,7 @@ switch AUGkeywrdcase{index}
     end
 
   %&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&
-  case {'sxb'}
+  case {'sxb', 'sxf'}
     %  LOAD MULTI CHANNEL DATA SXB/J_0xx (or other than J camera if specified in varargin{8})
     %  load AUG soft x-ray data 
 
@@ -537,11 +552,17 @@ switch AUGkeywrdcase{index}
     if  nargin>=8 & ~isempty(varargin{6})
       tracename=varargin{6};
     else
-      tracename='J';
+      if strcmp(AUGkeywrdcase{index},'sxb')
+	tracename='J';
+      elseif strcmp(AUGkeywrdcase{index},'sxf')
+	tracename='I';
+      else
+	disp('should not be here, ask O. Sauter');
+      end
     end
     trace.t=[];
     trace.x=[];
-    ppftype='SXB';
+    ppftype=upper(AUGkeywrdcase{index});
     iok=0;
     for ichord=starti:endi
       tracename_eff = [tracename '_' num2str(ichord,'%.3d')];
@@ -665,7 +686,7 @@ switch AUGkeywrdcase{index}
       trace.x = [];
       trace.t = [];
       trace.units = [];
-      trace.name=[num2str(shot) '/' ppftype '/' tracename];
+      trace.name=[num2str(shot) '/' ppftype '/' 'vrot, Ti_c,...'];
     end
     
   %&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&