From fdd43070403262c7a390d7a8cc160973e8f12f4c Mon Sep 17 00:00:00 2001
From: Francesco Carpanese <francesco.carpanese@epfl.ch>
Date: Thu, 31 Jan 2019 14:04:43 +0000
Subject: [PATCH] added the magnetics to the tcv2ids
git-svn-id: https://spcsvn.epfl.ch/repos/TCV/gdat/trunk@11379 d63d8f72-b253-0410-a779-e742ad2e26cf
---
crpptbx/TCV_IMAS/tcv2ids.m | 16 +++++++++++++---
crpptbx/TCV_IMAS/tcv_get_ids_magnetics.m | 16 +++++++++-------
crpptbx/TCV_IMAS/tcv_ids_pf_active_definition.m | 3 +--
3 files changed, 23 insertions(+), 12 deletions(-)
diff --git a/crpptbx/TCV_IMAS/tcv2ids.m b/crpptbx/TCV_IMAS/tcv2ids.m
index d0bc5ac9..c0521b7f 100644
--- a/crpptbx/TCV_IMAS/tcv2ids.m
+++ b/crpptbx/TCV_IMAS/tcv2ids.m
@@ -10,15 +10,19 @@ function [ids_saved,varargout] = tcv2ids(shot,run,varargin);
% addpath ~g2osaute/public/matlab9_11_2016
% mdsconnect('localhost:5555')
+%% Equilibrium
equil_empty=ids_gen('equilibrium');
[ids_equilibrium,ids_equilibrium_description]=tcv_get_ids_equilibrium(shot,equil_empty);
ids_saved.equilibrium = ids_equilibrium;
ids_saved.equilibrium_description = ids_equilibrium_description;
+%% Magnetics
+magnetics_empty=ids_gen('magnetics');
+[ids_magnetics,ids_magnetics_description]=tcv_get_ids_magnetics(shot,magnetics_empty);
+ids_saved.magnetics = ids_magnetics;
+ids_saved.magnetics_description = ids_magnetics_description;
-
-
-% now write to ids tree
+%% Initialize the three
shot_is_new = 1; % seems only create is ok even if does already exist
if shot_is_new
idx = imas_create('ids',shot,run,run,run); %
@@ -26,5 +30,11 @@ else
idx = imas_open('ids',shot,run); %
end
+%% Put the field
ids_put(idx,'equilibrium',ids_equilibrium);
+ids_put(idx, 'magnetics', ids_magnetics);
+
+%% Close the file
imas_close(idx)
+
+
diff --git a/crpptbx/TCV_IMAS/tcv_get_ids_magnetics.m b/crpptbx/TCV_IMAS/tcv_get_ids_magnetics.m
index 5e328296..9a8720af 100644
--- a/crpptbx/TCV_IMAS/tcv_get_ids_magnetics.m
+++ b/crpptbx/TCV_IMAS/tcv_get_ids_magnetics.m
@@ -1,11 +1,13 @@
-function [ids_magnetics,ids_magnetics_description,varargout] = tcv_get_ids_magnetics(shot,varargin)
+function [ids_magnetics,ids_magnetics_description,varargout] = tcv_get_ids_magnetics(shot, ids_magnetics_empty, varargin)
%
% [ids_equilibrium,ids_equilibrium_description,varargout] = get_ids_equilibrium_fixed_boundary(shot,varargin);
-%
%
-% ADD Here the imput pharser
-ids_magnetics=ids_gen('magnetics');
-[ids_magnetics.bpol_probe]= tcv_get_ids_bpol_probe(shot, ids_magnetics.bpol_probe(1));
-[ids_magnetics.flux_loop]= tcv_get_ids_flux_loop(shot, ids_magnetics.flux_loop(1));
-[ids_magnetics.method]= tcv_get_ids_ip(shot, ids_magnetics.method(1));
\ No newline at end of file
+[ids_magnetics, params_magnetics] = tcv_ids_headpart(shot, ids_magnetics_empty,'magnetics',varargin{:});
+
+[ids_magnetics.bpol_probe]= tcv_get_ids_bpol_probe(params_magnetics.shot, ids_magnetics.bpol_probe(1));
+[ids_magnetics.flux_loop]= tcv_get_ids_flux_loop(params_magnetics.shot, ids_magnetics.flux_loop(1));
+[ids_magnetics.method]= tcv_get_ids_ip(params_magnetics.shot, ids_magnetics.method(1));
+
+%% Temporarely documentation
+ids_magnetics_description = struct([]);
\ No newline at end of file
diff --git a/crpptbx/TCV_IMAS/tcv_ids_pf_active_definition.m b/crpptbx/TCV_IMAS/tcv_ids_pf_active_definition.m
index c4162835..780f77d6 100644
--- a/crpptbx/TCV_IMAS/tcv_ids_pf_active_definition.m
+++ b/crpptbx/TCV_IMAS/tcv_ids_pf_active_definition.m
@@ -1,8 +1,7 @@
-function [coil_names, power_supply_names, circuit_names, mds_paths, combined_structure] = pf_active_definition()
+function [coil_names, power_supply_names, circuit_names, mds_paths, combined_structure] = tcv_ids_pf_active_definition()
% All circuits are connected in series and has only 1 power supply, so they
% share the same current.
-
coil_names = {...
{'A_001'}; ... % Circuit 1
{'B_001', 'B_002', 'C_001', 'C_002', 'D_001', 'D_002'}; ... % Circuit 2
--
GitLab