detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-23 01:58:00 +02:00
Code Issues Actions Packages Releases Activity

jungfrau dacs named

Browse Source
This commit is contained in:
maliakal_d
2019-10-29 18:11:16 +01:00
parent 925a750f9a
commit fe467cdf70
27 changed files with 702 additions and 534 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer
View File

Binary file not shown.

24
slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c
View File

@ -959,12 +959,12 @@ void setDAC(enum DACINDEX ind, int val, int mV) {
FILE_LOG(logDEBUG1, ("Setting dac[%d]: %d %s \n", (int)ind, val, (mV ? "mV" : "dac units")));
if (ind == VTHRESHOLD) {
setDAC(VCMP_LL, val, mV);
setDAC(VCMP_LR, val, mV);
setDAC(VCMP_RL, val, mV);
setDAC(VCMP_RR, val, mV);
setDAC(VCP, val, mV);
if (ind == E_VTHRESHOLD) {
setDAC(E_VCMP_LL, val, mV);
setDAC(E_VCMP_LR, val, mV);
setDAC(E_VCMP_RL, val, mV);
setDAC(E_VCMP_RR, val, mV);
setDAC(E_VCP, val, mV);
return;
}
@ -996,13 +996,13 @@ void setDAC(enum DACINDEX ind, int val, int mV) {
}
int getDAC(enum DACINDEX ind, int mV) {
if (ind == VTHRESHOLD) {
if (ind == E_VTHRESHOLD) {
int ret[5] = {0};
ret[0] = getDAC(VCMP_LL, mV);
ret[1] = getDAC(VCMP_LR, mV);
ret[2] = getDAC(VCMP_RL, mV);
ret[3] = getDAC(VCMP_RR, mV);
ret[4] = getDAC(VCP, mV);
ret[0] = getDAC(E_VCMP_LL, mV);
ret[1] = getDAC(E_VCMP_LR, mV);
ret[2] = getDAC(E_VCMP_RL, mV);
ret[3] = getDAC(E_VCMP_RR, mV);
ret[4] = getDAC(E_VCP, mV);
if ((ret[0]== ret[1])&&
(ret[1]==ret[2])&&

2
slsDetectorServers/eigerDetectorServer/slsDetectorServer_defs.h
View File

@ -9,7 +9,7 @@
#define STATUS_ERROR 2
/* Enums */
enum DACINDEX {SVP,VTR,VRF,VRS,SVN,VTGSTV,VCMP_LL,VCMP_LR,CAL,VCMP_RL,RXB_RB,RXB_LB,VCMP_RR,VCP,VCN,VIS,VTHRESHOLD};
enum DACINDEX {E_SVP,E_VTR,E_VRF,E_VRS,E_SVN,E_VTGSTV,E_VCMP_LL,E_VCMP_LR,E_CAL,E_VCMP_RL,E_RXB_RB,E_RXB_LB,E_VCMP_RR,E_VCP,E_VCN,E_VIS,E_VTHRESHOLD};
#define DEFAULT_DAC_VALS { \
0, /* SvP */ \
2480, /* Vtr */ \