detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-12 12:57:13 +02:00
Code Issues Actions Packages Releases Activity

binaries and fix

Browse Source
This commit is contained in:
maliakal_d
2020-07-02 17:15:24 +02:00
parent 0dc062e6d3
commit 7c48ef8931
9 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer
View File

Binary file not shown.

BIN
slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer
View File

Binary file not shown.

BIN
slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer
View File

Binary file not shown.

BIN
slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_developer
View File

Binary file not shown.

BIN
slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer
View File

Binary file not shown.

BIN
slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer
View File

Binary file not shown.

BIN
slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer
View File

Binary file not shown.

9
slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c
View File

@ -1913,7 +1913,14 @@ int set_num_frames(int file_des) {
// only set // only set
if (Server_VerifyLock() == OK) { if (Server_VerifyLock() == OK) {
// only set number of frames if normal mode (not scan) // only set number of frames if normal mode (not scan)
if (!scan) { if (scan) {
if (arg != numScanSteps) {
ret = FAIL;
sprintf(mess,
"Could not set number of frames %lld. In scan mode, it is number of steps %d\n", (long long unsigned int)arg, numScanSteps);
LOG(logERROR, (mess));
}
} else {
#ifdef GOTTHARD2D #ifdef GOTTHARD2D
// validate #frames in burst mode // validate #frames in burst mode
if (getBurstMode() != BURST_OFF && arg > MAX_FRAMES_IN_BURST_MODE) { if (getBurstMode() != BURST_OFF && arg > MAX_FRAMES_IN_BURST_MODE) {

2
slsSupportLib/src/ToString.cpp
View File

@ -107,7 +107,7 @@ std::string ToString(const slsDetectorDefs::scanParameters &r) {
oss << '['; oss << '[';
if (r.enable) { if (r.enable) {
oss << "enabled " << std::endl oss << "enabled " << std::endl
<< "dac " << r.dacInd << std::endl << "dac " << ToString(r.dacInd) << std::endl
<< "start " << r.startOffset << std::endl << "start " << r.startOffset << std::endl
<< "stop " << r.stopOffset << std::endl << "stop " << r.stopOffset << std::endl
<< "step " << r.stepSize << std::endl << "step " << r.stepSize << std::endl