From 5029eb0c86026ce7269bdaadad426c3ead439369 Mon Sep 17 00:00:00 2001 From: Dhanya Maliakal Date: Mon, 8 Feb 2016 15:25:28 +0100 Subject: [PATCH] bug fixed maximum sub exposure time is in 10 ns and not ns --- .../commonFiles/sls_detector_defs.h | 2 +- .../bin/eigerDetectorServer | Bin 260144 -> 260144 bytes .../slsDetectorServer_funcs.c | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/slsDetectorSoftware/commonFiles/sls_detector_defs.h b/slsDetectorSoftware/commonFiles/sls_detector_defs.h index 3198f89e2..ab1e24ad6 100755 --- a/slsDetectorSoftware/commonFiles/sls_detector_defs.h +++ b/slsDetectorSoftware/commonFiles/sls_detector_defs.h @@ -22,7 +22,7 @@ #define HEADERLENGTH 12 #define DEFAULT_SUBFRAME_EXPOSURE_VAL 2621440 /** default value for sub frame value 2.6ms*/ -#define MAX_SUBFRAME_EXPOSURE_VAL 0x1FFFFFFF /** 29 bit register for max subframe exposure value */ +#define MAX_SUBFRAME_EXPOSURE_VAL_IN_10NS 0x1FFFFFFF /** 29 bit register for max subframe exposure value */ /** maximum rois */ #define MAX_ROIS 100 diff --git a/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer b/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer index a55086f53de0379a2088474a972ea8056bc91a4a..96d274a2b676038bec2d8d2ecafed1fc53a72d20 100755 GIT binary patch delta 33 mcmdn+fqw%KrA=kC|DV9{|66m;)b^aIj6lq^J!dNOkt6^hVh|eu delta 33 mcmdn+fqw%KrA=j%|DV9{|9^AN)b^aIj6lq^J!dNOkt6^fBoG7u diff --git a/slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c b/slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c index 78c164015..e2c0f9c8a 100755 --- a/slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c +++ b/slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c @@ -2518,7 +2518,7 @@ int set_timer(int file_des) { switch(ind) { #ifdef EIGERD case SUBFRAME_ACQUISITION_TIME: - if (tns > MAX_SUBFRAME_EXPOSURE_VAL ){ + if (tns > (MAX_SUBFRAME_EXPOSURE_VAL_IN_10NS*10) ){ ret=FAIL; strcpy(mess,"Sub Frame exposure time should not exceed 5.368 seconds\n"); break;