better define machine and minor changes

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

gdat.m

@@ -108,7 +108,6 @@ end
 % SETTING MACHINE
 doplot=0;
 if (nargineff>=3 & ~isempty(varargin{1})); doplot=varargin{1}; end
-machine='TCV';
 a=which('gdat');
 if ~isempty(findstr('ipp',a)) | ~isempty(findstr('/u/osauter',a));
   machine='AUG';
@@ -116,9 +115,16 @@ if ~isempty(findstr('ipp',a)) | ~isempty(findstr('/u/osauter',a));
   usemdsplus=0;
 elseif ~isempty(findstr('/home/osauter',a));
   machine='JET';
+elseif ~isempty(findstr('/home/sauter',a));
+  machine='TCV';
 elseif ~isempty(findstr('/u/sauter',a));
   machine='D3D';
 end
+if ~exist('machine')
+  disp('did not find machine, set it to TCV')
+  machine='TCV';
+end
+
 if (nargineff>=4 & ~isempty(varargin{2})); machine=varargin{2}; end
 
 % load data from specified machine
@@ -140,7 +146,7 @@ if doplot==1 & length(trace.data)>1 & ~ischar(trace.data)
   end
   xlabel('time [s]')
   title([machine ' '  num2str(shot)])
-  grid
+  grid on
 elseif doplot==-1
   hold on
   if length(size(trace.data))<=2