adapt sxr and ece to .x, .dim new standard and (x,t)

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

TCV/loadTCVdata.m

@@ -392,9 +392,10 @@ switch TCVkeywrdcase{index}
 	[xtomo_signal,t]=get_xtomo_data(shot,t_1,t_2,13e-6*16, ...
           icamera,angfact);
 	data=interp1(zmag.t,zmag.data,t');
+	radius.data=VsxrTCVradius(data,xchord,ychord)';
 	radius.t=t';
-	radius.data={VsxrTCVradius(data,xchord,ychord)};
 	varargout{1}={radius};
+        trace.R=radius.data;
       else
         t_1=0.001;
         t_2=3;
@@ -402,18 +403,18 @@ switch TCVkeywrdcase{index}
           icamera,angfact);
       end
     end
-    for i=1:(20*icamera*ones(10,1))
-      trace.t(:,i)=t';
-    end
-    trace.data=xtomo_signal';
-    trace.dim{1}={trace.t};
-    trace.dimunits={'time [s]'};
+    trace.data=xtomo_signal;
+    trace.x=[1:size(trace.data,1)]';
+    trace.t=t';
+    trace.dim=[{trace.x} ; {trace.t}];
+    trace.dimunits=[{'channel #'} ; {'time [s]'}];
     error=0;
 
   %&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&
   case 'ece'
     %  load TCV ECE data
     % Status=1 => Not Read Yet
+    mdsopen(shot);
     if ~isempty(find(status == 1))
       if eval(['~mdsdata(''node_exists("\\RESULTS::ECE:rho")'')'])
         disp(['node \RESULTS::ECE:rho does not exist for shot = ' num2str(shot)])
@@ -428,14 +429,14 @@ switch TCVkeywrdcase{index}
     end
     a=min(find(R(:,1)>=0));
     b=max(find(R(:,1)>=0));
-    for i=1:size(TE_ECE,2)
-      trace.t(:,i)=T(a:b);
-    end
-    trace.data=TE_ECE(a:b,:);
+    trace.data=TE_ECE(a:b,:)';
+    trace.t=T(a:b);
+    trace.x=[1:size(trace.data,1)]';
+    trace.dim=[{trace.x} ; {trace.t}];
+    trace.dimunits=[{'channel #'} ; {'time [s]'}];
+    trace.R=R(a:b,:)';
+    radius.data=trace.R;
     radius.t=trace.t;
-    radius.data=R(a:b,:);
-    trace.dim{1}={trace.t};
-    trace.dimunits={'time [s]'};
     varargout{1}={radius};
     error=0;