Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
LimaGroup
Lima-camera-pilatus
Commits
74fca8b4
Commit
74fca8b4
authored
Mar 26, 2018
by
Jose Tiago Macara Coutinho
Committed by
Operator for ID31
Mar 26, 2018
Browse files
Fix implementation of resetHighVoltage
parent
20923c69
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/PilatusCamera.cpp
View file @
74fca8b4
...
...
@@ -1231,12 +1231,28 @@ void Camera::resetHighVoltage(unsigned int sleep_time)
msg
<<
"resetmodulepower"
;
if
(
sleep_time
>
0.
)
msg
<<
" "
<<
sleep_time
;
m_state
=
Camera
::
RESET_HIGH_VOLTAGE
;
send
(
msg
.
str
());
m_cond
.
wait
(
sleep_time
);
while
(
m_state
==
Camera
::
RESET_HIGH_VOLTAGE
)
m_cond
.
wait
(
TIME_OUT
+
sleep_time
<
0.
?
0.
:
sleep_time
);
{
m_cond
.
wait
(
TIME_OUT
);
}
if
(
m_cmd_high_voltage_reset
==
DONT_HAVE_HIGH_VOLTAGE
)
THROW_HW_ERROR
(
Error
)
<<
"This detector doesn't have a "
<<
"command to reset high voltage"
;
{
THROW_HW_ERROR
(
Error
)
<<
"This detector doesn't have a "
<<
"command to reset high voltage"
;
}
else
{
m_cmd_high_voltage_reset
=
HAS_HIGH_VOLTAGE
;
}
if
(
m_state
==
Camera
::
ERROR
)
{
m_state
=
Camera
::
STANDBY
;
THROW_HW_ERROR
(
Error
)
<<
"Could not reset high voltage"
;
}
else
{
/** Refresh the energy settings.
...
...
Write
Preview
Markdown
is supported
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