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

jungfrau: settings should not be validated to undefined when special dacs are set individually

Browse Source
This commit is contained in:
maliakal_d 2021-08-03 14:51:00 +02:00
parent 9c4ecf0506
commit e20022f139
2 changed files with 0 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c
View File

@ -1078,41 +1078,6 @@ enum detectorSettings setSettings(enum detectorSettings sett) {
return thisSettings; return thisSettings;
} }
void validateSettings() {
// if any special dac value is changed individually => undefined
const int specialDacs[NSPECIALDACS] = SPECIALDACINDEX;
int *specialDacValues[] = {defaultDacValue_G0, defaultDacValue_HG0};
int settList[] = {DYNAMICGAIN, DYNAMICHG0};
enum detectorSettings sett = UNDEFINED;
for (int isett = 0; isett != NUMSETTINGS; ++isett) {
// assume it matches current setting in list
sett = settList[isett];
// if one value does not match, = undefined
for (int i = 0; i < NSPECIALDACS; ++i) {
if (getDAC(specialDacs[i], 0) != specialDacValues[isett][i]) {
sett = UNDEFINED;
break;
}
}
// all values matchd a setting
if (sett != UNDEFINED) {
break;
}
}
// update settings
if (thisSettings != sett) {
LOG(logINFOBLUE,
("Validated settings to %s (%d)\n",
(sett == DYNAMICGAIN
? "dynamicgain"
: (sett == DYNAMICHG0 ? "dynamichg0" : "undefined")),
sett));
thisSettings = sett;
}
}
enum detectorSettings getSettings() { return thisSettings; } enum detectorSettings getSettings() { return thisSettings; }
enum gainMode getGainMode() { enum gainMode getGainMode() {
@ -1193,12 +1158,6 @@ void setDAC(enum DACINDEX ind, int val, int mV) {
} }
} }
#endif #endif
const int specialDacs[NSPECIALDACS] = SPECIALDACINDEX;
for (int i = 0; i < NSPECIALDACS; ++i) {
if ((int)ind == specialDacs[i]) {
validateSettings();
}
}
} }
int getDAC(enum DACINDEX ind, int mV) { int getDAC(enum DACINDEX ind, int mV) {

3
slsDetectorServers/slsDetectorServer/include/slsDetectorFunctionList.h
View File

@ -297,9 +297,6 @@ int getAllTrimbits();
#ifndef CHIPTESTBOARDD #ifndef CHIPTESTBOARDD
enum detectorSettings setSettings(enum detectorSettings sett); enum detectorSettings setSettings(enum detectorSettings sett);
#endif #endif
#if defined(MYTHEN3D) || defined(JUNGFRAUD)
void validateSettings();
#endif
enum detectorSettings getSettings(); enum detectorSettings getSettings();
#ifdef JUNGFRAUD #ifdef JUNGFRAUD
enum gainMode getGainMode(); enum gainMode getGainMode();