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
2069eca7
Commit
2069eca7
authored
2 months ago
by
Luke Simons
Browse files
Options
Downloads
Patches
Plain Diff
Updated slightly calls to tcv_get_deploymentinfo
parent
d37b842a
Branches
Branches containing commit
Tags
Tags containing commit
1 merge request
!171
Resolve "Add tcv_get_ids_bolometer to TCV_IMAS functions"
Pipeline
#251766
failed
2 months ago
Stage: test
Stage: post-test
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
matlab/TCV_IMAS/tcv2ids.m
+11
-0
11 additions, 0 deletions
matlab/TCV_IMAS/tcv2ids.m
matlab/TCV_IMAS/tcv_get_ids_bolometer.m
+1
-9
1 addition, 9 deletions
matlab/TCV_IMAS/tcv_get_ids_bolometer.m
with
12 additions
and
9 deletions
matlab/TCV_IMAS/tcv2ids.m
+
11
−
0
View file @
2069eca7
...
...
@@ -117,6 +117,17 @@ for i=1:length(params_tcv2ids.ids_names)
tmp
=
gdat
(
shot
,
gdat_params
);
ids_from_tcv
.
(
ids_to_get
)
=
tmp
.
(
ids_to_get
);
ids_from_tcv
.
([
ids_to_get
'_description'
])
=
tmp
.
([
ids_to_get
'_description'
]);
% Retrieve versioning information from .this-deployment.info
for
ii
=
1
:
numel
(
ids_from_tcv
.
code
.
library
)
library_gitinfo
=
...
tcv_get_deploymentinfo
(
fullfile
(
fileparts
(
which
(
ids_from_tcv_
.
code
.
library
{
ii
}
.
name
)),
'.this-deployment.info'
));
ids_bolometer
.
code
.
library
{
ii
}
.
commit
=
library_gitinfo
.
git_commit
;
ids_bolometer
.
code
.
library
{
ii
}
.
version
=
library_gitinfo
.
git_tag
;
ids_bolometer
.
code
.
library
{
ii
}
.
repository
=
library_gitinfo
.
gitlab_project_url
;
end
end
if
nargout
>=
2
...
...
This diff is collapsed.
Click to expand it.
matlab/TCV_IMAS/tcv_get_ids_bolometer.m
+
1
−
9
View file @
2069eca7
...
...
@@ -167,17 +167,9 @@ if status
ids_bolometer
.
code
.
library
{
1
}
.
parameters
=
'TCV_EQ("psi")'
;
%% Code legacy for GTI
ids_bolometer
.
code
.
library
{
2
}
.
name
=
'gti'
;
ids_bolometer
.
code
.
library
{
2
}
.
name
=
'gti
_do_inversion
'
;
ids_bolometer
.
code
.
library
{
2
}
.
description
=
...
'General Tomographic Inversion'
;
for
ii
=
1
:
numel
(
ids_bolometer
.
code
.
library
)
library_gitinfo
=
...
tcv_get_deploymentinfo
(
fullfile
(
fileparts
(
which
(
'gti_do_inversion'
)),
'.this-deployment.info'
));
ids_bolometer
.
code
.
library
{
ii
}
.
commit
=
library_gitinfo
.
git_commit
;
ids_bolometer
.
code
.
library
{
ii
}
.
version
=
library_gitinfo
.
git_tag
;
ids_bolometer
.
code
.
library
{
ii
}
.
repository
=
library_gitinfo
.
gitlab_project_url
;
end
ids_bolometer
.
code
.
library
{
2
}
.
parameters
=
''
;
% FIXME: Values of bolo_u_confidence don't match output_flag
...
...
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