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

fixes

Browse Source
This commit is contained in:
maliakal_d
2021-08-16 14:30:47 +02:00
parent 5790e4961b
commit 5f8dc7a7f0
6 changed files with 82 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1694,8 +1694,8 @@ int acquire(int blocking, int file_des) {
// chipv1.1 has to be configured before acquisition
if (getChipVersion() == 11 && !isChipConfigured()) {
ret = FAIL;
strcpy(mess,
"Could not start acquisition. Chip is not configured.\n");
strcpy(mess, "Could not start acquisition. Chip is not configured. "
"Power it on to configure it.\n");
LOG(logERROR, (mess));
} else
#endif
@ -4755,11 +4755,13 @@ int set_partial_readout(int file_des) {
maxnl);
LOG(logERROR, (mess));
} else
#elif JUNGFRAU
#elif JUNGFRAUD
if (arg % PARTIAL_READOUT_MULTIPLE != 0) {
ret = FAIL;
sprintf(mess,
"Could not set %d partial readout. %d must be a multiple of %d\n", arg, PARTIAL_READOUT_MULTIPLE);
"Could not set partial readout. %d must be a multiple "
"of %d\n",
arg, PARTIAL_READOUT_MULTIPLE);
LOG(logERROR, (mess));
} else
#endif
@ -7137,7 +7139,7 @@ int get_receiver_parameters(int file_des) {
return printSocketReadError();
// partialReadout
#ifdef EIGERD
#if defined(EIGERD) || defined(JUNGFRAUD)
i32 = getPartialReadout();
#else
i32 = 0;