detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-01-16 10:04:39 +01:00
Code Issues Actions Packages Releases Activity

merge from 4.2.0

Browse Source
This commit is contained in:
maliakal_d
2020-04-07 15:14:27 +02:00
parent ab9fed45fb
commit 9f3ad4e2f4
11 changed files with 119 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
slsDetectorServers/eigerDetectorServer/slsDetectorServer_defs.h
View File

@@ -63,10 +63,10 @@ enum CLKINDEX {RUN_CLK, NUM_CLOCKS};
#define DEFAULT_SUBFRAME_DEADTIME (0)
#define DEFAULT_DYNAMIC_RANGE (16)
#define DEFAULT_PARALLEL_MODE (0)
#define DEFAULT_PARALLEL_MODE (1)
#define DEFAULT_READOUT_STOREINRAM_MODE (0)
#define DEFAULT_READOUT_OVERFLOW32_MODE (0)
#define DEFAULT_CLK_SPEED (HALF_SPEED)
#define DEFAULT_CLK_SPEED (FULL_SPEED)
#define DEFAULT_IO_DELAY (650)
#define DEFAULT_TIMING_MODE (AUTO_TIMING)
#define DEFAULT_PHOTON_ENERGY (-1)