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

added nextframenumber for moench, ctb (also for virtual servers)

Browse Source
This commit is contained in:
maliakal_d
2022-01-28 11:32:27 +01:00
parent f6e76145c1
commit 5a69c60205
12 changed files with 110 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
slsDetectorServers/slsDetectorServer/include/slsDetectorFunctionList.h
View File

@ -213,7 +213,8 @@ int getReadoutMode();
int selectStoragecellStart(int pos);
int getMaxStoragecellStart();
#endif
#if defined(JUNGFRAUD) || defined(EIGERD)
#if defined(JUNGFRAUD) || defined(EIGERD) || defined(MOENCHD) || \
defined(CHIPTESTBOARDD)
int setNextFrameNumber(uint64_t value);
int getNextFrameNumber(uint64_t *value);
#endif

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

@ -4413,7 +4413,8 @@ int set_next_frame_number(int file_des) {
return printSocketReadError();
LOG(logINFO, ("Setting next frame number to %llu\n", arg));
#if (!defined(EIGERD)) && (!defined(JUNGFRAUD))
#if (!defined(EIGERD)) && (!defined(JUNGFRAUD)) && (!defined(MOENCHD)) && \
(!defined(CHIPTESTBOARDD))
functionNotImplemented();
#else
// only set
@ -4423,7 +4424,7 @@ int set_next_frame_number(int file_des) {
sprintf(mess, "Could not set next frame number. Cannot be 0.\n");
LOG(logERROR, (mess));
}
#ifdef EIGERD
#if (defined(EIGERD)) || (defined(MOENCHD)) || (defined(CHIPTESTBOARDD))
else if (arg > UDP_HEADER_MAX_FRAME_VALUE) {
ret = FAIL;
#ifdef VIRTUAL
@ -4443,16 +4444,18 @@ int set_next_frame_number(int file_des) {
else {
ret = setNextFrameNumber(arg);
if (ret == FAIL) {
sprintf(mess, "Could not set next frame number. Failed to "
"map address.\n");
sprintf(
mess, "Could not set next frame number. %s\n",
(myDetectorType == EIGER ? "Failed to map address" : ""));
LOG(logERROR, (mess));
}
if (ret == OK) {
uint64_t retval = 0;
ret = getNextFrameNumber(&retval);
if (ret == FAIL) {
sprintf(mess, "Could not get next frame number. Failed "
"to map address.\n");
sprintf(mess, "Could not set next frame number. %s\n",
(myDetectorType == EIGER ? "Failed to map address"
: ""));
LOG(logERROR, (mess));
} else if (ret == -2) {
sprintf(mess, "Inconsistent next frame number from "
@ -4489,14 +4492,15 @@ int get_next_frame_number(int file_des) {
LOG(logDEBUG1, ("Getting next frame number \n"));
#if (!defined(EIGERD)) && (!defined(JUNGFRAUD))
#if (!defined(EIGERD)) && (!defined(JUNGFRAUD)) && (!defined(MOENCHD)) && \
(!defined(CHIPTESTBOARDD))
functionNotImplemented();
#else
// get
ret = getNextFrameNumber(&retval);
if (ret == FAIL) {
sprintf(mess, "Could not get next frame number. Failed to map "
"address.\n");
sprintf(mess, "Could not set next frame number. %s\n",
(myDetectorType == EIGER ? "Failed to map address" : ""));
LOG(logERROR, (mess));
} else if (ret == -2) {
sprintf(mess, "Inconsistent next frame number from left and right "