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

changed transmission delay commands to go through network parameters and included 10g flow control

Browse Source
This commit is contained in:
Dhanya Maliakal
2016-08-04 17:21:16 +02:00
parent 1e30a6a16a
commit 29ba1f4042
15 changed files with 81 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
slsDetectorSoftware/commonFiles/error_defs.h
View File

@ -59,7 +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
#define DETECTOR_NETWORK_PARAMETER 0x0000000000800000ULL
// 0x00000000FFFFFFFFULL
/** @short class returning all error messages for error mask */
@ -191,8 +191,8 @@ 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");
if(slsErrorMask&DETECTOR_NETWORK_PARAMETER)
retval.append("Could not set/get detector network parameter\n");

23
slsDetectorSoftware/commonFiles/sls_detector_defs.h
View File

@ -177,16 +177,19 @@ typedef struct {
*/
enum networkParameter {
DETECTOR_MAC, /**< detector MAC */
DETECTOR_IP, /**< detector IP */
RECEIVER_HOSTNAME, /**< receiver IP/hostname */
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 */
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 */
DETECTOR_MAC, /**< detector MAC */
DETECTOR_IP, /**< detector IP */
RECEIVER_HOSTNAME, /**< receiver IP/hostname */
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 */
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 */
FLOW_CONTROL_10G, /**< flow control for 10GbE */
FLOW_CONTROL_WR_PTR, /**< memory write pointer for flow control */
FLOW_CONTROL_RD_PTR /**< memory read pointer for flow control */
};
/**

3
slsDetectorSoftware/commonFiles/sls_detector_funcs.h
View File

@ -103,7 +103,8 @@ enum {
F_SET_RATE_CORRECT, /** < set/reset rate correction tau */
F_GET_RATE_CORRECT, /** < get rate correction tau */
F_ACTIVATE /** < activate/deactivate readout */
F_ACTIVATE, /** < activate/deactivate readout */
F_SET_NETWORK_PARAMETER /**< set network parameters such as transmission delay, flow control */
/* Always append functions hereafter!!! */