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

udpip and hostname order for write config,receiver returns quicker when no data or mismatched indices

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@491 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d
2013-03-13 15:34:53 +00:00
parent d205e79106
commit 1882454cf3
7 changed files with 76 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -1952,7 +1952,7 @@ dacs_t slsDetector::getADC(dacIndex index, int imod){
controlSocket->Disconnect();
if (ret==FORCE_UPDATE)
updateDetector();
}
}else setCannotConnectToDetector();
}
}
#ifdef VERBOSE
@ -5338,8 +5338,8 @@ int slsDetector::writeConfigurationFile(ofstream &outfile, int id){
names[11]="detectorip";
names[12]= "rx_tcpport";
names[13]= "rx_udpport";
names[14]="rx_hostname";
names[15]="rx_udpip";
names[14]="rx_udpip";
names[15]="rx_hostname";
names[16]="outdir";
names[17]="vhighvoltage";
nvar=18;
@ -6270,4 +6270,14 @@ int64_t slsDetector::clearAllErrorMask(){
}
void slsDetector::setCannotConnectToDetector(){
std::cout << "cannot connect to detector" << endl;
setErrorMask((getErrorMask())|(CANNOT_CONNECT_TO_DETECTOR));
}
void slsDetector::setCannotConnectToReceiver(){
std::cout << "cannot connect to Receiver" << endl;
setErrorMask((getErrorMask())|(CANNOT_CONNECT_TO_RECEIVER));
}