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
7bed38d6
Commit
7bed38d6
authored
2 weeks ago
by
Luke Simons
Browse files
Options
Downloads
Patches
Plain Diff
Changes to tcv2ids.m to generalise filling of library git info. Updated soft_x_rays git code info
parent
72f4a471
No related branches found
Branches containing commit
No related tags found
1 merge request
!174
Add tcv get ids soft x rays to tcv imas functions
Pipeline
#251764
failed
2 weeks 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_soft_x_rays.m
+7
-6
7 additions, 6 deletions
matlab/TCV_IMAS/tcv_get_ids_soft_x_rays.m
with
18 additions
and
6 deletions
matlab/TCV_IMAS/tcv2ids.m
+
11
−
0
View file @
7bed38d6
...
...
@@ -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_soft_x_rays.m
+
7
−
6
View file @
7bed38d6
...
...
@@ -36,6 +36,7 @@ ids_soft_x_rays_description = struct();
% Load the soft_x_rays geometry
sxr_geom
=
sxr_load_geometry
();
sxr_data
=
rc_load_diodes
(
shot
,
'diag_name'
,
'sxr'
);
status
=
numel
(
sxr_data
.
data
)
>
0
;
%get gdat version, FIXME: Need to write function
...
...
@@ -121,13 +122,13 @@ if status
ids_soft_x_rays
.
channel
{
ii
}
.
validity
=
0
;
% FIXME: Always valid data
ids_soft_x_rays
.
channel
{
ii
}
.
validity
=
0
*
ones
(
1
,
nchannel
);
ids_
bolometer
.
code
.
name
=
'rc_
gti_prep
'
;
ids_
bolometer
.
code
.
description
=
[
'rc_load_diodes, RADCAM gitlab repo, loads'
...
ids_
soft_x_rays
.
code
.
name
=
'rc_
load_diodes
'
;
ids_
soft_x_rays
.
code
.
description
=
[
'rc_load_diodes, RADCAM gitlab repo, loads'
...
'the signal from the SXR diodes in arbitrary units.'
];
ids_bo
lome
ter
.
code
.
commit
=
''
;
ids_soft_x_rays
.
code
.
version
=
''
;
ids_soft_x_rays
.
code
.
repository
=
...
'https://gitlab.epfl.ch/spc/tcv/diag/radcam/'
;
radcam_gitinfo
=
tcv_get_dep
lo
y
me
ntinfo
(
fullfile
(
fileparts
(
which
(
ids_soft_x_rays
.
code
.
name
)),
'.this-deployment.info'
))
;
ids_soft_x_rays
.
code
.
commit
=
library_gitinfo
.
git_commit
;
ids_soft_x_rays
.
code
.
version
=
library_gitinfo
.
git_tag
;
ids_soft_x_rays
.
code
.
repository
=
library_gitinfo
.
git_project_url
;
ids_soft_x_rays
.
code
.
parameters
=
'
''
diag_name
''
,
''
sxr
''
'
;
end
...
...
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