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

2
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -2584,6 +2584,8 @@ dacs_t multiSlsDetector::getADC(dacIndex idac, int imod) {
for (int idet=dmi; idet<dma; idet++) {
if (detectors[idet]) {
ret=detectors[idet]->getADC(idac, im);
if(detectors[idet]->getErrorMask())
setErrorMask(getErrorMask()|(1<<idet));
if (ret1==-100)
ret1=ret;
else if (ret!=ret1)