detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-12 21:07:13 +02: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

36
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -792,7 +792,6 @@ int slsDetector::initializeDetectorSize(detectorType type) {
thisDetector->actionMask=0;
thisDetector->tenGigaEnable=0;
thisDetector->acquiringFlag = false;
thisDetector->flippedData[0] = 0;
thisDetector->flippedData[1] = 0;
thisDetector->zmqport = 0;
@ -9366,21 +9365,38 @@ int slsDetector::pulseChip(int n) {
void slsDetector::setAcquiringFlag(bool b){
thisDetector->acquiringFlag = b;
parentDet->setAcquiringFlag(b);
}
bool slsDetector::getAcquiringFlag(){
return thisDetector->acquiringFlag;
return parentDet->getAcquiringFlag();
}
void slsDetector::setExternalGuiFlag(bool b){
pthread_mutex_lock(&ms);
parentDet->setExternalGuiFlag(b);
pthread_mutex_unlock(&ms);
bool slsDetector::isAcquireReady() {
return parentDet->isAcquireReady();
}
bool slsDetector::getExternalGuiFlag(){
return parentDet->getExternalGuiFlag();
}
int slsDetector::restreamStopFromReceiver(){
int fnum=F_RESTREAM_STOP_FROM_RECEIVER;
int ret = FAIL;
char mess[MAX_STR_LENGTH] = "";
if (thisDetector->receiverOnlineFlag==ONLINE_FLAG) {
#ifdef VERBOSE
std::cout << "To Restream stop dummy from Receiver via zmq" << std::endl;
#endif
if (connectData() == OK){
ret=thisReceiver->executeFunction(fnum,mess);
disconnectData();
}
if(ret==FORCE_UPDATE)
ret=updateReceiver();
else if (ret == FAIL)
setErrorMask((getErrorMask())|(RESTREAM_STOP_FROM_RECEIVER));
}
return ret;
}