detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-01-19 20:28:51 +01:00
Code Issues Actions Packages Releases Activity

small changes for jungfrau, but also for the gui

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-03-03 15:57:48 +01:00
parent 85cc0d8184
commit 50f8366bc2
5 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
slsReceiverSoftware/src/DataStreamer.cpp
View File

@@ -31,8 +31,8 @@ const char* DataStreamer::jsonHeaderFormat_part1 =
const char* DataStreamer::jsonHeaderFormat =
"%s"
"\"acqIndex\":%lld, "
"\"fIndex\":%lld, "
"\"acqIndex\":%llu, "
"\"fIndex\":%llu, "
"\"subfnum\":%u, "
"\"fname\":\"%s\"}";

3
slsReceiverSoftware/src/Listener.cpp
View File

@@ -331,7 +331,8 @@ uint32_t Listener::ListenToAnImage(char* buf) {
generalData->GetHeaderInfo(index, listeningPacket, *dynamicRange, fnum, pnum, snum, bid);
lastCaughtFrameIndex = fnum;
#ifdef VERBOSE
if (!index && !pnum) cprintf(GREEN,"Listening %d: fnum:%lld, pnum:%d\n", index, (long long int)fnum, pnum);
if (!index && !pnum)
cprintf(GREEN,"Listening %d: fnum:%lld, pnum:%d\n", index, (long long int)fnum, pnum);
#endif
if (!measurementStartedFlag)
RecordFirstIndices(fnum);

3
slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp
View File

@@ -757,7 +757,8 @@ int slsReceiverTCPIPInterface::setup_udp(){
sscanf(args[1],"%d",&udpport);
sscanf(args[2],"%d",&udpport2);
receiverBase->setUDPPortNumber(udpport);
receiverBase->setUDPPortNumber2(udpport2);
if (myDetectorType == EIGER)
receiverBase->setUDPPortNumber2(udpport2);
//setup udpip
//get ethernet interface or IP to listen to
FILE_LOG(logINFO) << "Receiver UDP IP: " << args[0];