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
79172dc4
Commit
79172dc4
authored
8 months ago
by
Olivier Sauter
Browse files
Options
Downloads
Patches
Plain Diff
fix in case of empty shot call to gdat (for ids empty)
parent
f15c0a14
No related branches found
No related tags found
1 merge request
!158
fix in case of empty shot call to gdat (for ids empty)
Pipeline
#203844
passed
8 months ago
Stage: test
Stage: post-test
Changes
1
Pipelines
5
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
matlab/gdat.m
+10
-6
10 additions, 6 deletions
matlab/gdat.m
with
10 additions
and
6 deletions
matlab/gdat.m
+
10
−
6
View file @
79172dc4
...
...
@@ -190,14 +190,18 @@ try
% treat multiple shot numbers
if
nargin
>
0
&&
isnumeric
(
shot
)
args_in
=
args
;
for
i
=
1
:
numel
(
shot
)
args
{
1
}
=
shot
(
i
);
[
gdat_data_i
,
gdat_params
,
error_status
(
i
),
varargout
]
=
feval
([
'gdat_'
lower
(
machine_eff
)],
args
{:});
gdat_data_i
.
gdat_params
.
machine
=
lower
(
gdat_data_i
.
gdat_params
.
machine
);
gdat_data
(
i
)
=
gdat_data_i
;
if
~
isempty
(
shot
)
for
i
=
1
:
numel
(
shot
)
args
{
1
}
=
shot
(
i
);
[
gdat_data_i
,
gdat_params
,
error_status
(
i
),
varargout_gdat
]
=
feval
([
'gdat_'
lower
(
machine_eff
)],
args
{:});
gdat_data_i
.
gdat_params
.
machine
=
lower
(
gdat_data_i
.
gdat_params
.
machine
);
gdat_data
(
i
)
=
gdat_data_i
;
end
else
[
gdat_data
,
gdat_params
,
error_status
,
varargout_gdat
]
=
feval
([
'gdat_'
lower
(
machine_eff
)],
args
{:});
end
else
[
gdat_data
,
gdat_params
,
error_status
,
varargout
]
=
feval
([
'gdat_'
lower
(
machine_eff
)],
args
{:});
[
gdat_data
,
gdat_params
,
error_status
,
varargout
_gdat
]
=
feval
([
'gdat_'
lower
(
machine_eff
)],
args
{:});
% because data request can be an actual detailed tree related signal, upper and lower case need to be kept, but other places remain with lower case when case insensitive
% needed since some substructure have machine name like mapping_for
gdat_data
.
gdat_params
.
machine
=
lower
(
gdat_data
.
gdat_params
.
machine
);
...
...
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