improve btnd, btpd def in case efit node does not exist

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

JET/loadJETdata.m

@@ -297,20 +297,32 @@ switch JETkeywrdcase{index}
     tracename=tracename(ij);
     [a,x,t,d,e]=rda_eff(shot,ppftype,tracename);
     switch tracename
-      case 'efit/btpd?uid=jetppf+seq=0'
+      case {'efit/btpd','efit/btpd?uid=jetppf+seq=0'}
         if isstr(t);
           disp('t is a string, assumes means btpd not defined');
-          [wdia,x1,t1,d,e]=rda_eff(shot,'ppf','efit/wdia');
-          [rgeo,x,t,d,e]=rda_eff(shot,'ppf','efit/rgeo');
-          [xip,x3,t3,d,e]=rda_eff(shot,'ppf','efit/xip');
+          [xip,x,t,d,e]=rda_eff(shot,'ppf','efit/xip');
+          shot_mg3_list=[47274 47275 47276 47280 47281 47282 47283 47284 47285 47286 47287 47290 47295 47296 47301];
+          if isempty(find(shot_mg3_list==shot))
+            [wdia,x1,t1,d,e]=rda_eff(shot,'ppf','efit/wdia');
+          else
+            [wdia,x1,t1,d,e]=rda_eff(shot,'ppf','mg3/wpd');
+            wdia=interp1(t1,wdia,t);
+          end
+          [rgeo,x3,t3,d,e]=rda_eff(shot,'ppf','efit/rgeo');
           a=2.122e6 .* wdia ./xip.^2 ./ rgeo;
         end
-      case 'efit/btnd?uid=jetppf+seq=0'
+      case {'efit/btnd','efit/btnd?uid=jetppf+seq=0'}
         if isstr(t);
           disp('t is a string, assumes means btnd not defined');
-          [wdia,x1,t1,d,e]=rda_eff(shot,'ppf','efit/wdia');
-          [rgeo,x,t,d,e]=rda_eff(shot,'ppf','efit/rgeo');
-          [xip,x3,t3,d,e]=rda_eff(shot,'ppf','efit/xip');
+          [xip,x,t,d,e]=rda_eff(shot,'ppf','efit/xip');
+          shot_mg3_list=[47274 47275 47276 47280 47281 47282 47283 47284 47285 47286 47287 47290 47295 47296 47301];
+          if isempty(find(shot_mg3_list==shot))
+            [wdia,x1,t1,d,e]=rda_eff(shot,'ppf','efit/wdia');
+          else
+            [wdia,x1,t1,d,e]=rda_eff(shot,'ppf','mg3/wpd');
+            wdia=interp1(t1,wdia,t);
+          end
+          [rgeo,x3,t3,d,e]=rda_eff(shot,'ppf','efit/rgeo');
           [cr0,x3,t3,d,e]=rda_eff(shot,'ppf','efit/cr0');
           [bvac,x3,t3,d,e]=rda_eff(shot,'ppf','efit/bvac');
           [volm,x3,t3,d,e]=rda_eff(shot,'ppf','efit/volm');