From 6022c9b29e779d464c35826361dc63b1b835b6cc Mon Sep 17 00:00:00 2001 From: l_maliakal_d Date: Thu, 21 Feb 2013 15:53:44 +0000 Subject: [PATCH] included setroi for multidet git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@464 951219d9-93cf-4727-9268-0efd64621fa3 --- slsDetectorSoftware/commonFiles/error_defs.h | 6 +++++- slsDetectorSoftware/commonFiles/sls_detector_defs.h | 3 +++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/slsDetectorSoftware/commonFiles/error_defs.h b/slsDetectorSoftware/commonFiles/error_defs.h index af5a550d8..b21efe09f 100644 --- a/slsDetectorSoftware/commonFiles/error_defs.h +++ b/slsDetectorSoftware/commonFiles/error_defs.h @@ -31,6 +31,7 @@ using namespace std; #define COULD_NOT_CONFIGURE_MAC 0x0000000000000001ULL #define COULDNOT_SET_NETWORK_PARAMETER 0x0000000000000002ULL +#define COULDNOT_SET_ROI 0x0000000000000004ULL /** @short class returning all error messages for error mask */ @@ -71,7 +72,10 @@ public: retval.append("Could not configure mac\n"); if(slsErrorMask&COULDNOT_SET_NETWORK_PARAMETER) - retval.append("Could not set network parameter. Should be valid and in proper format.\n"); + retval.append("Could not set network parameter. Should be valid and in proper format\n"); + + if(slsErrorMask&COULDNOT_SET_ROI) + retval.append("Could not set the exact region of interest. Verify ROI set by detector.\n"); return retval; diff --git a/slsDetectorSoftware/commonFiles/sls_detector_defs.h b/slsDetectorSoftware/commonFiles/sls_detector_defs.h index 8fa55104b..1991c8932 100755 --- a/slsDetectorSoftware/commonFiles/sls_detector_defs.h +++ b/slsDetectorSoftware/commonFiles/sls_detector_defs.h @@ -19,6 +19,9 @@ /** header length for data :gotthard*/ #define HEADERLENGTH 12 +/** maximum rois */ +#define MAX_ROIS 100 + typedef double double32_t; typedef float float32_t; typedef int int32_t;