Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software

This commit is contained in:
2014-12-03 10:23:25 +01:00
11 changed files with 357 additions and 253 deletions

View File

@ -6207,7 +6207,7 @@ int slsDetector::startReceiver(){
setErrorMask((getErrorMask())|(COULDNOT_START_RECEIVER));
}
}
if((ret==OK)&& (thisDetector->myDetectorType != EIGER))
if((ret==OK))//&& (thisDetector->myDetectorType != EIGER))
ret=detectorSendToReceiver(true);
return ret;