detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-01-17 14:48:59 +01:00
Code Issues Actions Packages Releases Activity

merge conflict from 3.0.1 to restream stop from recieveR

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-11-30 19:05:35 +01:00
parent 1edb41242c ca855e6d39
commit 5b88203bd9
8 changed files with 468 additions and 494 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@@ -214,7 +214,6 @@ multiSlsDetector::multiSlsDetector(int id) : slsDetectorUtils(), shmId(-1)
}
thisMultiDetector->acquiringFlag = false;
thisMultiDetector->externalgui = false;
thisMultiDetector->receiver_upstream = false;
thisMultiDetector->alreadyExisting=1;
}
@@ -1626,7 +1625,7 @@ int multiSlsDetector::stopAcquisition(){
}
*stoppedFlag=1;
setAcquiringFlag(false);
return ret;
};
@@ -6720,11 +6719,6 @@ int multiSlsDetector::pulseChip(int n) {
void multiSlsDetector::setAcquiringFlag(bool b){
thisMultiDetector->acquiringFlag = b;
for(int idet=0; idet<thisMultiDetector->numberOfDetectors; ++idet){
if(detectors[idet]){
detectors[idet]->setAcquiringFlag(b);
}
}
}
bool multiSlsDetector::getAcquiringFlag(){
@@ -6732,11 +6726,30 @@ bool multiSlsDetector::getAcquiringFlag(){
}
void multiSlsDetector::setExternalGuiFlag(bool b){
thisMultiDetector->externalgui = b;
bool multiSlsDetector::isAcquireReady() {
if (thisMultiDetector->acquiringFlag) {
std::cout << "Acquire has already started. If previous acquisition terminated unexpectedly, reset busy flag to restart.(sls_detector_put busy 0)" << std::endl;
return FAIL;
}
thisMultiDetector->acquiringFlag = true;
return OK;
}
bool multiSlsDetector::getExternalGuiFlag(){
return thisMultiDetector->externalgui;
int multiSlsDetector::restreamStopFromReceiver() {
int ret=OK, ret1;
for(int idet=0; idet<thisMultiDetector->numberOfDetectors; ++idet){
if (detectors[idet]) {
ret1=detectors[idet]->restreamStopFromReceiver();
if(detectors[idet]->getErrorMask())
setErrorMask(getErrorMask()|(1<<idet));
if (ret1!=OK)
ret=FAIL;
}
}
return ret;
}

17
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h
View File

@@ -1494,18 +1494,19 @@ class multiSlsDetector : public slsDetectorUtils {
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
If data streaming in receiver is enabled,
restream the stop dummy packet from receiver
Used usually for Moench,
in case it is lost in network due to high data rate
\returns OK if success else FAIL
*/
bool getExternalGuiFlag();
int restreamStopFromReceiver();
private: