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 branch 'jungfrau1.1' into j14filtercell

Browse Source
This commit is contained in:
maliakal_d
2021-08-09 12:04:24 +02:00
parent 7552ea1e75 2a5fb9db57
commit 3ca4c94b32
5 changed files with 4 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
slsDetectorServers/jungfrauDetectorServer/RegisterDefs.h
View File

@ -110,7 +110,6 @@
#define CONFIG_V11_STATUS_CRRNT_SRC_MODE_MSK (0x00000001 << CONFIG_V11_STATUS_CRRNT_SRC_MODE_OFST)
#define CONFIG_V11_STATUS_FLTR_RSSTR_SMLR_OFST (21)
#define CONFIG_V11_STATUS_FLTR_RSSTR_SMLR_MSK (0x00000001 << CONFIG_V11_STATUS_FLTR_RSSTR_SMLR_OFST)
#define ASIC_FILTER_MAX_RES_VALUE (1)
#define CONFIG_V11_STATUS_AUTO_MODE_OVRRD_OFST (23)
#define CONFIG_V11_STATUS_AUTO_MODE_OVRRD_MSK (0x00000001 << CONFIG_V11_STATUS_AUTO_MODE_OVRRD_OFST)

1
slsDetectorServers/jungfrauDetectorServer/slsDetectorServer_defs.h
View File

@ -122,6 +122,7 @@ enum CLKINDEX { RUN_CLK, ADC_CLK, DBIT_CLK, NUM_CLOCKS };
#define MAX_STORAGE_CELL_CHIP11_VAL (3)
#define MAX_STORAGE_CELL_DLY_NS_VAL (ASIC_CTRL_EXPSRE_TMR_MAX_VAL)
#define ACQ_TIME_MIN_CLOCK (2)
#define ASIC_FILTER_MAX_RES_VALUE (1)
#define MAX_PHASE_SHIFTS (240)
#define BIT16_MASK (0xFFFF)