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

dev: moench: min exptime (#865)

Browse Source 
* moench: remove min clock cycles for setting exptime (had been ported from jf)
This commit is contained in:
maliakal_d 2023-11-27 15:22:16 +01:00 committed by GitHub
parent 62dc0e1a34
commit d72c9e29a4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer
View File

Binary file not shown.

5
slsDetectorServers/moenchDetectorServer/slsDetectorFunctionList.c
View File

@ -699,14 +699,12 @@ int setExpTime(int64_t val) {
} }
LOG(logINFO, ("Setting exptime %lld ns\n", (long long int)val)); LOG(logINFO, ("Setting exptime %lld ns\n", (long long int)val));
val *= (1E-3 * CLK_RUN); val *= (1E-3 * CLK_RUN);
val -= ACQ_TIME_MIN_CLOCK;
if (val < 0) { if (val < 0) {
val = 0; val = 0;
} }
set64BitReg(val, SET_EXPTIME_LSB_REG, SET_EXPTIME_MSB_REG); set64BitReg(val, SET_EXPTIME_LSB_REG, SET_EXPTIME_MSB_REG);
// validate for tolerance // validate for tolerance
val += ACQ_TIME_MIN_CLOCK;
int64_t retval = getExpTime(); int64_t retval = getExpTime();
val /= (1E-3 * CLK_RUN); val /= (1E-3 * CLK_RUN);
if (val != retval) { if (val != retval) {
@ -716,8 +714,7 @@ int setExpTime(int64_t val) {
} }
int64_t getExpTime() { int64_t getExpTime() {
return (get64BitReg(SET_EXPTIME_LSB_REG, SET_EXPTIME_MSB_REG) + return get64BitReg(SET_EXPTIME_LSB_REG, SET_EXPTIME_MSB_REG) /
ACQ_TIME_MIN_CLOCK) /
(1E-3 * CLK_RUN); (1E-3 * CLK_RUN);
} }

3
slsDetectorServers/moenchDetectorServer/slsDetectorServer_defs.h
View File

@ -5,7 +5,7 @@
#include "sls/sls_detector_defs.h" #include "sls/sls_detector_defs.h"
#define REQRD_FRMWRE_VRSN_BOARD2 0x444445 // 1.0 pcb (version = 010) #define REQRD_FRMWRE_VRSN_BOARD2 0x444445 // 1.0 pcb (version = 010)
#define REQRD_FRMWRE_VRSN 0x230710 // 2.0 pcb (version = 011) #define REQRD_FRMWRE_VRSN 0x231026 // 2.0 pcb (version = 011)
#define NUM_HARDWARE_VERSIONS (2) #define NUM_HARDWARE_VERSIONS (2)
#define HARDWARE_VERSION_NUMBERS \ #define HARDWARE_VERSION_NUMBERS \
@ -58,7 +58,6 @@
/* Defines in the Firmware */ /* Defines in the Firmware */
#define MAX_TIMESLOT_VAL (0x1F) #define MAX_TIMESLOT_VAL (0x1F)
#define MAX_THRESHOLD_TEMP_VAL (127999) // millidegrees #define MAX_THRESHOLD_TEMP_VAL (127999) // millidegrees
#define ACQ_TIME_MIN_CLOCK (2)
#define ASIC_FILTER_MAX_RES_VALUE (1) #define ASIC_FILTER_MAX_RES_VALUE (1)
#define MAX_SELECT_CHIP10_VAL (63) #define MAX_SELECT_CHIP10_VAL (63)

2
slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c
View File

@ -2533,7 +2533,7 @@ int set_exptime(int file_des) {
if (gateIndex != -1) { if (gateIndex != -1) {
ret = FAIL; ret = FAIL;
sprintf(mess, sprintf(mess,
"Could not get exposure time. Gate index not implemented " "Could not set exposure time. Gate index not implemented "
"for this detector\n"); "for this detector\n");
LOG(logERROR, (mess)); LOG(logERROR, (mess));
} else { } else {

2
slsSupportLib/include/sls/versionAPI.h
View File

@ -9,5 +9,5 @@
#define APIGOTTHARD2 "developer 0x231109" #define APIGOTTHARD2 "developer 0x231109"
#define APIJUNGFRAU "developer 0x231109" #define APIJUNGFRAU "developer 0x231109"
#define APIMYTHEN3 "developer 0x231109" #define APIMYTHEN3 "developer 0x231109"
#define APIMOENCH "developer 0x231109"
#define APIEIGER "developer 0x231109" #define APIEIGER "developer 0x231109"
#define APIMOENCH "developer 0x231127"