Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Instrument Control
NomadSpecialModules
Commits
b72ad314
Commit
b72ad314
authored
Oct 18, 2019
by
Cristina Cocho
Browse files
Recovered some lost traces due to a revert...
parent
1901a3fc
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/controllers/lss/d22special/CountWithSpectro.cpp
View file @
b72ad314
...
...
@@ -164,7 +164,11 @@ void CountWithSpectro::start() {
spectro
->
mode
=
QE65000Controller
::
COUNT_SINGLE
;
}
//Launch count and spectro at the same time
// Log info
log
(
Level
::
s_Info
)
<<
name
<<
cursor
<<
" start, Count time: "
<<
countTime
<<
" (sec), Spectro integration time: "
<<
integrationTime
<<
" (microsec) with num. measures: "
<<
numSpectroMeasures
()
<<
" and averages per measure: "
<<
scansToAverage
()
<<
endlog
;
// Launch count and spectro at the same time
// Run the threads in parallel in a group
boost
::
thread_group
group
;
...
...
@@ -181,6 +185,8 @@ void CountWithSpectro::start() {
commandStatus
.
setIdle
();
spectro
->
mode
=
QE65000Controller
::
IDLE
;
log
(
Level
::
s_Info
)
<<
name
<<
emptycursor
<<
" finished with Numor: "
<<
count
->
numor
()
<<
endlog
;
}
}
else
{
...
...
@@ -202,6 +208,10 @@ void CountWithSpectro::start() {
commandStatus
.
setRunning
();
spectro
->
mode
=
QE65000Controller
::
COUNT_SWITCHER
;
// Log info
log
(
Level
::
s_Info
)
<<
name
<<
cursor
<<
" start in switcher mode, Count time: "
<<
countTime
<<
" (sec), Spectro integration time: "
<<
integrationTime
<<
" (microsec) with num. measures: "
<<
numSpectroMeasures
()
<<
" and averages per measure: "
<<
scansToAverage
()
<<
endlog
;
//Launch count and spectro at the same time
// Run the threads in parallel in a group
boost
::
thread_group
group
;
...
...
@@ -216,6 +226,8 @@ void CountWithSpectro::start() {
saveSwitcherSpectroData
();
commandStatus
.
setIdle
();
spectro
->
mode
=
QE65000Controller
::
IDLE
;
log
(
Level
::
s_Info
)
<<
name
<<
emptycursor
<<
" with Numor: "
<<
count
->
numor
()
<<
endlog
;
}
}
//clean arrays
...
...
@@ -224,6 +236,9 @@ void CountWithSpectro::start() {
}
void
CountWithSpectro
::
stop
()
{
// Log info
log
(
Level
::
s_Info
)
<<
name
<<
emptycursor
<<
"stopped"
<<
endlog
;
if
(
commandStatus
.
isRunning
())
{
count
->
stopParallel
();
spectro
->
stopParallel
();
...
...
@@ -250,7 +265,7 @@ void CountWithSpectro::startSpectro() {
common
::
Duration
duration
=
time
-
formerTime
;
measureDuration
.
set
(
i
,
duration
.
getMilliseconds
());
std
::
cout
<<
"------------> Measure duration "
<<
duration
.
getMilliseconds
()
<<
std
::
endl
;
//
std::cout << "------------> Measure duration " << duration.getMilliseconds() << std::endl;
spectro
->
startCommand
();
...
...
@@ -311,6 +326,7 @@ void CountWithSpectro::setupCountParams() {
count
->
time
.
setpoint
=
countTime
();
count
->
timeType
=
timeType
();
count
->
subtitle
=
subtitle
();
count
->
mode
=
acquisition
::
TimeAcquisitionController
::
TIME_MODE
;
}
void
CountWithSpectro
::
initArrays
()
{
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment