diff --git a/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer b/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer index 762e10d1f..6e7874982 100755 Binary files a/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer and b/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer differ diff --git a/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer b/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer index 22d4db562..a9c0f0883 100755 Binary files a/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer and b/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer differ diff --git a/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer b/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer index 050fc9220..b3ef5bed3 100755 Binary files a/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer and b/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer differ diff --git a/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer b/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer index ace499d1b..086773466 100755 Binary files a/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer and b/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer differ diff --git a/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer b/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer index ccc82c7ef..bd540c1aa 100755 Binary files a/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer and b/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer differ diff --git a/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer b/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer index 867fd5222..f0a45cfad 100755 Binary files a/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer and b/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer differ diff --git a/slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.c index bf013f03e..44413e22b 100644 --- a/slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.c @@ -1599,26 +1599,15 @@ void setDAC(enum DACINDEX ind, int val, int mV, int counterEnableCheck) { void setGeneralDAC(enum DACINDEX ind, int val, int mV) { 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], val, (mV ? "mV" : "dac units"))); - if (!mV) { - detectorDacs[ind] = val; - } - // convert to dac units - else if (LTC2620_D_VoltageToDac(val, &dacval) == OK) { - detectorDacs[ind] = dacval; - } -#else + int dacval = -1; if (LTC2620_D_SetDACValue((int)ind, val, mV, dac_names[ind], &dacval) == OK) { detectorDacs[ind] = dacval; } -#endif + const int specialDacs[NSPECIALDACS] = SPECIALDACINDEX; for (int i = 0; i < NSPECIALDACS; ++i) { if ((int)ind == specialDacs[i]) { diff --git a/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c b/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c index c44abeede..64d6ab5b7 100644 --- a/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c +++ b/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c @@ -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 setDAC(serverDacIndex, val, mV, 0); #else setDAC(serverDacIndex, val, mV); +#endif retval = getDAC(serverDacIndex, mV); LOG(logDEBUG1, ("Dac (%d): %d %s\n", serverDacIndex, retval, diff --git a/slsSupportLib/include/sls/versionAPI.h b/slsSupportLib/include/sls/versionAPI.h index 794cc6f60..890b0e0ef 100644 --- a/slsSupportLib/include/sls/versionAPI.h +++ b/slsSupportLib/include/sls/versionAPI.h @@ -4,9 +4,9 @@ #define APILIB "0.0.0 0x250909" #define APIRECEIVER "0.0.0 0x250822" #define APICTB "0.0.0 0x260116" -#define APIGOTTHARD2 "0.0.0 0x260114" -#define APIMOENCH "0.0.0 0x260107" -#define APIEIGER "0.0.0 0x260107" +#define APIGOTTHARD2 "0.0.0 0x260116" +#define APIMOENCH "0.0.0 0x260116" +#define APIEIGER "0.0.0 0x260116" #define APIXILINXCTB "0.0.0 0x260116" -#define APIJUNGFRAU "0.0.0 0x260107" -#define APIMYTHEN3 "0.0.0 0x260114" +#define APIJUNGFRAU "0.0.0 0x260116" +#define APIMYTHEN3 "0.0.0 0x260116"