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

Revert "Modifications in CountWithSpectro"

This reverts commit bb6b30a0.
parent bb6b30a0
......@@ -164,11 +164,7 @@ void CountWithSpectro::start() {
spectro->mode = QE65000Controller::COUNT_SINGLE;
}
// 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
//Launch count and spectro at the same time
// Run the threads in parallel in a group
boost::thread_group group;
......@@ -185,8 +181,6 @@ void CountWithSpectro::start() {
commandStatus.setIdle();
spectro->mode = QE65000Controller::IDLE;
log(Level::s_Info) << name << emptycursor << " finished with Numor: " << count->numor() << endlog;
}
} else {
......@@ -208,10 +202,6 @@ 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;
......@@ -226,8 +216,6 @@ void CountWithSpectro::start() {
saveSwitcherSpectroData();
commandStatus.setIdle();
spectro->mode = QE65000Controller::IDLE;
log(Level::s_Info) << name << emptycursor << " with Numor: " << count->numor() << endlog;
}
}
//clean arrays
......@@ -236,9 +224,6 @@ void CountWithSpectro::start() {
}
void CountWithSpectro::stop() {
// Log info
log(Level::s_Info) << name << emptycursor << "stopped" << endlog;
if (commandStatus.isRunning()) {
count->stopParallel();
spectro->stopParallel();
......@@ -265,7 +250,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();
......@@ -326,7 +311,6 @@ void CountWithSpectro::setupCountParams() {
count->time.setpoint = countTime();
count->timeType = timeType();
count->subtitle = subtitle();
count->mode = acquisition::TimeAcquisitionController::TIME_MODE;
}
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