minor bug fixed

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

JET/loadJETdata.m

@@ -74,9 +74,13 @@ JETsigtimeindx=ones(size(JETkeywrdall));
 % find index of signal called upon
 if size(data_type,1)==2
   % in case node name was given in 2 parts directly (as old way)
-  index=find(strmatch(data_type(1),JETsiglocation(1,:),'exact') & strmatch(data_type(2),JETsiglocation(2,:),'exact'));
+  ii1=strmatch(data_type(1),JETsiglocation(1,:),'exact');
+  index=find(strmatch(data_type(2),JETsiglocation(2,ii1),'exact'));
   if isempty(index)
-    disp('trace not yet registered. If standard data, ask andrea.scarabosio@epfl.ch or olivier.sauter@epfl.ch to create a keyqord entry for this data')
+    disp('********************')
+    disp('trace not yet registered.')
+    disp('If standard data, ask andrea.scarabosio@epfl.ch or olivier.sauter@epfl.ch to create a keyqord entry for this data')
+    disp('********************')
     % temporarily add entry in arrays, so can work below
     index=length(JETkeywrdall)+1;
     JETkeywrdall(end+1)={'new'};
@@ -91,8 +95,10 @@ if size(data_type,1)==2
 else
   index=strmatch(data_type,JETkeywrdall,'exact');
 end
-disp(['loading' ' ' data_type ' from JET shot #' num2str(shot)]); 
+disp(' ')
+disp(['loading' ' ' char(data_type(end)) ' from JET shot #' num2str(shot)]); 
 disp(['case ' JETkeywrdcase{index}])
+disp(' ')
 switch JETkeywrdcase{index}
 
   case 'simplereaddata'