Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
LimaGroup
Lima-camera-slsdetector
Commits
bd790641
Commit
bd790641
authored
Jan 23, 2021
by
Alejandro Homs Puron
Committed by
operator for beamline
Jan 23, 2021
Browse files
Wait for camera to finish acquisition in Eiger & Jungfrau destructors
* Test sequences were destroying model while still in use
parent
8e7ba1d3
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/SlsDetectorEiger.cpp
View file @
bd790641
...
...
@@ -753,6 +753,7 @@ Eiger::Eiger(Camera *cam)
Eiger
::~
Eiger
()
{
DEB_DESTRUCTOR
();
getCamera
()
->
waitAcqState
(
Idle
);
removeAllCorr
();
}
...
...
src/SlsDetectorJungfrau.cpp
View file @
bd790641
...
...
@@ -127,6 +127,7 @@ Jungfrau::Jungfrau(Camera *cam)
Jungfrau
::~
Jungfrau
()
{
DEB_DESTRUCTOR
();
getCamera
()
->
waitAcqState
(
Idle
);
}
void
Jungfrau
::
getFrameDim
(
FrameDim
&
frame_dim
,
bool
raw
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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