detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-01-16 12:33:40 +01:00
Code Issues Actions Packages Releases Activity

WIP

Browse Source
This commit is contained in:
maliakal_d
2020-06-18 17:40:23 +02:00
parent 489fccb25c
commit 0cc547c2de
10 changed files with 239 additions and 259 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c
View File

@@ -1112,8 +1112,7 @@ enum detectorSettings setSettings(enum detectorSettings sett) {
if (sett == UNINITIALIZED) {
return thisSettings;
}
if (sett != GET_SETTINGS)
thisSettings = sett;
thisSettings = sett;
LOG(logINFO, ("Settings: %d\n", thisSettings));
return thisSettings;
}
@@ -1355,7 +1354,7 @@ enum timingMode getTiming() {
return GATED;
default:
LOG(logERROR, ("Unknown trigger mode found %d\n", eiger_triggermode));
return GET_TIMING_MODE;
return GET_FLAG;
}
}