Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
gdat
Manage
Activity
Members
Labels
Plan
Issues
36
Issue boards
Milestones
Wiki
Code
Merge requests
13
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
Merge requests
!70
add ece and reset_public and mdsconnect for JET
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
add ece and reset_public and mdsconnect for JET
jet_ece
into
master
Overview
0
Commits
1
Pipelines
1
Changes
2
Merged
Olivier Sauter
requested to merge
jet_ece
into
master
4 years ago
Overview
0
Commits
1
Pipelines
1
Changes
2
Expand
👍
0
👎
0
Merge request reports
Compare
master
master (base)
and
latest version
latest version
1824dbfc
1 commit,
4 years ago
2 files
+
73
−
0
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
2
Search (e.g. *.vue) (Ctrl+P)
matlab/JET/gdat_jet.m
+
72
−
0
Options
@@ -533,6 +533,78 @@ elseif strcmp(mapping_for_jet.method,'switchcase')
gdat_data
.
dimunits
{
1
}
=
''
;
gdat_data
.
dimunits
{
2
}
=
's'
;
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
case
{
'ece'
,
'eced'
,
'ece_rho'
,
'eced_rho'
}
params_eff
=
gdat_data
.
gdat_params
;
channel_index
=
[
1
96
];
if
~
isfield
(
params_eff
,
'channel_index'
)
||
isempty
(
params_eff
.
channel_index
)
params_eff
.
channel_index
=
channel_index
;
else
channel_index
=
params_eff
.
channel_index
;
end
channel_index_list
=
channel_index
;
if
numel
(
channel_index
)
==
2
;
channel_index_list
=
[
channel_index
(
1
):
channel_index
(
2
)];
end
if
isfield
(
params_eff
,
'time_interval'
)
&&
~
isempty
(
params_eff
.
time_interval
)
&&
length
(
params_eff
.
time_interval
)
>=
2
time_interval
=
params_eff
.
time_interval
;
else
time_interval
=
[];
end
gdat_data
.
gdat_params
.
time_interval
=
time_interval
;
fit_tension_default
=
-
3.
;
if
isfield
(
params_eff
,
'fit_tension'
)
fit_tension
=
params_eff
.
fit_tension
;
else
fit_tension
=
fit_tension_default
;
end
i
=
channel_index_list
(
1
);
aa
.
data
=
[];
for
i
=
channel_index_list
(
2
:
end
)
mdsconnect
(
'mdsplus.jet.efda.org'
);
if
isempty
(
aa
.
data
)
params_eff
.
data_request
=
{
'ppf'
,
'kk3'
,
num2str
(
i
,
'te%.2d'
)};
aa
=
gdat_jet
(
shot
,
params_eff
);
if
~
isempty
(
aa
.
data
)
aa_data_start
(
i
,:)
=
reshape
(
aa
.
data
,
1
,
numel
(
aa
.
data
));
aa
.
data
=
aa_data_start
;
params_eff
.
data_request
=
{
'ppf'
,
'kk3'
,
num2str
(
i
,
'rc%.2d'
)};
mdsconnect
(
'mdsplus.jet.efda.org'
);
gdat_data
.
rc
=
gdat_jet
(
shot
,
params_eff
);
rc_data
(
i
,:)
=
reshape
(
gdat_data
.
rc
.
data
,
1
,
numel
(
gdat_data
.
rc
.
data
));
gdat_data
.
rc
.
data
=
rc_data
;
end
else
% assume same time for all
rda_data_request
=
[
'ppf/kk3/'
num2str
(
i
,
'te%.2d'
)];
bb
=
mdsvalue
([
'_bb=jet("'
rda_data_request
'",'
num2str
(
shot
)
')'
]);
if
~
isempty
(
bb
)
&&
numel
(
bb
)
==
size
(
aa
.
data
,
2
)
aa
.
data
(
i
,:)
=
bb
;
end
mdsconnect
(
'mdsplus.jet.efda.org'
);
rda_data_request
=
[
'ppf/kk3/'
num2str
(
i
,
'rc%.2d'
)];
bb
=
mdsvalue
([
'_bb=jet("'
rda_data_request
'",'
num2str
(
shot
)
')'
]);
if
~
isempty
(
bb
)
&&
numel
(
bb
)
==
size
(
gdat_data
.
rc
.
data
,
2
)
gdat_data
.
rc
.
data
(
i
,:)
=
bb
;
end
end
end
gdat_data
.
data
=
aa
.
data
;
gdat_data
.
t
=
aa
.
t
;
gdat_data
.
units
=
'eV'
;
gdat_data
.
dim
{
1
}
=
channel_index_list
;
gdat_data
.
dim
{
2
}
=
gdat_data
.
t
;
gdat_data
.
x
=
gdat_data
.
dim
{
1
};
gdat_data
.
dimunits
{
1
}
=
'xx'
;
gdat_data
.
dimunits
{
2
}
=
's'
;
gdat_data
.
data_fullpath
=
aa
.
data_fullpath
;
gdat_data
.
label
=
aa
.
label
;
gdat_data
.
help
=
'using jet() call for other data channels to avoid loading t many times'
;
gdat_data
.
rc
.
units
=
'm'
;
gdat_data
.
rc
.
dim
{
1
}
=
channel_index_list
;
gdat_data
.
rc
.
dim
{
2
}
=
gdat_data
.
rc
.
t
;
gdat_data
.
rc
.
x
=
gdat_data
.
rc
.
dim
{
1
};
gdat_data
.
rc
.
dimunits
{
1
}
=
'xx'
;
gdat_data
.
rc
.
dimunits
{
2
}
=
's'
;
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
case
{
'eqdsk'
}
%
Loading