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

slsDetectorSoftware: users class setsettings(-1) gave undefined settings from slsDetector::setSettings. It has been fixed.

Browse Source
This commit is contained in:
maliakal_d 2018-07-23 14:57:27 +02:00
parent f79b009978
commit 07a120fc4a
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
RELEASE.txt
View File

@ -1,4 +1,4 @@
SLS Detector Package 3.1.4 released on 2018-07-17 SLS Detector Package 3.1.4 released on 2018-07-25
================================================= =================================================
@ -10,12 +10,18 @@ This document describes the differences between 3.1.4 into 3.1.3 releases.
Topics Concerning Topics Concerning
================== ==================
HDF5 in Receiver - get settings in users class
- HDF5 in Receiver
Resolved Issues Resolved Issues
=============== ===============
Client
------
1. Users class setSettings(-1) gave undefined settings. Has been fixed.
Receiver Receiver
-------- --------
1. HDF5 x dimension (#images). Max made unlimited. Chunked Dataset by default. 1. HDF5 x dimension (#images). Max made unlimited. Chunked Dataset by default.

3
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -3701,6 +3701,9 @@ slsDetectorDefs::detectorSettings slsDetector::setSettings( detectorSettings ise
std::cout<< "slsDetector setSettings "<< std::endl; std::cout<< "slsDetector setSettings "<< std::endl;
#endif #endif
if (isettings == -1)
return getSettings(imod);
//only set client shared memory variable for Eiger, settings threshold loads the module data (trimbits, dacs etc.) //only set client shared memory variable for Eiger, settings threshold loads the module data (trimbits, dacs etc.)
if (thisDetector->myDetectorType == EIGER) { if (thisDetector->myDetectorType == EIGER) {
switch(isettings) { switch(isettings) {