Merge branch 'partial_frames' into cleanup

This commit is contained in:
Dhanya Maliakal 2015-10-02 14:22:41 +02:00
commit 92b73e0e88

View File

@ -1972,19 +1972,6 @@ int UDPStandardImplementation::startWriting(){
eiger_packet_header_t* blankframe_header=0; eiger_packet_header_t* blankframe_header=0;
unsigned char* blankframe_data=0; unsigned char* blankframe_data=0;
//last packet numbers for different dynamic ranges
if(myDetectorType == EIGER){
switch(dynamicRange){
case 4: LAST_PACKET_VALUE = 0x40; break;
case 8: LAST_PACKET_VALUE = 0x80; break;
case 16: LAST_PACKET_VALUE = 0x100; break;
case 32: LAST_PACKET_VALUE = 0x200; break;
default: break;
}
}
while(1){ while(1){
@ -2032,15 +2019,8 @@ int UDPStandardImplementation::startWriting(){
#endif #endif
} }
if(tengigaEnable){ //last packet numbers for different dynamic ranges
switch(dynamicRange){ LAST_PACKET_VALUE = (packetsPerFrame/numListeningThreads);
case 4: LAST_PACKET_VALUE = 0x10; break;
case 8: LAST_PACKET_VALUE = 0x20; break;
case 16: LAST_PACKET_VALUE = 0x40; break;
case 32: LAST_PACKET_VALUE = 0x80; break;
default: break;
}
}
} }