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

merged zmqdata to developer

Browse Source
This commit is contained in:
Dhanya Maliakal
2016-10-20 08:46:48 +02:00
parent fa7536e1d1 e49f97a03c
commit 12574f4c05
21 changed files with 743 additions and 487 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
slsDetectorSoftware/commonFiles/error_defs.h
View File

@ -15,7 +15,8 @@ using namespace std;
#include "sls_detector_defs.h"
#include <cstring>
#include <iostream>
/** Error flags */
@ -68,6 +69,7 @@ using namespace std;
#define RATE_CORRECTION_NO_TAU_PROVIDED 0x0000000001000000ULL
#define PROGRAMMING_ERROR 0x0000000002000000ULL
#define RECEIVER_ACTIVATE 0x0000000004000000ULL
#define DATA_STREAMING 0x0000000008000000ULL
// 0x00000000FFFFFFFFULL
/** @short class returning all error messages for error mask */
@ -213,6 +215,10 @@ public:
if(slsErrorMask&RECEIVER_ACTIVATE)
retval.append("Could not activate/deactivate receiver\n");
if(slsErrorMask&DATA_STREAMING)
retval.append("Could not set/reset Data Streaming\n");
//------------------------------------------------------ length of message
@ -237,21 +243,22 @@ public:
int64_t clearErrorMask(){errorMask=0;return errorMask;};
/** Gets the not added detector list
/returns list
*/
/returns list
*/
char* getNotAddedList(){return notAddedList;};
/** Append the detector to not added detector list
* @param name append to the list
/returns list
*/
/returns list
*/
void appendNotAddedList(const char* name){strcat(notAddedList,name);strcat(notAddedList,"+");};
/** Clears not added detector list
/returns error mask
*/
/returns error mask
*/
void clearNotAddedList(){strcpy(notAddedList,"");};
protected:
/** Error Mask */
@ -259,6 +266,7 @@ protected:
/** Detectors Not added List */
char notAddedList[MAX_STR_LENGTH];
};
#endif /* ERROR_DEFS_H_ */