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

eiger server: vcal=0, rx_fifodepth to greater than 32 bit, trimval argument range check, activate to both control and stop server, end of eiger server (if detectorip normal) set activate to 1 (for future eiger firmware), added setflippeddatax to users, removing warnings and check of detector size before accessing detector[0], updating subexptime also updated subperiod in master file, remove keeprunning in rxr that keeps it busy to semaphore

Browse Source
This commit is contained in:
maliakal_d
2020-03-10 09:25:41 +01:00
parent 9649982932
commit d112956f79
24 changed files with 190 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
slsReceiverSoftware/include/ZmqSocket.h
View File

@ -312,7 +312,7 @@ public:
"\"quad\":%u"
;//"}\n";
int length = sprintf(buf, jsonHeaderFormat,
sprintf(buf, jsonHeaderFormat,
jsonversion, dynamicrange, fileIndex, ndetx, ndety, npixelsx, npixelsy, imageSize,
acqIndex, fIndex, (fname == NULL)? "":fname, dummy?0:1,
@ -326,10 +326,11 @@ public:
quadEnable
);
if (additionalJsonHeader && strlen(additionalJsonHeader)) {
length = sprintf(buf, "%s, %s}\n", buf, additionalJsonHeader);
} else {
length = sprintf(buf, "%s}\n", buf);
strcat(buf, ", ");
strcat(buf, additionalJsonHeader);
}
strcat(buf,"}\n");
int length = strlen(buf);
#ifdef VERBOSE
if(!index)