detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-01-21 23:24:33 +01:00
Code Issues Actions Packages Releases Activity

now all the servers compile
All checks were successful
Build on RHEL9 / build (push) Successful in 3m47s
Details
Build on RHEL8 / build (push) Successful in 4m41s
Details

Browse Source
This commit is contained in:
maliakal_d
2026-01-16 15:53:49 +01:00
parent 8e1183b76e
commit 232ca92aba
9 changed files with 10 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer
View File

Binary file not shown.

BIN
slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer
View File

Binary file not shown.

BIN
slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer
View File

Binary file not shown.

BIN
slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer
View File

Binary file not shown.

BIN
slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer
View File

Binary file not shown.

BIN
slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer
View File

Binary file not shown.

15
slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.c
View File

@@ -1599,26 +1599,15 @@ void setDAC(enum DACINDEX ind, int val, int mV, int counterEnableCheck) {
void setGeneralDAC(enum DACINDEX ind, int val, int mV) { void setGeneralDAC(enum DACINDEX ind, int val, int mV) {
char *dac_names[] = {DAC_NAMES}; char *dac_names[] = {DAC_NAMES};
LOG(logDEBUG1, ("Setting dac[%d - %s]: %d %s \n", (int)ind, dac_names[ind],
val, (mV ? "mV" : "dac units")));
int dacval = val;
#ifdef VIRTUAL
LOG(logINFO, ("Setting dac[%d - %s]: %d %s \n", (int)ind, dac_names[ind], LOG(logINFO, ("Setting dac[%d - %s]: %d %s \n", (int)ind, dac_names[ind],
val, (mV ? "mV" : "dac units"))); val, (mV ? "mV" : "dac units")));
if (!mV) { int dacval = -1;
detectorDacs[ind] = val;
}
// convert to dac units
else if (LTC2620_D_VoltageToDac(val, &dacval) == OK) {
detectorDacs[ind] = dacval;
}
#else
if (LTC2620_D_SetDACValue((int)ind, val, mV, dac_names[ind], &dacval) == if (LTC2620_D_SetDACValue((int)ind, val, mV, dac_names[ind], &dacval) ==
OK) { OK) {
detectorDacs[ind] = dacval; detectorDacs[ind] = dacval;
} }
#endif
const int specialDacs[NSPECIALDACS] = SPECIALDACINDEX; const int specialDacs[NSPECIALDACS] = SPECIALDACINDEX;
for (int i = 0; i < NSPECIALDACS; ++i) { for (int i = 0; i < NSPECIALDACS; ++i) {
if ((int)ind == specialDacs[i]) { if ((int)ind == specialDacs[i]) {

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

@@ -1395,11 +1395,13 @@ int validateAndSetDac(enum dacIndex ind, int val, int mV) {
} }
} }
} }
#elif MYTHEN3D #else
#if MYTHEN3D
// ignore counter enable to force vth dac values // ignore counter enable to force vth dac values
setDAC(serverDacIndex, val, mV, 0); setDAC(serverDacIndex, val, mV, 0);
#else #else
setDAC(serverDacIndex, val, mV); setDAC(serverDacIndex, val, mV);
#endif
retval = getDAC(serverDacIndex, mV); retval = getDAC(serverDacIndex, mV);
LOG(logDEBUG1, ("Dac (%d): %d %s\n", serverDacIndex, retval, LOG(logDEBUG1, ("Dac (%d): %d %s\n", serverDacIndex, retval,

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

@@ -4,9 +4,9 @@
#define APILIB "0.0.0 0x250909" #define APILIB "0.0.0 0x250909"
#define APIRECEIVER "0.0.0 0x250822" #define APIRECEIVER "0.0.0 0x250822"
#define APICTB "0.0.0 0x260116" #define APICTB "0.0.0 0x260116"
#define APIGOTTHARD2 "0.0.0 0x260114" #define APIGOTTHARD2 "0.0.0 0x260116"
#define APIMOENCH "0.0.0 0x260107" #define APIMOENCH "0.0.0 0x260116"
#define APIEIGER "0.0.0 0x260107" #define APIEIGER "0.0.0 0x260116"
#define APIXILINXCTB "0.0.0 0x260116" #define APIXILINXCTB "0.0.0 0x260116"
#define APIJUNGFRAU "0.0.0 0x260107" #define APIJUNGFRAU "0.0.0 0x260116"
#define APIMYTHEN3 "0.0.0 0x260114" #define APIMYTHEN3 "0.0.0 0x260116"