Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
SCDDS-core
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Analyze
Contributor 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
SCDDS
SCDDS-core
Commits
65ad0a0a
Commit
65ad0a0a
authored
5 years ago
by
Cristian Galperti
Browse files
Options
Downloads
Patches
Plain Diff
All new node 02 inputs matching with std acq
The only differences are due to ADC calibration differences
parent
43368a14
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
code/classes/SCDclass_taskmdsloadprevADC.m
+32
-1
32 additions, 1 deletion
code/classes/SCDclass_taskmdsloadprevADC.m
with
32 additions
and
1 deletion
code/classes/SCDclass_taskmdsloadprevADC.m
+
32
−
1
View file @
65ad0a0a
...
@@ -41,7 +41,11 @@ classdef SCDclass_taskmdsloadprevADC < SCDclass_task
...
@@ -41,7 +41,11 @@ classdef SCDclass_taskmdsloadprevADC < SCDclass_task
switch
(
obj
.
node
)
switch
(
obj
.
node
)
case
2
case
2
[
~
,
value
]
=
obj
.
getdataNode02ACQ196
(
shot
);
%% Here we need to switch betweeen old and new acquisition unit and tcv standard also
if
shot
<
65113
[
~
,
value
]
=
obj
.
getdataNode02ACQ196
(
shot
);
%% Here we need to switch betweeen old and new acquisition unit and tcv standard also
else
[
~
,
value
]
=
obj
.
getdataNode02tst
(
shot
);
%% Here we need to switch betweeen old and new acquisition unit and tcv standard also
end
end
end
end
end
...
@@ -121,6 +125,33 @@ classdef SCDclass_taskmdsloadprevADC < SCDclass_task
...
@@ -121,6 +125,33 @@ classdef SCDclass_taskmdsloadprevADC < SCDclass_task
end
end
end
end
function
[
obj
,
value
]
=
getdataNode02tst
(
obj
,
shot
)
% TODO: this should go away as soon as we use the official rtc
% tree
mdsopen
(
'rtctst'
,
shot
);
T
=
timeseries
;
timebase
=
mdsvalue
(
'dim_of(\top.tcvrt02.adc.adc_001)'
);
%% TODO: check with marte
d_time
=
double
(
mdsvalueraw
(
'\top.tcvrt02.params:d_time'
))
*
1.0e-6
;
%timebase = round(timebase.*1/d_time)*d_time-d_time/2;
timebase
=
round
(
timebase
.*
1
/
d_time
)
*
d_time
-
d_time
/
100
;
T
.
Time
=
timebase
;
T
.
Data
=
zeros
(
numel
(
timebase
),
192
);
if
obj
.
verbose
==
1
fprintf
(
'Getting data for bus:
''
%s
''
(%s, shot %d) '
,
obj
.
modelbus
,
obj
.
classname
,
shot
);
end
for
ii
=
1
:
192
channelstr
=
sprintf
(
'\\top.tcvrt02.adc.adc_%03d.raw'
,
ii
);
T
.
Data
(:,
ii
)
=
int16
(
mdsvalue
(
channelstr
));
if
obj
.
verbose
==
1
&&
mod
(
ii
,
4
)
==
0
fprintf
(
'.'
);
end
end
value
=
T
;
if
obj
.
verbose
==
1
fprintf
(
'\n'
);
end
end
end
end
end
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