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

in between

Browse Source
This commit is contained in:
Dhanya Maliakal
2016-08-15 17:32:27 +02:00
parent 46b23dba24
commit 7a3e08406a
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
slsReceiverSoftware/include/UDPStandardImplementation.h
View File

@ -557,10 +557,10 @@ private:
/* Acquisition started */ /* Acquisition started */
bool acqStarted[MAX_NUMBER_OF_LISTENING_THREADS]; bool acqStarted;
/* Measurement started */ /* Measurement started */
bool measurementStarted[MAX_NUMBER_OF_LISTENING_THREADS]; bool measurementStarted;
/** Total Frame Count listened to by listening threads */ /** Total Frame Count listened to by listening threads */
int totalListeningFrameCount[MAX_NUMBER_OF_LISTENING_THREADS]; int totalListeningFrameCount[MAX_NUMBER_OF_LISTENING_THREADS];

7
slsReceiverSoftware/src/UDPStandardImplementation.cpp
View File

@ -150,10 +150,10 @@ void UDPStandardImplementation::initializeMembers(){
for(int i = 0; i < MAX_NUMBER_OF_LISTENING_THREADS; ++i){ for(int i = 0; i < MAX_NUMBER_OF_LISTENING_THREADS; ++i){
startAcquisitionIndex[i] = 0; startAcquisitionIndex[i] = 0;
startFrameIndex[i] = 0; startFrameIndex[i] = 0;
acqStarted[i] = false;
measurementStarted[i] = false;
totalListeningFrameCount[i] = 0; totalListeningFrameCount[i] = 0;
} }
acqStarted = false;
measurementStarted = false;
for(int i=0; i<MAX_NUMBER_OF_WRITER_THREADS; i++){ for(int i=0; i<MAX_NUMBER_OF_WRITER_THREADS; i++){
frameIndex[i] = 0; frameIndex[i] = 0;
currentFrameNumber[i] = 0; currentFrameNumber[i] = 0;
@ -795,8 +795,9 @@ int UDPStandardImplementation::setDetectorType(const detectorType d){
for(int i=0; i<MAX_NUMBER_OF_WRITER_THREADS; i++){ for(int i=0; i<MAX_NUMBER_OF_WRITER_THREADS; i++){
if(latestData[i]) {delete[] latestData; latestData = NULL;} if(latestData[i]) {delete[] latestData; latestData = NULL;}
guiData[i] = NULL; guiData[i] = NULL;
latestData[i] = new char[frameSize];
} }
latestData = new char[frameSize];
//updates File Header //updates File Header
if(myDetectorType == EIGER) if(myDetectorType == EIGER)