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

moving to fix another branch

Browse Source
This commit is contained in:
Dhanya Maliakal 2015-08-19 14:32:08 +02:00
parent 80f33997d4
commit e8a5f81083
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
slsReceiverSoftware/src/UDPStandardImplementation.cpp
View File

@ -1751,7 +1751,11 @@ int UDPStandardImplementation::startListening(){
if(rc == EIGER_HEADER_LENGTH && myDetectorType == EIGER) { if(rc == EIGER_HEADER_LENGTH && myDetectorType == EIGER) {
while(rc == EIGER_HEADER_LENGTH) while(rc == EIGER_HEADER_LENGTH)
rc = udpSocket[ithread]->ReceiveDataOnly(buffer[ithread] + HEADER_SIZE_NUM_TOT_PACKETS, maxBufferSize); rc = udpSocket[ithread]->ReceiveDataOnly(buffer[ithread] + HEADER_SIZE_NUM_TOT_PACKETS, maxBufferSize);
} }/*
if(rc == 1040){
cprintf(YELLOW,"tempframenum[%d]:%d\n",ithread,((*(uint32_t*)(((eiger_packet_header *)((char*)(buffer[ithread] + HEADER_SIZE_NUM_TOT_PACKETS)))->num1))));
cprintf(YELLOW,"packetnum[%d]:%d\n",ithread,((*(uint8_t*)(((eiger_packet_header *)((char*)(buffer[ithread] + HEADER_SIZE_NUM_TOT_PACKETS)))->num4))));
}*/
expected = maxBufferSize; expected = maxBufferSize;
#ifdef SOCKET_DEBUG #ifdef SOCKET_DEBUG
}else{ }else{
@ -2768,17 +2772,17 @@ void UDPStandardImplementation::writeToFile_withoutCompression(char* buf[],int n
}else }else
fwrite(buf[0]+offset, 1, packetsToSave * onePacketSize, sfilefd); fwrite(buf[0]+offset, 1, packetsToSave * onePacketSize, sfilefd);
packetsInFile += packetsToSave; packetsInFile += packetsToSave;
#ifdef EIGER_DEBUG3 //#ifdef EIGER_DEBUG3
cprintf(GREEN,"packetscaught earlier:%d packetstosave:%d numMissingPackets:%d addingon:%d\n", cprintf(GREEN,"packetscaught earlier:%d packetstosave:%d numMissingPackets:%d addingon:%d\n",
packetsCaught,packetsToSave,numMissingPackets,(packetsToSave - numMissingPackets)); packetsCaught,packetsToSave,numMissingPackets,(packetsToSave - numMissingPackets));
#endif //#endif
packetsCaught += (packetsToSave - numMissingPackets); packetsCaught += (packetsToSave - numMissingPackets);
totalPacketsCaught += (packetsToSave - numMissingPackets); totalPacketsCaught += (packetsToSave - numMissingPackets);
numMissingPackets = 0; numMissingPackets = 0;
#ifdef EIGER_DEBUG3 //#ifdef EIGER_DEBUG3
cprintf(GREEN,"packetscaught:%d\n", packetsCaught); cprintf(GREEN,"packetscaught:%d\n", packetsCaught);
cprintf(GREEN,"totalPacketsCaught:%d\n", totalPacketsCaught); cprintf(GREEN,"totalPacketsCaught:%d\n", totalPacketsCaught);
#endif //#endif
//new file //new file
if(packetsInFile >= maxPacketsPerFile){ if(packetsInFile >= maxPacketsPerFile){
@ -2867,12 +2871,13 @@ void UDPStandardImplementation::handleWithoutDataCompression(int ithread, char*
missingpacket = 1; missingpacket = 1;
//add packet numbers //add packet numbers
(*(uint16_t*)(((eiger_packet_header *)((char*)(wbuffer[i])))->num2)) = (i+1); (*(uint16_t*)(((eiger_packet_header *)((char*)(wbuffer[i])))->num2)) = (i+1);
(*(uint32_t*)(((eiger_packet_header *)((char*)(wbuffer[i])))->num1)) = currframenum;
}else{ }else{
missingpacket = 0; missingpacket = 0;
if((*(uint8_t*)(((eiger_packet_header *)((char*)(wbuffer[i])))->num4)) != (i-(port*packetsPerFrame/numListeningThreads))){ if((*(uint8_t*)(((eiger_packet_header *)((char*)(wbuffer[i])))->num4)) != (i-(port*packetsPerFrame/numListeningThreads))){
cprintf(BG_RED, "pnum mismatch num4! i:%d pnum:%d fnum:%d\n",i,(*(uint8_t*)(((eiger_packet_header *)((char*)(wbuffer[i])))->num4)),currframenum); cprintf(BG_RED, "pnum mismatch num4! i:%d pnum:%d fnum:%d\n",i,(*(uint8_t*)(((eiger_packet_header *)((char*)(wbuffer[i])))->num4)),currframenum);
/* exit(-1);*/ exit(-1);
} }
@ -2906,7 +2911,7 @@ void UDPStandardImplementation::handleWithoutDataCompression(int ithread, char*
cprintf(BG_RED, "pnum mismatch! i:%d pnum:%d fnum:%d\n",i,(*(uint16_t*)(((eiger_packet_header *)((char*)(wbuffer[i])))->num2)),currframenum); cprintf(BG_RED, "pnum mismatch! i:%d pnum:%d fnum:%d\n",i,(*(uint16_t*)(((eiger_packet_header *)((char*)(wbuffer[i])))->num2)),currframenum);
if ((*(uint8_t*)(((eiger_packet_header *)((char*)(wbuffer[i])))->num3)) == 0xFF) if ((*(uint8_t*)(((eiger_packet_header *)((char*)(wbuffer[i])))->num3)) == 0xFF)
cprintf(BG_RED,"missing packet though\n"); cprintf(BG_RED,"missing packet though\n");
/*exit(-1);*/ exit(-1);
} }
//overwriting port number and dynamic range //overwriting port number and dynamic range
@ -2938,9 +2943,9 @@ void UDPStandardImplementation::handleWithoutDataCompression(int ithread, char*
writeToFile_withoutCompression(wbuffer, npackets,currframenum); writeToFile_withoutCompression(wbuffer, npackets,currframenum);
} }
#ifdef VERYDEBUG //#ifdef VERYDEBUG
cprintf(GREEN,"written everyting\n"); cprintf(GREEN,"written everyting\n");
#endif //#endif
} }