mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2025-04-28 17:10:03 +02:00
to return if it catches only 16 bytes or less than expected, but compensates for first frame being only 266240 for eiger
This commit is contained in:
parent
4770d74c12
commit
5b2a896ed3
@ -1647,6 +1647,7 @@ int UDPStandardImplementation::startListening(){
|
|||||||
stopListening(ithread,rc,packetcount,total);
|
stopListening(ithread,rc,packetcount,total);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
//start indices for each start of scan/acquisition - eiger does it before
|
//start indices for each start of scan/acquisition - eiger does it before
|
||||||
if((!measurementStarted) && (rc > 0) && (!ithread))
|
if((!measurementStarted) && (rc > 0) && (!ithread))
|
||||||
@ -2004,7 +2005,7 @@ void UDPStandardImplementation::startFrameIndices(int ithread){
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
void UDPStandardImplementation::stopListening(int ithread, int rc, int &pc, int &t){
|
void UDPStandardImplementation::stopListening(int ithread, int rc, int &pc, int &t){cout << "Stop Listening" << endl;
|
||||||
FILE_LOG(logDEBUG) << __AT__ << " called";
|
FILE_LOG(logDEBUG) << __AT__ << " called";
|
||||||
|
|
||||||
|
|
||||||
@ -2019,7 +2020,9 @@ int i;
|
|||||||
exit(-1);
|
exit(-1);
|
||||||
}
|
}
|
||||||
//push the last buffer into fifo
|
//push the last buffer into fifo
|
||||||
if((myDetectorType != EIGER) && (rc > 0)){ //for eiger throw away incomplete frames
|
if((myDetectorType == EIGER) && (rc < 266240) )//for eiger throw away incomplete frames
|
||||||
|
fifoFree[ithread]->push(buffer[ithread]);
|
||||||
|
else if(rc > 0){cout<< ithread << " last rc:"<<rc<<endl;
|
||||||
pc = (rc/onePacketSize);
|
pc = (rc/onePacketSize);
|
||||||
#ifdef VERYDEBUG
|
#ifdef VERYDEBUG
|
||||||
cout << ithread << " *** last packetcount:" << pc << endl;
|
cout << ithread << " *** last packetcount:" << pc << endl;
|
||||||
@ -2030,8 +2033,7 @@ int i;
|
|||||||
#ifdef VERYDEBUG
|
#ifdef VERYDEBUG
|
||||||
cout << ithread << " *** last lbuf1:" << (void*)buffer[ithread] << endl;
|
cout << ithread << " *** last lbuf1:" << (void*)buffer[ithread] << endl;
|
||||||
#endif
|
#endif
|
||||||
}else
|
}
|
||||||
fifoFree[ithread]->push(buffer[ithread]);//for all detectors too. why was this not there? for rc=0?
|
|
||||||
|
|
||||||
|
|
||||||
//push dummy buffer to all writer threads
|
//push dummy buffer to all writer threads
|
||||||
|
Loading…
x
Reference in New Issue
Block a user