detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-07 18:40:42 +02: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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
slsReceiverSoftware/include/GeneralData.h
View File

@ -382,7 +382,7 @@ private:
{ {
jfrau_packet_header_t* header = (jfrau_packet_header_t*)(packetData); jfrau_packet_header_t* header = (jfrau_packet_header_t*)(packetData);
frameNumber = (uint64_t)(*( (uint32_t*) header->frameNumber)); frameNumber = (uint64_t)(*( (uint32_t*) header->frameNumber));
packetNumber = (uint32_t)(*( (uint8_t*) header->packetNumber)); packetNumber = packetsPerFrame -1 - (uint32_t)(*( (uint8_t*) header->packetNumber));
} }
/** /**
@ -401,7 +401,7 @@ private:
subFrameNumber = -1; subFrameNumber = -1;
jfrau_packet_header_t* header = (jfrau_packet_header_t*)(packetData); jfrau_packet_header_t* header = (jfrau_packet_header_t*)(packetData);
frameNumber = (uint64_t)(*( (uint32_t*) header->frameNumber)); frameNumber = (uint64_t)(*( (uint32_t*) header->frameNumber));
packetNumber = (uint32_t)(*( (uint8_t*) header->packetNumber)); packetNumber = packetsPerFrame - 1 -(uint32_t)(*( (uint8_t*) header->packetNumber));
bunchId = (*((uint64_t*) header->bunchid)); bunchId = (*((uint64_t*) header->bunchid));
} }

2
slsReceiverSoftware/include/ZmqSocket.h
View File

@ -319,7 +319,7 @@ public:
printf("%d: type: %s\n", index, d["type"].GetString()); printf("%d: type: %s\n", index, d["type"].GetString());
#endif #endif
if(d["acqIndex"].GetInt()!=-1){ if(d["acqIndex"].GetUint64()!=-1){
acqIndex = d["acqIndex"].GetUint64(); acqIndex = d["acqIndex"].GetUint64();
frameIndex = d["fIndex"].GetUint64(); frameIndex = d["fIndex"].GetUint64();
subframeIndex = d["subfnum"].GetUint(); subframeIndex = d["subfnum"].GetUint();

4
slsReceiverSoftware/src/DataStreamer.cpp
View File

@ -31,8 +31,8 @@ const char* DataStreamer::jsonHeaderFormat_part1 =
const char* DataStreamer::jsonHeaderFormat = const char* DataStreamer::jsonHeaderFormat =
"%s" "%s"
"\"acqIndex\":%lld, " "\"acqIndex\":%llu, "
"\"fIndex\":%lld, " "\"fIndex\":%llu, "
"\"subfnum\":%u, " "\"subfnum\":%u, "
"\"fname\":\"%s\"}"; "\"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); generalData->GetHeaderInfo(index, listeningPacket, *dynamicRange, fnum, pnum, snum, bid);
lastCaughtFrameIndex = fnum; lastCaughtFrameIndex = fnum;
#ifdef VERBOSE #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 #endif
if (!measurementStartedFlag) if (!measurementStartedFlag)
RecordFirstIndices(fnum); RecordFirstIndices(fnum);

3
slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp
View File

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