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

added dacnames in server defs for g1 and jungfrau

Browse Source
This commit is contained in:
maliakal_d
2020-09-17 17:11:09 +02:00
parent 6d01348bf4
commit d9bb028da2
4 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c
View File

@ -843,8 +843,10 @@ void setDAC(enum DACINDEX ind, int val, int mV) {
if (val < 0)
return;
LOG(logDEBUG1, ("Setting dac[%d]: %d %s \n", (int)ind, val,
(mV ? "mV" : "dac units")));
char *dac_names[] = {DAC_NAMES};
LOG(logINFO, ("Setting DAC %s\n", dac_names[ind]));
LOG(logDEBUG1, ("Setting dac[%d - %s]: %d %s \n", (int)ind, dac_names[ind],
val, (mV ? "mV" : "dac units")));
int dacval = val;
#ifdef VIRTUAL
if (!mV) {

4
slsDetectorServers/jungfrauDetectorServer/slsDetectorServer_defs.h
View File

@ -47,6 +47,10 @@ enum DACINDEX {
J_VREF_DS,
J_VREF_COMP
};
#define DAC_NAMES \
"vb_comp", "vdd_prot", "vin_com", "vref_prech", "vb_pixbuf", "vb_ds", \
"vref_ds", "vref_comp"
#define DEFAULT_DAC_VALS \
{ \
1220, /* J_VB_COMP */ \