From bff6dc0a0ff0aa38e62740cb56a42dcc10ce78a9 Mon Sep 17 00:00:00 2001 From: l_maliakal_d Date: Mon, 17 Jun 2013 13:23:16 +0000 Subject: [PATCH] added eiger dacs and settings git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@606 951219d9-93cf-4727-9268-0efd64621fa3 --- slsDetectorSoftware/commonFiles/error_defs.h | 3 +++ .../commonFiles/sls_detector_defs.h | 18 ++++++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/slsDetectorSoftware/commonFiles/error_defs.h b/slsDetectorSoftware/commonFiles/error_defs.h index 132c7ed89..e0f2727ab 100644 --- a/slsDetectorSoftware/commonFiles/error_defs.h +++ b/slsDetectorSoftware/commonFiles/error_defs.h @@ -34,6 +34,7 @@ using namespace std; #define COULDNOT_SET_ROI 0x0000000000000004ULL #define FILE_PATH_DOES_NOT_EXIST 0x0000000000000008ULL #define RECEIVER_READ_FREQUENCY 0x0000000000000010ULL +#define SETTINGS_NOT_SET 0x0000000000000020ULL /** @short class returning all error messages for error mask */ class errorDefs { @@ -84,6 +85,8 @@ public: if(slsErrorMask&RECEIVER_READ_FREQUENCY) retval.append("Could not set receiver read frequency.\n"); + if(slsErrorMask&SETTINGS_NOT_SET) + retval.append("Could not set settings.\n"); return retval; diff --git a/slsDetectorSoftware/commonFiles/sls_detector_defs.h b/slsDetectorSoftware/commonFiles/sls_detector_defs.h index 9985d10ce..6eac84b1f 100755 --- a/slsDetectorSoftware/commonFiles/sls_detector_defs.h +++ b/slsDetectorSoftware/commonFiles/sls_detector_defs.h @@ -355,6 +355,23 @@ enum dacIndex { V_DAC5, /**< moench */ V_DAC6, /**< moench */ V_DAC7, /**< moench */ + E_SvP, /**< eiger */ + E_SvN, /**< eiger */ + E_Vtr, /**< eiger */ + E_Vrf, /**< eiger */ + E_Vrs, /**< eiger */ + E_Vtgstv , /**< eiger */ + E_Vcmp_ll, /**< eiger */ + E_Vcmp_lr, /**< eiger */ + E_cal, /**< eiger */ + E_Vcmp_rl, /**< eiger */ + E_Vcmp_rr, /**< eiger */ + E_rxb_rb , /**< eiger */ + E_rxb_lb, /**< eiger */ + E_Vcp, /**< eiger */ + E_Vcn, /**< eiger */ + E_Vis, /**< eiger */ + E_iodelay /**< eiger */ }; /** @@ -369,6 +386,7 @@ enum detectorSettings{ LOWGAIN, /**< low gain settings */ MEDIUMGAIN, /**< medium gain settings */ VERYHIGHGAIN, /**< very high gain settings */ + LOWNOISE, /**< low noise settings */ UNDEFINED, /**< undefined or custom settings */ UNINITIALIZED /**< uninitialiazed (status at startup) */ };