Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
gdat
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
SPC
gdat
Commits
deec45a1
Commit
deec45a1
authored
5 years ago
by
Antoine Merle
Browse files
Options
Downloads
Patches
Plain Diff
Fix tf: add error for r0.b0
parent
846a0afc
No related branches found
No related tags found
1 merge request
!39
Set same error_bars as LIUQE weights for eqreconstruct IDSs
Pipeline
#31119
passed
5 years ago
Stage: test
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
matlab/TCV_IMAS/tcv_get_ids_tf.m
+4
-2
4 additions, 2 deletions
matlab/TCV_IMAS/tcv_get_ids_tf.m
with
4 additions
and
2 deletions
matlab/TCV_IMAS/tcv_get_ids_tf.m
+
4
−
2
View file @
deec45a1
...
@@ -11,7 +11,7 @@ function [ids_tf,ids_tf_description] = tcv_get_ids_tf(shot, ids_tf_empty, gdat_
...
@@ -11,7 +11,7 @@ function [ids_tf,ids_tf_description] = tcv_get_ids_tf(shot, ids_tf_empty, gdat_
ids_tf
=
ids_tf_empty
;
ids_tf
=
ids_tf_empty
;
if
exist
(
'gdat_params'
)
if
exist
(
'gdat_params'
,
'var'
)
[
ids_tf
,
params_tf
]
=
tcv_ids_headpart
(
shot
,
ids_tf_empty
,
'tf'
,
'homogeneous_time'
,
0
,
'gdat_params'
,
gdat_params
,
varargin
{:});
[
ids_tf
,
params_tf
]
=
tcv_ids_headpart
(
shot
,
ids_tf_empty
,
'tf'
,
'homogeneous_time'
,
0
,
'gdat_params'
,
gdat_params
,
varargin
{:});
params_eff
=
gdat_params
;
params_eff
=
gdat_params
;
params_eff
.
data_request
=
'b0'
;
params_eff
.
data_request
=
'b0'
;
...
@@ -26,6 +26,8 @@ if ~ischar(tmp.data)
...
@@ -26,6 +26,8 @@ if ~ischar(tmp.data)
ids_tf_description
.
r0
=
' b0.r0 from gdat_tcv(shot,
''
b0
''
)'
;
ids_tf_description
.
r0
=
' b0.r0 from gdat_tcv(shot,
''
b0
''
)'
;
ids_tf
.
b_field_tor_vacuum_r
.
data
=
tmp
.
data
.*
ids_tf
.
r0
;
ids_tf
.
b_field_tor_vacuum_r
.
data
=
tmp
.
data
.*
ids_tf
.
r0
;
ids_tf_description
.
b_field_tor_vacuum_r
.
data
=
' gdat_tcv(shot,
''
b0
''
) * .r0'
;
ids_tf_description
.
b_field_tor_vacuum_r
.
data
=
' gdat_tcv(shot,
''
b0
''
) * .r0'
;
ids_tf
.
b_field_tor_vaccum_r
.
data_error_upper
=
19.2e-6
*
200
;
%TODO: Check the 200A value (might be more since TOR goes up to 70kA)
ids_tf_description
.
b_field_tor_vacuum_r
.
data_error_upper
=
' Error on coil measurement is 200A, b0.r0 is 19.2e-6*iphi'
;
ids_tf
.
b_field_tor_vacuum_r
.
time
=
tmp
.
t
;
ids_tf
.
b_field_tor_vacuum_r
.
time
=
tmp
.
t
;
else
else
% leave defaults
% leave defaults
...
@@ -37,7 +39,7 @@ ids_tf.coil = {};
...
@@ -37,7 +39,7 @@ ids_tf.coil = {};
ids_tf
.
field_map
=
{};
ids_tf
.
field_map
=
{};
% cocos automatic transform
% cocos automatic transform
if
exist
(
'ids_generic_cocos_nodes_transformation_symbolic'
)
==
2
if
exist
(
'ids_generic_cocos_nodes_transformation_symbolic'
,
'file'
)
[
ids_tf
,
cocoscoeff
]
=
ids_generic_cocos_nodes_transformation_symbolic
(
ids_tf
,
'tf'
,
gdat_params
.
cocos_in
,
...
[
ids_tf
,
cocoscoeff
]
=
ids_generic_cocos_nodes_transformation_symbolic
(
ids_tf
,
'tf'
,
gdat_params
.
cocos_in
,
...
gdat_params
.
cocos_out
,
gdat_params
.
ipsign_out
,
gdat_params
.
b0sign_out
,
gdat_params
.
ipsign_in
,
gdat_params
.
b0sign_in
,
...
gdat_params
.
cocos_out
,
gdat_params
.
ipsign_out
,
gdat_params
.
b0sign_out
,
gdat_params
.
ipsign_in
,
gdat_params
.
b0sign_in
,
...
gdat_params
.
error_bar
,
gdat_params
.
nverbose
);
gdat_params
.
error_bar
,
gdat_params
.
nverbose
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment