detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-29 09:30:02 +02:00
Code Issues Actions Packages Releases Activity

jungfrau bug fix: adc phase corrected to correctly return value in -1

Browse Source
This commit is contained in:
maliakal_d 2018-03-08 14:02:02 +01:00
parent 28101bed22
commit 7649865a8f
7 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
RELEASE.txt
View File

@ -1,11 +1,11 @@
SLS Detector Package 3.0.1 released on 2018-02-12 SLS Detector Package 3.1.0 released on 2018-03-08
================================================= =================================================
INTRODUCTION INTRODUCTION
This document describes the differences between 3.0.0 and 3.0.1 release. This document describes the differences between 3.1.0 and 3.0.0 releases.
The conda package of the binaries can be downloaded from The conda package of the binaries can be downloaded from
@ -227,7 +227,7 @@ New Features
Gui Gui
--- ---
18. If acquisition is done, but "stop dummy packet" to the gui was lost in 19. If acquisition is done, but "stop dummy packet" to the gui was lost in
the network, stop acquisition command will restream it so that the gui the network, stop acquisition command will restream it so that the gui
doesnt hang forever. This is used only for very fast detectors like doesnt hang forever. This is used only for very fast detectors like
Moench. Moench.
@ -249,6 +249,8 @@ Resolved Issues
3. More locking to handle main and processing threads using the threadpool. 3. More locking to handle main and processing threads using the threadpool.
Removing unlock twice, which is undefined behavior. Removing unlock twice, which is undefined behavior.
4. (Jungfrau) adcphase returns the correct value, instead of -1.
Detector Server Detector Server
--------------- ---------------

BIN
manual/docs/html/slsDetectors-FAQ/img36.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB

2
manual/docs/html/slsDetectors-FAQ/index.html
View File

@ -31,7 +31,7 @@ Frequently Asked Questions">
Frequently Asked Questions</H1> Frequently Asked Questions</H1>
<P ALIGN=CENTER><STRONG>Anna Bergamaschi</STRONG> <P ALIGN=CENTER><STRONG>Anna Bergamaschi</STRONG>
</P> </P>
<BR><P ALIGN=CENTER><B>Date:</B> February 27, 2018</P> <BR><P ALIGN=CENTER><B>Date:</B> February 28, 2018</P>
<HR> <HR>

2
manual/docs/html/slsDetectors-FAQ/slsDetectors-FAQ.html
View File

@ -31,7 +31,7 @@ Frequently Asked Questions">
Frequently Asked Questions</H1> Frequently Asked Questions</H1>
<P ALIGN=CENTER><STRONG>Anna Bergamaschi</STRONG> <P ALIGN=CENTER><STRONG>Anna Bergamaschi</STRONG>
</P> </P>
<BR><P ALIGN=CENTER><B>Date:</B> February 27, 2018</P> <BR><P ALIGN=CENTER><B>Date:</B> February 28, 2018</P>
<HR> <HR>

BIN
manual/docs/pdf/slsDetectorInstall.pdf
View File

Binary file not shown.

BIN
manual/docs/pdf/slsDetectors-FAQ.pdf
View File

Binary file not shown.

3
slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp
View File

@ -5685,6 +5685,9 @@ string slsDetectorCommand::cmdSpeed(int narg, char *args[], int action) {
return string("cannot scan speed value ")+string(args[1]); return string("cannot scan speed value ")+string(args[1]);
} }
// -1 could work
else if (cmd=="adcphase")
t = 65536;
myDet->setOnline(ONLINE_FLAG); myDet->setOnline(ONLINE_FLAG);