Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Irene Mateos Dominguez
Ph2_ACF
Commits
6947fe62
Commit
6947fe62
authored
Feb 09, 2017
by
Georg Auzinger
Browse files
uncommented BiasSweeps
parent
97a17fe7
Changes
2
Hide whitespace changes
Inline
Side-by-side
Utils/Watchdog.cc
View file @
6947fe62
...
...
@@ -18,6 +18,7 @@ void Watchdog::Stop()
std
::
unique_lock
<
std
::
mutex
>
cLock
(
fMutex
);
fRunning
=
false
;
fStopCondition
.
notify_all
();
cLock
.
unlock
();
if
(
fThread
.
joinable
()
)
fThread
.
join
();
}
...
...
@@ -41,6 +42,8 @@ void Watchdog::Workloop()
// 3. or until spurious wakeup
fStopCondition
.
wait_for
(
cLock
,
fTimeout
)
;
//cLock.unlock();
if
(
fRunning
.
load
()
)
{
fRunning
=
false
;
...
...
src/cbc3irrad.cc
View file @
6947fe62
...
...
@@ -205,7 +205,7 @@ int main ( int argc, char* argv[] )
}
}
cDog
.
Reset
(
3
0
);
cDog
.
Reset
(
5
0
);
//t.stop();
//t.show ( "Time to sweep all biases" );
...
...
@@ -219,7 +219,7 @@ int main ( int argc, char* argv[] )
cCalibration
.
writeObjects
();
cCalibration
.
dumpConfigFiles
();
cDog
.
Reset
(
5
0
);
cDog
.
Reset
(
7
0
);
////now run a noise scan
PedeNoise
cPedeNoise
;
...
...
@@ -317,7 +317,6 @@ int main ( int argc, char* argv[] )
cDog
.
Stop
();
}
LOG
(
INFO
)
<<
GREEN
<<
"Irradiation Test exited normally!"
<<
RESET
;
cDog
.
Stop
();
if
(
!
batchMode
)
...
...
@@ -327,5 +326,7 @@ int main ( int argc, char* argv[] )
if
(
cKeController
)
delete
cKeController
;
LOG
(
INFO
)
<<
GREEN
<<
"Irradiation Test exited normally!"
<<
RESET
;
return
0
;
}
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a 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