From a925f98abf12f85bc54e788d790d1e3ae44bdda6 Mon Sep 17 00:00:00 2001
From: Olivier Sauter <olivier.sauter@epfl.ch>
Date: Mon, 29 Mar 2010 07:40:49 +0000
Subject: [PATCH] (rho,t) of autofits
git-svn-id: https://spcsvn.epfl.ch/repos/TCV/gdat/trunk@1913 d63d8f72-b253-0410-a779-e742ad2e26cf
---
TCV/loadTCVdata.m | 31 +++++++++++++++++++++++++------
1 file changed, 25 insertions(+), 6 deletions(-)
diff --git a/TCV/loadTCVdata.m b/TCV/loadTCVdata.m
index 99dec812..b21cf04f 100644
--- a/TCV/loadTCVdata.m
+++ b/TCV/loadTCVdata.m
@@ -560,17 +560,36 @@ switch TCVkeywrdcase{index}
mdsopen(shot);
if strcmp(TCVkeywrdcase{index},'profnerho')
nodenameeff=['\results::THOMSON.PROFILES.AUTO:ne'];
+ avers=tdi('\results::THOMSON.PROFILES.AUTO:ne:version_num');
end
if strcmp(TCVkeywrdcase{index},'profterho')
nodenameeff=['\results::THOMSON.PROFILES.AUTO:te'];
+ avers=tdi('\results::THOMSON.PROFILES.AUTO:te:version_num');
end
- tracetdi=tdi(nodenameeff);
- trace.data=tracetdi.data'; % error in dimensions for autofits
- if ~isempty(tracetdi.dim)
- disp('assumes dim{2} for x in THOMSON.PROFILES.AUTO')
- trace.x=tracetdi.dim{2};
- trace.t=tracetdi.dim{1};
+ if avers.data>0
+ tracetdi=tdi(nodenameeff);
+ if avers.data < 2.99
+ % for earlier version the bug made it to have logically (rho,t)
+ if ~isempty(tracetdi.dim)
+ trace.x=tracetdi.dim{1};
+ trace.t=tracetdi.dim{2};
+ else
+ trace.x=[];
+ trace.t=[];
+ end
+ else
+ trace.data=tracetdi.data'; % error in dimensions for autofits
+ if ~isempty(tracetdi.dim)
+ disp('assumes dim{2} for x in THOMSON.PROFILES.AUTO')
+ trace.x=tracetdi.dim{2};
+ trace.t=tracetdi.dim{1};
+ else
+ trace.x=[];
+ trace.t=[];
+ end
+ end
else
+ tracetdi=avers;
trace.x=[];
trace.t=[];
end
--
GitLab