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

refactor

Browse Source
This commit is contained in:
maliakal_d
2021-07-29 10:10:25 +02:00
parent 4e268c329c
commit b484f412ce
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c
View File

@ -884,14 +884,14 @@ enum detectorSettings setSettings(enum detectorSettings sett) {
if (sett == UNINITIALIZED) if (sett == UNINITIALIZED)
return thisSettings; return thisSettings;
const int specialDacs[NSPECIALDACS] = SPECIALDACINDEX; const int specialDacs[] = SPECIALDACINDEX;
// set settings // set settings
switch (sett) { switch (sett) {
case DYNAMICGAIN: case DYNAMICGAIN:
bus_w(DAQ_REG, bus_r(DAQ_REG) & ~DAQ_SETTINGS_MSK); bus_w(DAQ_REG, bus_r(DAQ_REG) & ~DAQ_SETTINGS_MSK);
LOG(logINFO, LOG(logINFO,
("Set settings - Dyanmic Gain, DAQ Reg: 0x%x\n", bus_r(DAQ_REG))); ("Set settings - Dyanmic Gain, DAQ Reg: 0x%x\n", bus_r(DAQ_REG)));
int specialDacVals1[NSPECIALDACS] = SPECIAL_DEFAULT_DYNAMIC_GAIN_VALS; const int specialDacVals1[] = SPECIAL_DEFAULT_DYNAMIC_GAIN_VALS;
for (int i = 0; i < NSPECIALDACS; ++i) { for (int i = 0; i < NSPECIALDACS; ++i) {
setDAC(specialDacs[i], specialDacVals1[i], 0); setDAC(specialDacs[i], specialDacVals1[i], 0);
} }
@ -901,8 +901,7 @@ enum detectorSettings setSettings(enum detectorSettings sett) {
bus_w(DAQ_REG, bus_r(DAQ_REG) | DAQ_FIX_GAIN_HIGHGAIN_VAL); bus_w(DAQ_REG, bus_r(DAQ_REG) | DAQ_FIX_GAIN_HIGHGAIN_VAL);
LOG(logINFO, ("Set settings - Dyanmic High Gain 0, DAQ Reg: 0x%x\n", LOG(logINFO, ("Set settings - Dyanmic High Gain 0, DAQ Reg: 0x%x\n",
bus_r(DAQ_REG))); bus_r(DAQ_REG)));
int specialDacVals2[NSPECIALDACS] = const int specialDacVals2[] = SPECIAL_DEFAULT_DYNAMICHG0_GAIN_VALS;
SPECIAL_DEFAULT_DYNAMICHG0_GAIN_VALS;
for (int i = 0; i < NSPECIALDACS; ++i) { for (int i = 0; i < NSPECIALDACS; ++i) {
setDAC(specialDacs[i], specialDacVals2[i], 0); setDAC(specialDacs[i], specialDacVals2[i], 0);
} }