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

Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detector_software into developer

Browse Source
This commit is contained in:
bergamaschi
2017-09-07 11:27:52 +02:00
parent ca865a6636 4ed3859c75
commit 1ba325e902
80 changed files with 3086 additions and 5571 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
slsDetectorSoftware/slsDetector/gitInfoLib.h
View File

@ -1,11 +1,11 @@
//#define SVNPATH ""
#define SVNURLLIB "git@git.psi.ch:sls_detectors_software/sls_detector_software.git"
//#define SVNREPPATH ""
#define SVNREPUUIDLIB "2dfbd9016b501eca6ee2c00a08e49a3f7e7990d8"
//#define SVNREV 0x1457
#define SVNREPUUIDLIB "5d45181f177b552819bd60947c6cf4f0abae7681"
//#define SVNREV 0x1548
//#define SVNKIND ""
//#define SVNSCHED ""
#define SVNAUTHLIB "Dhanya_Maliakal"
#define SVNREVLIB 0x1457
#define SVNDATELIB 0x20170809
#define SVNREVLIB 0x1548
#define SVNDATELIB 0x20170828
//

15
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -6090,7 +6090,8 @@ string slsDetector::setReceiver(string receiverIP){
setTimer(FRAME_PERIOD,thisDetector->timerValue[FRAME_PERIOD]);
setTimer(FRAME_NUMBER,thisDetector->timerValue[FRAME_NUMBER]);
setTimer(ACQUISITION_TIME,thisDetector->timerValue[ACQUISITION_TIME]);
setTimer(SUBFRAME_ACQUISITION_TIME,thisDetector->timerValue[SUBFRAME_ACQUISITION_TIME]);
if(thisDetector->myDetectorType == EIGER)
setTimer(SUBFRAME_ACQUISITION_TIME,thisDetector->timerValue[SUBFRAME_ACQUISITION_TIME]);
setDynamicRange(thisDetector->dynamicRange);
if(thisDetector->myDetectorType == EIGER){
setFlippedData(X,-1);
@ -9078,3 +9079,15 @@ void slsDetector::setAcquiringFlag(bool b){
bool slsDetector::getAcquiringFlag(){
return thisDetector->acquiringFlag;
}
void slsDetector::setExternalGuiFlag(bool b){
pthread_mutex_lock(&ms);
parentDet->setExternalGuiFlag(b);
pthread_mutex_unlock(&ms);
}
bool slsDetector::getExternalGuiFlag(){
return parentDet->getExternalGuiFlag();
}

12
slsDetectorSoftware/slsDetector/slsDetector.h
View File

@ -1884,6 +1884,18 @@ class slsDetector : public slsDetectorUtils, public energyConversion {
*/
bool getAcquiringFlag();
/**
Set external gui flag in shared memory
\param b set external gui flag
*/
void setExternalGuiFlag(bool b=false);
/**
Get external gui flag from shared memory
\returns external gui flag
*/
bool getExternalGuiFlag();
protected:

2605
slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp
View File

File diff suppressed because it is too large Load Diff

9
slsDetectorSoftware/slsDetector/slsDetectorUsers.h
View File

@ -60,14 +60,15 @@ detectorData is a structure containing the data and additional information which
You can find examples of how this classes can be instatiated in mainClient.cpp and mainReceiver.cpp
\authors <a href="mailto:anna.bergamaschi@psi.ch">Anna Bergamaschi</a>, <a href="mailto:dhanya.maliakal@psi.ch">Dhanya Maliakal</a>
@version 0.2
\authors <a href="mailto:anna.bergamaschi@psi.ch">Anna Bergamaschi</a>, <a href="mailto:dhanya.thattil@psi.ch">Dhanya Thattil</a>
@version 3.0
<H2>Currently supported detectors</H2>
\li MYTHEN
\li GOTTHARD controls
\li GOTTHARD data receiver
<H3>Coming soon</H3>
\li EIGER
\li EIGER
\li JUNGFRAU
*/

13
slsDetectorSoftware/slsDetector/slsDetectorUtils.h
View File

@ -846,6 +846,19 @@ virtual int setReceiverFifoDepth(int i = -1)=0;
*/
virtual bool getAcquiringFlag() = 0;
/**
Set external gui flag in shared memory
\param b set external gui flag
*/
virtual void setExternalGuiFlag(bool b=false) = 0;
/**
Get external gui flag from shared memory
\returns external gui flag
*/
virtual bool getExternalGuiFlag() = 0;