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

client multi.cpp getid and checkversioncompatibility are examples of how it might look like

Browse Source
This commit is contained in:
maliakal_d
2018-10-03 12:31:00 +02:00
parent 586c664a43
commit 40ae74bb99
3 changed files with 82 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -108,17 +108,6 @@ slsDetector::~slsDetector() {
}
int64_t slsDetector::clearAllErrorMask() {
clearErrorMask();
pthread_mutex_lock(&ms);
for(int i=0;i<multiDet->getNumberOfDetectors();++i){
multiDet->setErrorMask(multiDet->getErrorMask()|(0<<i));
}
pthread_mutex_unlock(&ms);
return getErrorMask();
}
void slsDetector::setAcquiringFlag(bool b) {
multiDet->setAcquiringFlag(b);
}

6
slsDetectorSoftware/slsDetector/slsDetector.h
View File

@ -316,12 +316,6 @@ public:
*/
virtual ~slsDetector();
/**
* Clears error mask and also the bit in parent det multi error mask
* @returns error mask
*/
int64_t clearAllErrorMask();
/**
* Set acquiring flag in shared memory
* @param b acquiring flag