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

removed forceswitch enum, removed fixgain1 and 2 from jungfrau settings (kept enum for g2

Browse Source
This commit is contained in:
maliakal_d
2021-07-23 17:12:48 +02:00
parent 61a99c70df
commit cce2511f7a
12 changed files with 10 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c
View File

@ -885,6 +885,7 @@ enum detectorSettings setSettings(enum detectorSettings sett) {
LOG(logINFO, ("Set settings - Dyanmic High Gain 0, DAQ Reg: 0x%x\n",
bus_r(DAQ_REG)));
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);
@ -909,6 +910,7 @@ enum detectorSettings setSettings(enum detectorSettings sett) {
LOG(logINFO, ("Set settings - Force Switch Gain 2, DAQ Reg: 0x%x\n",
bus_r(DAQ_REG)));
break;
*/
default:
LOG(logERROR,
("This settings is not defined for this detector %d\n", (int)sett));
@ -937,6 +939,7 @@ enum detectorSettings getSettings() {
LOG(logDEBUG1,
("Settings read: Dynamig High Gain. DAQ Reg: 0x%x\n", regval));
break;
/*
case DAQ_FIX_GAIN_STG_1_VAL:
thisSettings = FIXGAIN1;
LOG(logDEBUG1, ("Settings read: Fix Gain 1. DAQ Reg: 0x%x\n", regval));
@ -955,6 +958,7 @@ enum detectorSettings getSettings() {
LOG(logDEBUG1,
("Settings read: Force Switch Gain 2. DAQ Reg: 0x%x\n", regval));
break;
*/
default:
thisSettings = UNDEFINED;
LOG(logERROR, ("Settings read: Undefined. DAQ Reg: 0x%x\n", regval));

8
slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c
View File

@ -1537,10 +1537,6 @@ int set_module(int file_des) {
#ifdef JUNGFRAUD
case DYNAMICGAIN:
case DYNAMICHG0:
case FIXGAIN1:
case FIXGAIN2:
case FORCESWITCHG1:
case FORCESWITCHG2:
#elif GOTTHARDD
case DYNAMICGAIN:
case HIGHGAIN:
@ -1592,10 +1588,6 @@ int set_settings(int file_des) {
#ifdef JUNGFRAUD
case DYNAMICGAIN:
case DYNAMICHG0:
case FIXGAIN1:
case FIXGAIN2:
case FORCESWITCHG1:
case FORCESWITCHG2:
#elif GOTTHARDD
case DYNAMICGAIN:
case HIGHGAIN: