Commit b72ad314 authored by Cristina Cocho's avatar Cristina Cocho
Browse files

Recovered some lost traces due to a revert...

parent 1901a3fc
...@@ -164,7 +164,11 @@ void CountWithSpectro::start() { ...@@ -164,7 +164,11 @@ void CountWithSpectro::start() {
spectro->mode = QE65000Controller::COUNT_SINGLE; 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 // Run the threads in parallel in a group
boost::thread_group group; boost::thread_group group;
...@@ -181,6 +185,8 @@ void CountWithSpectro::start() { ...@@ -181,6 +185,8 @@ void CountWithSpectro::start() {
commandStatus.setIdle(); commandStatus.setIdle();
spectro->mode = QE65000Controller::IDLE; spectro->mode = QE65000Controller::IDLE;
log(Level::s_Info) << name << emptycursor << " finished with Numor: " << count->numor() << endlog;
} }
} else { } else {
...@@ -202,6 +208,10 @@ void CountWithSpectro::start() { ...@@ -202,6 +208,10 @@ void CountWithSpectro::start() {
commandStatus.setRunning(); commandStatus.setRunning();
spectro->mode = QE65000Controller::COUNT_SWITCHER; 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 //Launch count and spectro at the same time
// Run the threads in parallel in a group // Run the threads in parallel in a group
boost::thread_group group; boost::thread_group group;
...@@ -216,6 +226,8 @@ void CountWithSpectro::start() { ...@@ -216,6 +226,8 @@ void CountWithSpectro::start() {
saveSwitcherSpectroData(); saveSwitcherSpectroData();
commandStatus.setIdle(); commandStatus.setIdle();
spectro->mode = QE65000Controller::IDLE; spectro->mode = QE65000Controller::IDLE;
log(Level::s_Info) << name << emptycursor << " with Numor: " << count->numor() << endlog;
} }
} }
//clean arrays //clean arrays
...@@ -224,6 +236,9 @@ void CountWithSpectro::start() { ...@@ -224,6 +236,9 @@ void CountWithSpectro::start() {
} }
void CountWithSpectro::stop() { void CountWithSpectro::stop() {
// Log info
log(Level::s_Info) << name << emptycursor << "stopped" << endlog;
if (commandStatus.isRunning()) { if (commandStatus.isRunning()) {
count->stopParallel(); count->stopParallel();
spectro->stopParallel(); spectro->stopParallel();
...@@ -250,7 +265,7 @@ void CountWithSpectro::startSpectro() { ...@@ -250,7 +265,7 @@ void CountWithSpectro::startSpectro() {
common::Duration duration = time - formerTime; common::Duration duration = time - formerTime;
measureDuration.set(i, duration.getMilliseconds()); measureDuration.set(i, duration.getMilliseconds());
std::cout << "------------> Measure duration " << duration.getMilliseconds() << std::endl; //std::cout << "------------> Measure duration " << duration.getMilliseconds() << std::endl;
spectro->startCommand(); spectro->startCommand();
...@@ -311,6 +326,7 @@ void CountWithSpectro::setupCountParams() { ...@@ -311,6 +326,7 @@ void CountWithSpectro::setupCountParams() {
count->time.setpoint = countTime(); count->time.setpoint = countTime();
count->timeType = timeType(); count->timeType = timeType();
count->subtitle = subtitle(); count->subtitle = subtitle();
count->mode = acquisition::TimeAcquisitionController::TIME_MODE;
} }
void CountWithSpectro::initArrays() { void CountWithSpectro::initArrays() {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment