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

sd

Browse Source
This commit is contained in:
Dhanya Maliakal
2016-03-10 17:28:23 +01:00
parent d3a7d3bad3
commit f8a850ccb2
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -1168,7 +1168,7 @@ slsDetectorDefs::detectorSettings multiSlsDetector::getSettings(int pos) {
for (i=posmin; i<posmax; i++) { for (i=posmin; i<posmax; i++) {
if (detectors[i]) { if (detectors[i]) {
ret1=detectors[i]->getSettings(); ret1=detectors[i]->getSettings();cout<<"ret1:"<<ret1<<endl;
if(detectors[i]->getErrorMask()) if(detectors[i]->getErrorMask())
setErrorMask(getErrorMask()|(1<<i)); setErrorMask(getErrorMask()|(1<<i));
if (ret==GET_SETTINGS) if (ret==GET_SETTINGS)

4
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -3099,9 +3099,9 @@ slsDetectorDefs::detectorSettings slsDetector::getSettings(int imod){
} else{ } else{
controlSocket->ReceiveDataOnly(&retval,sizeof(retval)); controlSocket->ReceiveDataOnly(&retval,sizeof(retval));
thisDetector->currentSettings=(detectorSettings)retval; thisDetector->currentSettings=(detectorSettings)retval;
#ifdef VERBOSE //#ifdef VERBOSE
std::cout<< "Settings are "<< retval << std::endl; std::cout<< "Settings are "<< retval << std::endl;
#endif //#endif
} }
disconnectControl(); disconnectControl();
if (ret==FORCE_UPDATE) if (ret==FORCE_UPDATE)