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

eiger server bug fix: get dacs conversion wrong

Browse Source
This commit is contained in:
maliakal_d 2019-07-02 17:50:39 +02:00
parent f4fa19b559
commit d2e4adf483
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer
View File

Binary file not shown.

2
slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c
View File

@ -1092,7 +1092,7 @@ int getDAC(enum DACINDEX ind, int mV) {
} }
int voltage = -1; int voltage = -1;
// dac units to voltage // dac units to voltage
ConvertToDifferentRange(DAC_MIN_MV, DAC_MAX_MV, LTC2620_MIN_VAL, LTC2620_MAX_VAL, ConvertToDifferentRange(LTC2620_MIN_VAL, LTC2620_MAX_VAL, DAC_MIN_MV, DAC_MAX_MV,
(detectorModules)->dacs[ind], &voltage); (detectorModules)->dacs[ind], &voltage);
FILE_LOG(logDEBUG1, ("Getting DAC %d : %d dac (%d mV)\n",ind, (detectorModules)->dacs[ind], voltage)); FILE_LOG(logDEBUG1, ("Getting DAC %d : %d dac (%d mV)\n",ind, (detectorModules)->dacs[ind], voltage));
return voltage; return voltage;

2
slsSupportLib/include/versionAPI.h
View File

@ -5,6 +5,6 @@
#define APIRECEIVER 0x190604 #define APIRECEIVER 0x190604
#define APIGUI 0x190405 #define APIGUI 0x190405
#define APICTB 0x190604 #define APICTB 0x190604
#define APIEIGER 0x190604
#define APIJUNGFRAU 0x190604 #define APIJUNGFRAU 0x190604
#define APIGOTTHARD 0x190604 #define APIGOTTHARD 0x190604
#define APIEIGER 0x190702