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
a39c66b1
Commit
a39c66b1
authored
4 weeks ago
by
Luke Simons
Browse files
Options
Downloads
Patches
Plain Diff
Small suggested changes to comments
parent
0d5ad4a6
Branches
78-missing-power-launched-and-position-field-for-nbi-ids
Branches containing commit
Tags
crpptbx-9.6.0
crpptbx-9.6.0-deployed-crpptbx-release-v4.4.1
crpptbx-release-v4.4.1
1 merge request
!195
Resolve "Missing power launched and position field for NBI IDS"
Pipeline
#270053
passed
2 weeks ago
Stage: test
Stage: post-test
Changes
2
Pipelines
19
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
matlab/TCV_IMAS/tcv2ids.m
+2
-2
2 additions, 2 deletions
matlab/TCV_IMAS/tcv2ids.m
matlab/TCV_IMAS/tcv_get_ids_nbi.m
+0
-1
0 additions, 1 deletion
matlab/TCV_IMAS/tcv_get_ids_nbi.m
with
2 additions
and
3 deletions
matlab/TCV_IMAS/tcv2ids.m
+
2
−
2
View file @
a39c66b1
...
...
@@ -16,7 +16,7 @@ function [ids_from_tcv,varargout] = tcv2ids(shot,varargin);
% empty or 'delta' (default): meaning difference in upper is set (standard error_bar
% 'added': errorbar is added: upper=data+delta and lower=data-delta
% 'delta_with_lower': as 'delta' but lower also set
% 'cocos_out': (DD3 default 11, DD4 default 17) cocos to transform ids from TCV cocos_in=17 to cocos_out
% 'cocos_out': (DD3
and before
default 11, DD4 default 17) cocos to transform ids from TCV cocos_in=17 to cocos_out
% 'ipsign_out': if a specific sign fo Ip is desired in output within the cocos_out system (default 0=no specific sign)
% 'b0sign_out': if a specific sign fo B0 is desired in output within the cocos_out system (default 0=no specific sign)
% 'nverbose': (default 1), set it to 3 to have more messages, for example about not fully valid nodes when doing transformation (empty or Nans)
...
...
@@ -36,7 +36,7 @@ try
cocos_out_default
=
11
;
end
catch
disp
(
'IMAS_VERSION undefined, assuming cocos_out=17'
);
disp
(
'IMAS_VERSION undefined, assuming cocos_out
_default
=17'
);
end
% initialize input parser
...
...
This diff is collapsed.
Click to expand it.
matlab/TCV_IMAS/tcv_get_ids_nbi.m
+
0
−
1
View file @
a39c66b1
...
...
@@ -5,7 +5,6 @@ function [ids_nbi,ids_nbi_description,varargout] = tcv_get_ids_nbi(shot,ids_nbi_
%
% gdat_params: gdat_data.gdat_params to get all params passed from original call, in particular error_bar options
%
%
% Most information taken from NBI and NB_Model wiki pages:
% https://spcwiki.epfl.ch/wiki/NBI
% https://spcwiki.epfl.ch/wiki/NB_Model
...
...
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