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

removed external gui flag, acquiring flag is now not reset in stop acquisition, slsdet does not have acquiring flag anymore, busy accomodating acquiringflag, acquire cleanup, in acquire made lock for receiver more local, moved setacquiringflag false to bottom of acquire

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-11-30 16:25:23 +01:00
parent 712c9a4524
commit 2227265357
7 changed files with 380 additions and 479 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
slsDetectorSoftware/slsDetector/slsDetector.h
View File

@ -265,8 +265,6 @@ class slsDetector : public slsDetectorUtils, public energyConversion {
/** 10 Gbe enable*/
int tenGigaEnable;
/** flag for acquiring */
bool acquiringFlag;
/** flipped data across x or y axis */
int flippedData[2];
/** tcp port from gui/different process to receiver (only data) */
@ -1915,18 +1913,12 @@ class slsDetector : public slsDetectorUtils, public energyConversion {
bool getAcquiringFlag();
/**
Set external gui flag in shared memory
\param b set external gui flag
* Check if acquiring flag is set, set error if set
* \returns FAIL if not ready, OK if ready
*/
void setExternalGuiFlag(bool b=false);
bool isAcquireReady();
/**
Get external gui flag from shared memory
\returns external gui flag
*/
bool getExternalGuiFlag();
protected: