From 0a16a12f127bba81cc1bff032a9b73ede91c09b9 Mon Sep 17 00:00:00 2001
From: Olivier Sauter <olivier.sauter@epfl.ch>
Date: Wed, 16 Apr 2008 06:08:00 +0000
Subject: [PATCH] add total_energy and fix small bug for itim firrat
git-svn-id: https://spcsvn.epfl.ch/repos/TCV/gdat/trunk@1910 d63d8f72-b253-0410-a779-e742ad2e26cf
---
TCV/loadTCVdata.m | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/TCV/loadTCVdata.m b/TCV/loadTCVdata.m
index 02cce761..770bbf48 100644
--- a/TCV/loadTCVdata.m
+++ b/TCV/loadTCVdata.m
@@ -160,7 +160,7 @@ end
liuqe23=[{'\results::i_p'} {'\results::z_axis'} {'\results::r_axis'} {'\results::q_psi'} ...
{'\results::beta_tor'} {'\results::beta_pol'} {'\results::q_95'} {'\results::l_i'} {'\results::delta_95'} ...
{'\results::kappa_95'} {'\results::r_contour'} {'\results::z_contour'} {'\results::psi_axis'} ...
- {'\results::thomson:psiscatvol'} {'\results::thomson:psi_max'} {'\results::rms_error'}];
+ {'\results::thomson:psiscatvol'} {'\results::thomson:psi_max'} {'\results::rms_error'} {'\results::total_energy'}];
% all keywords and corresponding case to run below
TCVkeywrdall=[{'Ip'} {'zmag'} {'rmag'} {'rcont'} {'zcont'} {'vol'} {'rhovol'} {'qrho'} {'q95'} {'kappa'} ...
@@ -448,9 +448,11 @@ switch TCVkeywrdcase{index}
tracefirrat=tdi('\results::thomson:fir_thom_rat');
tracefirrat.dim{1}=time;
end
- itim=iround(time,tracefirrat.dim{1});
tracefirrat_data=NaN*ones(size(tracetdi.dim{1}));
- tracefirrat_data(itim)=tracefirrat.data;
+ if ~isempty(tracefirrat.data)
+ itim=iround(time,tracefirrat.dim{1});
+ tracefirrat_data(itim)=tracefirrat.data;
+ end
else
nodenameeff='\results::thomson:te';
tracetdi=tdi(nodenameeff);
--
GitLab