From 0f302e3446e2a13904794a9c89cdcca8caf2370d Mon Sep 17 00:00:00 2001 From: Dhanya Maliakal Date: Tue, 3 Oct 2017 15:17:15 +0200 Subject: [PATCH] conflict resolution --- slsDetectorSoftware/commonFiles/error_defs.h | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/slsDetectorSoftware/commonFiles/error_defs.h b/slsDetectorSoftware/commonFiles/error_defs.h index ec59cd6a3..182f0c27f 100644 --- a/slsDetectorSoftware/commonFiles/error_defs.h +++ b/slsDetectorSoftware/commonFiles/error_defs.h @@ -80,9 +80,8 @@ using namespace std; #define RECEIVER_FLIPPED_DATA_NOT_SET 0x0000000020000000ULL #define THRESHOLD_NOT_SET 0x0000000040000000ULL #define RECEIVER_FILE_FORMAT 0x0000000080000000ULL -#define RECEIVER_SUBF_TIME_NOT_SET 0x0000000100000000ULL -#define RECEIVER_SILENT_MODE_NOT_SET 0x0000000200000000ULL -#define RECEIVER_TIMER_NOT_SET 0x0000000400000000ULL +#define RECEIVER_SILENT_MODE_NOT_SET 0x0000000100000000ULL +#define RECEIVER_TIMER_NOT_SET 0x0000000200000000ULL // 0x0000000FFFFFFFFFULL @@ -265,9 +264,6 @@ public: 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");