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

in between

Browse Source
This commit is contained in:
Dhanya Maliakal
2016-08-16 11:44:20 +02:00
parent 7a3e08406a
commit f50f4752dd
1 changed files with 26 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
slsReceiverSoftware/src/UDPStandardImplementation.cpp
View File

@ -813,9 +813,16 @@ int UDPStandardImplementation::setDetectorType(const detectorType d){
void UDPStandardImplementation::resetAcquisitionCount(){ void UDPStandardImplementation::resetAcquisitionCount(){
FILE_LOG(logDEBUG) << __AT__ << " starting"; FILE_LOG(logDEBUG) << __AT__ << " starting";
totalPacketsCaught = 0; for(int i=0;i<numberofListeningThreads;i++)
startAcquisitionIndex[i] = 0;
pthread_mutex_lock(&progressMutex);
acqStarted = false; acqStarted = false;
startAcquisitionIndex = 0; pthread_mutex_unlock(&progressMutex);
pthread_mutex_lock(&writeMutex);
totalPacketsCaught = 0;
pthread_mutex_unlock(&writeMutex);
FILE_LOG(logINFO) << "Acquisition Count has been reset"; FILE_LOG(logINFO) << "Acquisition Count has been reset";
} }
@ -829,13 +836,26 @@ int UDPStandardImplementation::startReceiver(char *c){
//RESET //RESET
//reset measurement variables //reset measurement variables
frametoGuiCounter = 0; pthread_mutex_lock(&progressMutex);
measurementStarted = false; measurementStarted = false;
startFrameIndex = 0; pthread_mutex_unlock(&progressMutex);
frameIndex = 0;
for(int i=0;i<numberofListeningThreads;i++)
startFrameIndex[i] = 0;
for(int i=0;i<numberofWriterThreads;i++)
frametoGuiCounter[i] = 0;
frameIndex[i] = 0;
if(!acqStarted){ if(!acqStarted){
currentFrameNumber = 0; //has to be zero to add to startframeindex for each scan pthread_mutex_lock(&progressMutex);
acquisitionIndex = 0; acquisitionIndex = 0;
pthread_mutex_unlock(&progressMutex);
currentFrameNumber = 0; //has to be zero to add to startframeindex for each scan
frameIndex = 0; frameIndex = 0;
} }
for(int i = 0; i < numberofListeningThreads; ++i) for(int i = 0; i < numberofListeningThreads; ++i)