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

Merge branch 'j3settings' into j4defaultdacs

Browse Source
This commit is contained in:
maliakal_d 2021-07-29 10:31:04 +02:00
commit 32b208f49f
3 changed files with 10 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer Executable file
View File

Binary file not shown.

52
slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c
View File

@ -884,55 +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[] = 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, const int specialDacVals1[] = 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, const int specialDacVals2[] = SPECIAL_DEFAULT_DYNAMICHG0_GAIN_VALS;
NSPECIALDACS * sizeof(int)); for (int i = 0; i < NSPECIALDACS; ++i) {
setDAC(specialDacs[i], specialDacVals2[i], 0);
}
break; break;
/*
case FIXGAIN1:
bus_w(DAQ_REG, bus_r(DAQ_REG) & ~DAQ_SETTINGS_MSK);
bus_w(DAQ_REG, bus_r(DAQ_REG) | DAQ_FIX_GAIN_STG_1_VAL);
LOG(logINFO,
("Set settings - Fix Gain 1, DAQ Reg: 0x%x\n", bus_r(DAQ_REG)));
break;
case FIXGAIN2:
bus_w(DAQ_REG, bus_r(DAQ_REG) & ~DAQ_SETTINGS_MSK);
bus_w(DAQ_REG, bus_r(DAQ_REG) | DAQ_FIX_GAIN_STG_2_VAL);
LOG(logINFO,
("Set settings - Fix Gain 2, DAQ Reg: 0x%x\n", bus_r(DAQ_REG)));
break;
case FORCESWITCHG1:
bus_w(DAQ_REG, bus_r(DAQ_REG) & ~DAQ_SETTINGS_MSK);
bus_w(DAQ_REG, bus_r(DAQ_REG) | DAQ_FRCE_GAIN_STG_1_VAL);
LOG(logINFO, ("Set settings - Force Switch Gain 1, DAQ Reg: 0x%x\n",
bus_r(DAQ_REG)));
break;
case FORCESWITCHG2:
bus_w(DAQ_REG, bus_r(DAQ_REG) & ~DAQ_SETTINGS_MSK);
bus_w(DAQ_REG, bus_r(DAQ_REG) | DAQ_FRCE_GAIN_STG_2_VAL);
LOG(logINFO, ("Set settings - Force Switch Gain 2, DAQ Reg: 0x%x\n",
bus_r(DAQ_REG)));
break;
*/
default: default:
LOG(logERROR, LOG(logERROR,
("This settings is not defined for this detector %d\n", (int)sett)); ("This settings is not defined for this detector %d\n", (int)sett));
@ -941,13 +914,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();

2
slsSupportLib/include/sls/versionAPI.h
View File

@ -9,4 +9,4 @@
#define APIMYTHEN3 0x210727 #define APIMYTHEN3 0x210727
#define APIMOENCH 0x210727 #define APIMOENCH 0x210727
#define APIEIGER 0x210727 #define APIEIGER 0x210727
#define APIJUNGFRAU 0x210727 #define APIJUNGFRAU 0x210729