From f2099d6e4ba10f46605388c02f73ca856b6c475c Mon Sep 17 00:00:00 2001 From: Francesco Carpanese <francesco.carpanese@epfl.ch> Date: Tue, 5 Feb 2019 17:07:50 +0000 Subject: [PATCH] added the data error git-svn-id: https://spcsvn.epfl.ch/repos/TCV/gdat/trunk@11395 d63d8f72-b253-0410-a779-e742ad2e26cf --- crpptbx/TCV_IMAS/tcv_get_ids_bpol_probe.m | 4 ++-- crpptbx/TCV_IMAS/tcv_get_ids_coil.m | 3 +++ crpptbx/TCV_IMAS/tcv_get_ids_flux_loop.m | 8 ++++---- crpptbx/TCV_IMAS/tcv_get_ids_tf.m | 3 ++- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/crpptbx/TCV_IMAS/tcv_get_ids_bpol_probe.m b/crpptbx/TCV_IMAS/tcv_get_ids_bpol_probe.m index 5a580ba0..1991c3a9 100644 --- a/crpptbx/TCV_IMAS/tcv_get_ids_bpol_probe.m +++ b/crpptbx/TCV_IMAS/tcv_get_ids_bpol_probe.m @@ -24,7 +24,7 @@ for ii=1:Nprobes %ids_struct_out{ii}.position.toroidal_angle = mdsdata('STATIC("ANG_M" )[$1]',ids_struct_out{ii}.position.name); %ids_struct_out{ii}.position.poloidal_angle = 0; % TO BE FOUND - %ids_struct_out{ii}.position.field.data_error_upper = % TO BE FOUND; - %ids_struct_out{ii}.position.field.data_error_upper = % TO BE FOUND; + ids_struct_out{ii}.position.field.data_error_upper = 0.001;% TO BE FOUND; + ids_struct_out{ii}.position.field.data_error_upper = 0.001;% TO BE FOUND; end diff --git a/crpptbx/TCV_IMAS/tcv_get_ids_coil.m b/crpptbx/TCV_IMAS/tcv_get_ids_coil.m index f7d6842d..be5a702c 100644 --- a/crpptbx/TCV_IMAS/tcv_get_ids_coil.m +++ b/crpptbx/TCV_IMAS/tcv_get_ids_coil.m @@ -62,6 +62,9 @@ for ii=1:ncircuits2ids tmpdata = tdi(mds_paths2ids{ii}); ids_struct_out{ind_coil_ids}.current.data = tmpdata.data; ids_struct_out{ind_coil_ids}.current.time = tmpdata.dim{1}; + ids_struct_out{ind_coil_ids}.current.data_error_lower = 200; + ids_struct_out{ind_coil_ids}.current.data_error_upper = 200; + % Find index on static tree tmpind = find(strcmp(ids_struct_out{ii}.name, namepfc)); diff --git a/crpptbx/TCV_IMAS/tcv_get_ids_flux_loop.m b/crpptbx/TCV_IMAS/tcv_get_ids_flux_loop.m index 5e871c32..4ec85cf4 100644 --- a/crpptbx/TCV_IMAS/tcv_get_ids_flux_loop.m +++ b/crpptbx/TCV_IMAS/tcv_get_ids_flux_loop.m @@ -19,9 +19,9 @@ for ii=1:Nprobes ids_struct_out{ii}.position{1}.z = mdsvalue('STATIC("Z_F" )[$1]',ids_struct_out{ii}.name); ids_struct_out{ii}.flux.data = data(:,ii); ids_struct_out{ii}.flux.time = time; - - %ids_struct_out{ii}.position.phi = 0; % TO BE FOUND - %ids_struct_out{ii}.flux.data_error_upper = % TO BE FOUND; - %ids_struct_out{ii}.flux.data_error_lower = % TO BE FOUND; + + ids_struct_out{ii}.flux.data_error_upper = 0.0012; + ids_struct_out{ii}.flux.data_error_lower = 0.0012; + %ids_struct_out{ii}.position.phi = 0; % TO BE FOUND end diff --git a/crpptbx/TCV_IMAS/tcv_get_ids_tf.m b/crpptbx/TCV_IMAS/tcv_get_ids_tf.m index 328ce754..523bd6ab 100644 --- a/crpptbx/TCV_IMAS/tcv_get_ids_tf.m +++ b/crpptbx/TCV_IMAS/tcv_get_ids_tf.m @@ -4,4 +4,5 @@ ids_struct_out = ids_structures; 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; \ No newline at end of file +ids_struct_out.b_field_tor_vacuum_r.time = tmp.t; +ids_struct_out.r0 = tmp.r0; \ No newline at end of file -- GitLab