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

refactor

Browse Source
This commit is contained in:
maliakal_d 2021-07-29 12:52:25 +02:00
parent 3f5661739e
commit 2732668548
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c
View File

@ -884,27 +884,23 @@ enum detectorSettings setSettings(enum detectorSettings sett) {
if (sett == UNINITIALIZED) if (sett == UNINITIALIZED)
return thisSettings; return thisSettings;
const int specialDacs[] = SPECIALDACINDEX; int G0DacVals[] = SPECIAL_DEFAULT_DYNAMIC_GAIN_VALS;
int HG0DacVals[] = SPECIAL_DEFAULT_DYNAMICHG0_GAIN_VALS;
int *dacVals = NULL;
// 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)));
const int specialDacVals1[] = SPECIAL_DEFAULT_DYNAMIC_GAIN_VALS; dacVals = G0DacVals;
for (int i = 0; i < NSPECIALDACS; ++i) {
setDAC(specialDacs[i], specialDacVals1[i], 0);
}
break; break;
case DYNAMICHG0: case DYNAMICHG0:
bus_w(DAQ_REG, bus_r(DAQ_REG) & ~DAQ_SETTINGS_MSK); bus_w(DAQ_REG, bus_r(DAQ_REG) & ~DAQ_SETTINGS_MSK);
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)));
const int specialDacVals2[] = SPECIAL_DEFAULT_DYNAMICHG0_GAIN_VALS; dacVals = HG0DacVals;
for (int i = 0; i < NSPECIALDACS; ++i) {
setDAC(specialDacs[i], specialDacVals2[i], 0);
}
break; break;
default: default:
LOG(logERROR, LOG(logERROR,
@ -914,6 +910,12 @@ enum detectorSettings setSettings(enum detectorSettings sett) {
thisSettings = sett; thisSettings = sett;
// set special dacs
const int specialDacs[] = SPECIALDACINDEX;
for (int i = 0; i < NSPECIALDACS; ++i) {
setDAC(specialDacs[i], dacVals[i], 0);
}
// if chip 1.1, and power chip on, configure chip // if chip 1.1, and power chip on, configure chip
if (getChipVersion() == 11 && powerChip(-1)) { if (getChipVersion() == 11 && powerChip(-1)) {
configureChip(); configureChip();