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

gotthard2: disentangled burst mode #frames, exptime, period from start of acquisition, order dependent now for debugging

Browse Source
This commit is contained in:
maliakal_d
2020-02-04 12:23:58 +01:00
parent c4559fadb3
commit d3dc9a7690
5 changed files with 52 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1769,12 +1769,6 @@ int start_acquisition(int file_des) {
FILE_LOG(logERROR,(mess));
}
else
#endif
#ifdef GOTTHARD2D
if (updateAcquisitionRegisters(mess) == FAIL) {
ret = FAIL;
}
else
#endif
if (configured == FAIL) {
ret = FAIL;
@ -1905,12 +1899,6 @@ int start_and_read_all(int file_des) {
FILE_LOG(logERROR,(mess));
}
else
#endif
#ifdef GOTTHARD2D
if (updateAcquisitionRegisters(mess) == FAIL) {
ret = FAIL;
}
else
#endif
if (configured == FAIL) {
ret = FAIL;
@ -1977,10 +1965,20 @@ int set_num_frames(int file_des) {
// only set
if (Server_VerifyLock() == OK) {
setNumFrames(arg);
int64_t retval = getNumFrames();
FILE_LOG(logDEBUG1, ("retval num frames %lld\n", (long long int)retval));
validate64(arg, retval, "set number of frames", DEC);
#ifdef GOTTHARD2D
// validate #frames in burst mode
if (getBurstMode() != BURST_OFF && arg > MAX_FRAMES_IN_BURST_MODE) {
ret = FAIL;
sprintf(mess, "Could not set number of frames %lld. Must be <= %d in burst mode.\n", (long long unsigned int)arg, MAX_FRAMES_IN_BURST_MODE);
FILE_LOG(logERROR,(mess));
}
#endif
if (ret == OK) {
setNumFrames(arg);
int64_t retval = getNumFrames();
FILE_LOG(logDEBUG1, ("retval num frames %lld\n", (long long int)retval));
validate64(arg, retval, "set number of frames", DEC);
}
}
return Server_SendResult(file_des, INT64, UPDATE, NULL, 0);
}