Commit 6947fe62 authored by Georg Auzinger's avatar Georg Auzinger
Browse files

uncommented BiasSweeps

parent 97a17fe7
...@@ -18,6 +18,7 @@ void Watchdog::Stop() ...@@ -18,6 +18,7 @@ void Watchdog::Stop()
std::unique_lock<std::mutex> cLock (fMutex); std::unique_lock<std::mutex> cLock (fMutex);
fRunning = false; fRunning = false;
fStopCondition.notify_all(); fStopCondition.notify_all();
cLock.unlock();
if (fThread.joinable() ) fThread.join(); if (fThread.joinable() ) fThread.join();
} }
...@@ -41,6 +42,8 @@ void Watchdog::Workloop() ...@@ -41,6 +42,8 @@ void Watchdog::Workloop()
// 3. or until spurious wakeup // 3. or until spurious wakeup
fStopCondition.wait_for (cLock, fTimeout ) ; fStopCondition.wait_for (cLock, fTimeout ) ;
//cLock.unlock();
if (fRunning.load() ) if (fRunning.load() )
{ {
fRunning = false; fRunning = false;
......
...@@ -205,7 +205,7 @@ int main ( int argc, char* argv[] ) ...@@ -205,7 +205,7 @@ int main ( int argc, char* argv[] )
} }
} }
cDog.Reset (30); cDog.Reset (50);
//t.stop(); //t.stop();
//t.show ( "Time to sweep all biases" ); //t.show ( "Time to sweep all biases" );
...@@ -219,7 +219,7 @@ int main ( int argc, char* argv[] ) ...@@ -219,7 +219,7 @@ int main ( int argc, char* argv[] )
cCalibration.writeObjects(); cCalibration.writeObjects();
cCalibration.dumpConfigFiles(); cCalibration.dumpConfigFiles();
cDog.Reset (50); cDog.Reset (70);
////now run a noise scan ////now run a noise scan
PedeNoise cPedeNoise; PedeNoise cPedeNoise;
...@@ -317,7 +317,6 @@ int main ( int argc, char* argv[] ) ...@@ -317,7 +317,6 @@ int main ( int argc, char* argv[] )
cDog.Stop(); cDog.Stop();
} }
LOG (INFO) << GREEN << "Irradiation Test exited normally!" << RESET;
cDog.Stop(); cDog.Stop();
if ( !batchMode ) if ( !batchMode )
...@@ -327,5 +326,7 @@ int main ( int argc, char* argv[] ) ...@@ -327,5 +326,7 @@ int main ( int argc, char* argv[] )
if (cKeController) delete cKeController; if (cKeController) delete cKeController;
LOG (INFO) << GREEN << "Irradiation Test exited normally!" << RESET;
return 0; return 0;
} }
Supports Markdown
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