From 4ec6d5676fe6579b0af4fd47e8140cade005e7f9 Mon Sep 17 00:00:00 2001
From: Olivier Sauter <olivier.sauter@epfl.ch>
Date: Tue, 5 Feb 2019 17:35:05 +0000
Subject: [PATCH] fix tcv_get_ids_tf.m, required 2 outputs: ids and
ids_description
git-svn-id: https://spcsvn.epfl.ch/repos/TCV/gdat/trunk@11397 d63d8f72-b253-0410-a779-e742ad2e26cf
---
crpptbx/TCV/gdat_tcv.m | 4 +++-
crpptbx/TCV_IMAS/tcv_get_ids_tf.m | 24 +++++++++++++++++++-----
2 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/crpptbx/TCV/gdat_tcv.m b/crpptbx/TCV/gdat_tcv.m
index 03feb1f9..2186635b 100644
--- a/crpptbx/TCV/gdat_tcv.m
+++ b/crpptbx/TCV/gdat_tcv.m
@@ -1093,11 +1093,13 @@ elseif strcmp(mapping_for_tcv.method,'switchcase')
return
end
try
+ keyboard
eval(['[ids_top,ids_top_description]=tcv_get_ids_' ids_top_name '(shot,equil_empty);'])
gdat_data.(ids_top_name) = ids_top;
gdat_data.([ids_top_name '_description']) = ids_top_description;
catch
- disp(['check if function: tcv_get_ids_' ids_top_name ' exists in your path'])
+ disp(['there is a problem with: tcv_get_ids_' ids_top_name ...
+ ' , may be check if it exists in your path or test it by itself'])
gdat_data.(ids_top_name) = struct([]);
gdat_data.([ids_top_name '_description']) = struct([]);
end
diff --git a/crpptbx/TCV_IMAS/tcv_get_ids_tf.m b/crpptbx/TCV_IMAS/tcv_get_ids_tf.m
index 523bd6ab..bbd82c33 100644
--- a/crpptbx/TCV_IMAS/tcv_get_ids_tf.m
+++ b/crpptbx/TCV_IMAS/tcv_get_ids_tf.m
@@ -1,8 +1,22 @@
-function [ids_struct_out] = tcv_get_ids_tf(shot, ids_structures)
+function [ids_struct_out,ids_struct_out_description] = tcv_get_ids_tf(shot, ids_struct_in,varargin)
+%
+% [ids_struct_out] = tcv_get_ids_tf(shot, ids_struct_in,varargin);
+%
% Get the vacuum toroidal field
-ids_struct_out = ids_structures;
+%
+% ids_struct_in should at least be the empty tf ids structure in input
+%
+
+ids_struct_out = ids_struct_in;
tmp = gdat(shot, 'b0');
-ids_struct_out.b_field_tor_vacuum_r.data = tmp.data;
-ids_struct_out.b_field_tor_vacuum_r.time = tmp.t;
-ids_struct_out.r0 = tmp.r0;
\ No newline at end of file
+if ~ischar(tmp.data)
+ ids_struct_out.b_field_tor_vacuum_r.data = tmp.data;
+ ids_struct_out.b_field_tor_vacuum_r.time = tmp.t;
+ ids_struct_out.r0 = tmp.r0;
+ ids_struct_out_description.b_field_tor_vacuum_r.data = ' gdat(shot, ''b0'')';
+ ids_struct_out_description.r0 = ' b0.r0 from gdat(shot, ''b0'')';
+else
+ % leave defaults
+ ids_struct_out_description = struct([]);
+end
--
GitLab