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

eiger server bug fix: getmeasured period and exptime gets 32 bit from Febinterface and needs to be casted to int64_t before multiplying by 10

Browse Source
This commit is contained in:
maliakal_d 2019-02-06 14:49:00 +01:00
parent ef3e01b9bd
commit 22686e1e25
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
slsDetectorSoftware/eigerDetectorServer/FebControl.c
View File

@ -1966,7 +1966,7 @@ int64_t Feb_Control_GetMeasuredPeriod() {
unsigned int value = 0; unsigned int value = 0;
Feb_Interface_ReadRegister(sub_num,MEAS_PERIOD_REG, &value); Feb_Interface_ReadRegister(sub_num,MEAS_PERIOD_REG, &value);
return value*10; return (int64_t)value*10;
} }
int64_t Feb_Control_GetSubMeasuredPeriod() { int64_t Feb_Control_GetSubMeasuredPeriod() {
@ -1976,7 +1976,7 @@ int64_t Feb_Control_GetSubMeasuredPeriod() {
unsigned int value = 0; unsigned int value = 0;
Feb_Interface_ReadRegister(sub_num,MEAS_SUBPERIOD_REG, &value); Feb_Interface_ReadRegister(sub_num,MEAS_SUBPERIOD_REG, &value);
return value*10; return (int64_t)value*10;
} }

BIN
slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv4.0.1.22.0 → slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv4.0.1.22.1
View File

Binary file not shown.

8
slsDetectorSoftware/eigerDetectorServer/gitInfo.txt
View File

@ -1,9 +1,9 @@
Path: slsDetectorsPackage/slsDetectorSoftware/eigerDetectorServer Path: slsDetectorsPackage/slsDetectorSoftware/eigerDetectorServer
URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repsitory UUID: 2c08c1e7ce814934b4c943df2cc715c6bd406a83 Repsitory UUID: ef3e01b9bdf3a6a08367e2448bcc92bd13cf73ad
Revision: 349 Revision: 351
Branch: 4.0.1-rc Branch: 4.0.1-rc
Last Changed Author: Dhanya_Thattil Last Changed Author: Dhanya_Thattil
Last Changed Rev: 4031 Last Changed Rev: 4068
Last Changed Date: 2018-11-30 16:01:05.000000002 +0100 ./Makefile.virtual Last Changed Date: 2019-02-06 14:44:47.000000002 +0100 ./xparameters.h

6
slsDetectorSoftware/eigerDetectorServer/gitInfoEiger.h
View File

@ -1,6 +1,6 @@
#define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git" #define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git"
#define GITREPUUID "2c08c1e7ce814934b4c943df2cc715c6bd406a83" #define GITREPUUID "ef3e01b9bdf3a6a08367e2448bcc92bd13cf73ad"
#define GITAUTH "Dhanya_Thattil" #define GITAUTH "Dhanya_Thattil"
#define GITREV 0x4031 #define GITREV 0x4068
#define GITDATE 0x20181130 #define GITDATE 0x20190206
#define GITBRANCH "4.0.1-rc" #define GITBRANCH "4.0.1-rc"