From a32e19d74eea51e4a205e711a4abbf3de2176996 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Mon, 9 Aug 2021 11:40:53 +0200 Subject: [PATCH] moved a definition to server defs --- slsDetectorServers/jungfrauDetectorServer/RegisterDefs.h | 1 - .../jungfrauDetectorServer/slsDetectorServer_defs.h | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/slsDetectorServers/jungfrauDetectorServer/RegisterDefs.h b/slsDetectorServers/jungfrauDetectorServer/RegisterDefs.h index 704389cbc..1baf7c9c7 100644 --- a/slsDetectorServers/jungfrauDetectorServer/RegisterDefs.h +++ b/slsDetectorServers/jungfrauDetectorServer/RegisterDefs.h @@ -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) diff --git a/slsDetectorServers/jungfrauDetectorServer/slsDetectorServer_defs.h b/slsDetectorServers/jungfrauDetectorServer/slsDetectorServer_defs.h index ab259a837..9da86eb0e 100644 --- a/slsDetectorServers/jungfrauDetectorServer/slsDetectorServer_defs.h +++ b/slsDetectorServers/jungfrauDetectorServer/slsDetectorServer_defs.h @@ -120,6 +120,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)