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

added eiger dacs and settings

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@606 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d
2013-06-17 13:23:16 +00:00
parent bb485949bf
commit bff6dc0a0f
2 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
slsDetectorSoftware/commonFiles/error_defs.h
View File

@ -34,6 +34,7 @@ using namespace std;
#define COULDNOT_SET_ROI 0x0000000000000004ULL #define COULDNOT_SET_ROI 0x0000000000000004ULL
#define FILE_PATH_DOES_NOT_EXIST 0x0000000000000008ULL #define FILE_PATH_DOES_NOT_EXIST 0x0000000000000008ULL
#define RECEIVER_READ_FREQUENCY 0x0000000000000010ULL #define RECEIVER_READ_FREQUENCY 0x0000000000000010ULL
#define SETTINGS_NOT_SET 0x0000000000000020ULL
/** @short class returning all error messages for error mask */ /** @short class returning all error messages for error mask */
class errorDefs { class errorDefs {
@ -84,6 +85,8 @@ public:
if(slsErrorMask&RECEIVER_READ_FREQUENCY) if(slsErrorMask&RECEIVER_READ_FREQUENCY)
retval.append("Could not set receiver read frequency.\n"); retval.append("Could not set receiver read frequency.\n");
if(slsErrorMask&SETTINGS_NOT_SET)
retval.append("Could not set settings.\n");
return retval; return retval;

18
slsDetectorSoftware/commonFiles/sls_detector_defs.h
View File

@ -355,6 +355,23 @@ enum dacIndex {
V_DAC5, /**< moench */ V_DAC5, /**< moench */
V_DAC6, /**< moench */ V_DAC6, /**< moench */
V_DAC7, /**< 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 */ LOWGAIN, /**< low gain settings */
MEDIUMGAIN, /**< medium gain settings */ MEDIUMGAIN, /**< medium gain settings */
VERYHIGHGAIN, /**< very high gain settings */ VERYHIGHGAIN, /**< very high gain settings */
LOWNOISE, /**< low noise settings */
UNDEFINED, /**< undefined or custom settings */ UNDEFINED, /**< undefined or custom settings */
UNINITIALIZED /**< uninitialiazed (status at startup) */ UNINITIALIZED /**< uninitialiazed (status at startup) */
}; };