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

refactor

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

27
slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c
View File

@ -884,28 +884,28 @@ enum detectorSettings setSettings(enum detectorSettings sett) {
if (sett == UNINITIALIZED) if (sett == UNINITIALIZED)
return thisSettings; return thisSettings;
const int specialDynamicDacValues[NSPECIALDACS] = const int specialDacs[NSPECIALDACS] = SPECIALDACINDEX;
SPECIAL_DEFAULT_DYNAMIC_GAIN_VALS;
const int specialDynamicHG0DacValues[NSPECIALDACS] =
SPECIAL_DEFAULT_DYNAMICHG0_GAIN_VALS;
int specialDacValues[NSPECIALDACS] = {};
// 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)));
memcpy(specialDacValues, specialDynamicDacValues, int specialDacVals1[NSPECIALDACS] = SPECIAL_DEFAULT_DYNAMIC_GAIN_VALS;
NSPECIALDACS * sizeof(int)); 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)));
memcpy(specialDacValues, specialDynamicHG0DacValues, int specialDacVals2[NSPECIALDACS] =
NSPECIALDACS * sizeof(int)); SPECIAL_DEFAULT_DYNAMICHG0_GAIN_VALS;
for (int i = 0; i < NSPECIALDACS; ++i) {
setDAC(specialDacs[i], specialDacVals2[i], 0);
}
break; break;
/* /*
case FIXGAIN1: case FIXGAIN1:
@ -941,13 +941,6 @@ enum detectorSettings setSettings(enum detectorSettings sett) {
thisSettings = sett; thisSettings = sett;
// set special dacs to defined values
LOG(logINFO, ("Setting spcial dacs\n"));
const int specialDacs[NSPECIALDACS] = SPECIALDACINDEX;
for (int i = 0; i < NSPECIALDACS; ++i) {
setDAC(specialDacs[i], specialDacValues[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();