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

Merge branch '3.3.0-rc' into developer

Browse Source
This commit is contained in:
maliakal_d
2018-07-23 15:03:13 +02:00
parent 2fc98c7a54 711e0d771e
commit 08aacf76ac
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -2640,6 +2640,9 @@ slsDetectorDefs::detectorSettings slsDetector::setSettings( detectorSettings ise
std::cout<< "slsDetector setSettings " << isettings << std::endl; std::cout<< "slsDetector setSettings " << isettings << std::endl;
#endif #endif
if (isettings == -1)
return getSettings(imod);
detectorType detType = thisDetector->myDetectorType; detectorType detType = thisDetector->myDetectorType;
switch (detType) { switch (detType) {