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

Merge branch 'developer' into eiger

Browse Source
This commit is contained in:
maliakal_d
2020-06-15 09:39:45 +02:00
parent 7c2949f372 5a7451e29e
commit e0b86799ae
7 changed files with 65 additions and 70 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.

9
slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c
View File

@ -2136,10 +2136,7 @@ void *start_timer(void *arg) {
int srcOffset2 = npixelsx; int srcOffset2 = npixelsx;
// loop packet // loop packet
{ for (int i = 0; i != numPacketsPerFrame; ++i) {
int i = 0;
i != numPacketsPerFrame; ++i) {
// set header // set header
char packetData[packetsize]; char packetData[packetsize];
memset(packetData, 0, packetsize); memset(packetData, 0, packetsize);
@ -2170,8 +2167,7 @@ void *start_timer(void *arg) {
int dstOffset = sizeof(sls_detector_header); int dstOffset = sizeof(sls_detector_header);
int dstOffset2 = sizeof(sls_detector_header); int dstOffset2 = sizeof(sls_detector_header);
{ {
for (int psize = 0; psize < datasize; for (int psize = 0; psize < datasize; psize += npixelsx) {
psize += npixelsx) {
if (dr == 32 && tgEnable == 0) { if (dr == 32 && tgEnable == 0) {
memcpy(packetData + dstOffset, memcpy(packetData + dstOffset,
@ -2207,7 +2203,6 @@ void *start_timer(void *arg) {
usleep(eiger_virtual_transmission_delay_right); usleep(eiger_virtual_transmission_delay_right);
sendUDPPacket(1, packetData2, packetsize); sendUDPPacket(1, packetData2, packetsize);
} }
}
LOG(logINFO, ("Sent frame: %d\n", iframes)); LOG(logINFO, ("Sent frame: %d\n", iframes));
clock_gettime(CLOCK_REALTIME, &end); clock_gettime(CLOCK_REALTIME, &end);
int64_t timeNs = ((end.tv_sec - begin.tv_sec) * 1E9 + int64_t timeNs = ((end.tv_sec - begin.tv_sec) * 1E9 +

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.

4
slsSupportLib/include/versionAPI.h
View File

@ -3,10 +3,10 @@
#define APILIB 0x200409 #define APILIB 0x200409
#define APIRECEIVER 0x200409 #define APIRECEIVER 0x200409
#define APIGUI 0x200409 #define APIGUI 0x200409
#define APIEIGER 0x200610
#define APICTB 0x200610 #define APICTB 0x200610
#define APIGOTTHARD 0x200610 #define APIGOTTHARD 0x200610
#define APIGOTTHARD2 0x200610
#define APIJUNGFRAU 0x200610 #define APIJUNGFRAU 0x200610
#define APIMYTHEN3 0x200610 #define APIMYTHEN3 0x200610
#define APIMOENCH 0x200610 #define APIMOENCH 0x200610
#define APIGOTTHARD2 0x200610
#define APIEIGER 0x200615