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

Merge pull request #398 from slsdetectorgroup/rxacqIndices

Browse Source 
Receiver frame indices and progress
This commit is contained in:
Dhanya Thattil
2022-03-22 11:23:07 +01:00
committed by GitHub
parent 3250dda7eb 088dd2c9f8
commit 74d55db3f0
20 changed files with 209 additions and 262 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c
View File

@ -2448,15 +2448,17 @@ void *start_timer(void *arg) {
}
int skipData = 0;
int tgEnable = send_to_ten_gig;
if (!eiger_virtual_activate ||
(!eiger_virtual_left_datastream && !eiger_virtual_right_datastream)) {
(tgEnable &&
(!eiger_virtual_left_datastream && !eiger_virtual_right_datastream))) {
skipData = 1;
LOG(logWARNING, ("Not sending Left and Right datastream\n"));
}
if (!eiger_virtual_left_datastream) {
if (tgEnable && !eiger_virtual_left_datastream) {
LOG(logWARNING, ("Not sending Left datastream\n"));
}
if (!eiger_virtual_right_datastream) {
if (tgEnable && !eiger_virtual_right_datastream) {
LOG(logWARNING, ("Not sending Right datastream\n"));
}
@ -2466,7 +2468,6 @@ void *start_timer(void *arg) {
int dr = eiger_dynamicrange;
double bytesPerPixel = (double)dr / 8.00;
int tgEnable = send_to_ten_gig;
int datasize = (tgEnable ? 4096 : 1024);
int packetsize = datasize + sizeof(sls_detector_header);
int maxPacketsPerFrame = (tgEnable ? 4 : 16) * dr;
@ -2672,14 +2673,16 @@ void *start_timer(void *arg) {
}
}
}
if (eiger_virtual_left_datastream && i >= startval &&
i <= endval) {
if ((!tgEnable ||
(tgEnable && eiger_virtual_left_datastream)) &&
i >= startval && i <= endval) {
usleep(eiger_virtual_transmission_delay_left);
sendUDPPacket(iRxEntry, 0, packetData, packetsize);
LOG(logDEBUG1, ("Sent left packet: %d\n", i));
}
if (eiger_virtual_right_datastream && i >= startval &&
i <= endval) {
if ((!tgEnable ||
(tgEnable && eiger_virtual_right_datastream)) &&
i >= startval && i <= endval) {
usleep(eiger_virtual_transmission_delay_right);
sendUDPPacket(iRxEntry, 1, packetData2, packetsize);
LOG(logDEBUG1, ("Sent right packet: %d\n", i));