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

merged with developer a lot of bug fixes from 14 sep to 30 sep

Browse Source
This commit is contained in:
Dhanya Maliakal
2016-10-04 13:36:04 +02:00
parent d0501c3139 f513fb06fb
commit 984698efad
25 changed files with 701 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
slsDetectorSoftware/commonFiles/error_defs.h
View File

@ -59,10 +59,10 @@ using namespace std;
#define COULD_NOT_PULSE_CHIP 0x0000000000100000ULL
#define COULD_NOT_SET_RATE_CORRECTION 0x0000000000200000ULL
#define DETECTOR_NETWORK_PARAMETER 0x0000000000400000ULL
#define RATE_CORRECTION_NOT_32BIT 0x0000000000800000ULL
#define RATE_CORRECTION_NOT_32or16BIT 0x0000000000800000ULL
#define RATE_CORRECTION_NO_TAU_PROVIDED 0x0000000001000000ULL
#define DATA_STREAMING_IN_RECEIVER 0x0000000002000000ULL
#define PROGRAMMING_ERROR 0x0000000002000000ULL
#define DATA_STREAMING_IN_RECEIVER 0x0000000004000000ULL
// 0x00000000FFFFFFFFULL
/** @short class returning all error messages for error mask */
class errorDefs {
@ -193,12 +193,15 @@ public:
if(slsErrorMask&DETECTOR_NETWORK_PARAMETER)
retval.append("Could not set/get detector network parameter\n");
if(slsErrorMask&RATE_CORRECTION_NOT_32BIT)
retval.append("Rate correction Deactivated, must be in 32 bit mode\n");
if(slsErrorMask&RATE_CORRECTION_NOT_32or16BIT)
retval.append("Rate correction Deactivated, must be in 32 or 16 bit mode\n");
if(slsErrorMask&RATE_CORRECTION_NO_TAU_PROVIDED)
retval.append("Rate correction Deactivated. No default tau provided in file\n");
if(slsErrorMask&PROGRAMMING_ERROR)
retval.append("Could not program FPGA\n");
if(slsErrorMask&DATA_STREAMING_IN_RECEIVER)
retval.append("Could not set/reset Data Streaming in Receiver\n");

4
slsDetectorSoftware/commonFiles/sls_detector_funcs.h
View File

@ -104,7 +104,9 @@ enum {
F_GET_RATE_CORRECT, /** < get rate correction tau */
F_ACTIVATE, /** < activate/deactivate readout */
F_SET_NETWORK_PARAMETER /**< set network parameters such as transmission delay, flow control */
F_SET_NETWORK_PARAMETER, /**< set network parameters such as transmission delay, flow control */
F_PROGRAM_FPGA /**< program FPGA */
/* Always append functions hereafter!!! */