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

fixing merge conflict in error_Defs

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-10-03 14:32:30 +02:00
parent 986826cbe9 2aed12dcb9
commit 03a2f979a9
11 changed files with 136 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
slsDetectorSoftware/commonFiles/error_defs.h
View File

@ -80,7 +80,10 @@ using namespace std;
#define RECEIVER_FLIPPED_DATA_NOT_SET 0x0000000020000000ULL
#define THRESHOLD_NOT_SET 0x0000000040000000ULL
#define RECEIVER_FILE_FORMAT 0x0000000080000000ULL
#define RECEIVER_TIMER_NOT_SET 0x0000000100000000ULL
#define RECEIVER_SUBF_TIME_NOT_SET 0x0000000100000000ULL
#define RECEIVER_SILENT_MODE_NOT_SET 0x0000000200000000ULL
#define RECEIVER_TIMER_NOT_SET 0x0000000400000000ULL
// 0x0000000FFFFFFFFFULL
/** @short class returning all error messages for error mask */
@ -259,8 +262,16 @@ public:
if(slsErrorMask&RECEIVER_FILE_FORMAT)
retval.append("Could not set receiver file format\n");
<<<<<<< HEAD
if(slsErrorMask&RECEIVER_TIMER_NOT_SET)
retval.append("Could not set timer in receiver.\n");
=======
if(slsErrorMask&RECEIVER_SUBF_TIME_NOT_SET)
retval.append("Could not set sub exposure time in receiver.\n");
if(slsErrorMask&RECEIVER_SILENT_MODE_NOT_SET)
retval.append("Could not set silent mode in receiver.\n");
>>>>>>> 3.0.1
//------------------------------------------------------ length of message