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

transmission delay added

Browse Source
This commit is contained in:
Dhanya Maliakal
2016-08-03 17:03:37 +02:00
parent 1db5ef4fd4
commit d28d737fb9
15 changed files with 243 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
slsDetectorSoftware/commonFiles/error_defs.h
View File

@ -59,6 +59,7 @@ using namespace std;
#define COULD_NOT_PULSE_CHIP 0x0000000000100000ULL
#define COULD_NOT_SET_RATE_CORRECTION 0x0000000000200000ULL
#define RATE_CORRECTION_TAU_SUBEXPOSURE 0x0000000000400000ULL
#define TRANSMISSION_DELAY 0x0000000000800000ULL
// 0x00000000FFFFFFFFULL
/** @short class returning all error messages for error mask */
@ -190,6 +191,11 @@ public:
if(slsErrorMask&RATE_CORRECTION_TAU_SUBEXPOSURE)
retval.append("Rate Correction Deactivated: (tau/subexptime) must be less than 0.0015\n");
if(slsErrorMask&TRANSMISSION_DELAY)
retval.append("Could not set/get transmission delay\n");
//------------------------------------------------------ length of message

6
slsDetectorSoftware/commonFiles/sls_detector_defs.h
View File

@ -183,7 +183,10 @@ enum networkParameter {
RECEIVER_UDP_IP, /**< receiever UDP IP */
RECEIVER_UDP_PORT, /**< receiever UDP Port */
RECEIVER_UDP_MAC, /**< receiever UDP MAC */
RECEIVER_UDP_PORT2 /**< receiever UDP Port of second half module for eiger */
RECEIVER_UDP_PORT2, /**< receiever UDP Port of second half module for eiger */
DETECTOR_TXN_DELAY_LEFT, /**< transmission delay on the (left) port for next frame */
DETECTOR_TXN_DELAY_RIGHT,/**< transmission delay on the right port for next frame */
DETECTOR_TXN_DELAY_FRAME /**< transmission delay of a whole frame for all the ports */
};
/**
@ -523,7 +526,6 @@ enum angleConversionParameter {
};
//typedef struct {
//float center; /**< center of the module (channel at which the radius is perpendicular to the module surface) */
//float ecenter; /**< error in the center determination */