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

merge fix

Browse Source
This commit is contained in:
maliakal_d
2021-08-06 16:41:39 +02:00
parent e62fc1907f e92270565b
commit dc921733d0
20 changed files with 20 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer
View File

Binary file not shown.

BIN
slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer
View File

Binary file not shown.

BIN
slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_developer
View File

Binary file not shown.

BIN
slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer
View File

Binary file not shown.

4
slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c
View File

@ -1104,7 +1104,7 @@ enum gainMode getGainMode() {
// dynamic gain, when nothing is set
if (retval_force == 0 && retval_fix == 0 && retval_cmp_rst == 0) {
return DYNAMIC_GAIN_MODE;
return DYNAMIC;
}
switch (retval_force) {
@ -1138,7 +1138,7 @@ void setGainMode(enum gainMode mode) {
uint32_t value = bus_r(addr);
switch (mode) {
case DYNAMIC_GAIN_MODE:
case DYNAMIC:
value &= ~(DAQ_GAIN_MODE_MASK);
bus_w(addr, value);
LOG(logINFO,

2
slsDetectorServers/jungfrauDetectorServer/slsDetectorServer_defs.h
View File

@ -98,7 +98,7 @@ enum CLKINDEX { RUN_CLK, ADC_CLK, DBIT_CLK, NUM_CLOCKS };
#define DEFAULT_HIGH_VOLTAGE (0)
#define DEFAULT_TIMING_MODE (AUTO_TIMING)
#define DEFAULT_SETTINGS (GAIN0)
#define DEFAULT_GAINMODE (DYNAMIC_GAIN_MODE)
#define DEFAULT_GAINMODE (DYNAMIC)
#define DEFAULT_TX_UDP_PORT (0x7e9a)
#define DEFAULT_TMP_THRSHLD (65 * 1000) // milli degree Celsius
#define DEFAULT_NUM_STRG_CLLS (0)

BIN
slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer
View File

Binary file not shown.

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

@ -8562,7 +8562,7 @@ int set_default_dac(int file_des) {
int get_gain_mode(int file_des) {
ret = OK;
memset(mess, 0, sizeof(mess));
enum gainMode retval = DYNAMIC_GAIN_MODE;
enum gainMode retval = DYNAMIC;
LOG(logDEBUG1, ("Getting gain mode\n"));
#ifndef JUNGFRAUD
@ -8595,7 +8595,7 @@ int set_gain_mode(int file_des) {
// only set
if (Server_VerifyLock() == OK) {
switch (gainmode) {
case DYNAMIC_GAIN_MODE:
case DYNAMIC:
case FORCE_SWITCH_G1:
case FORCE_SWITCH_G2:
case FIX_G1: