diff --git a/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer b/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer index c36b21684..6c28780e4 100755 Binary files a/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer and b/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer differ diff --git a/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer b/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer index 9c580018e..8464901dd 100755 Binary files a/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer and b/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer differ diff --git a/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_developer b/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_developer index 710f6215b..72561bfce 100755 Binary files a/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_developer and b/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_developer differ diff --git a/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer b/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer index 2200353bc..67bd647dc 100755 Binary files a/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer and b/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer differ diff --git a/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer b/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer index 82e842cba..0c809a42b 100755 Binary files a/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer and b/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer differ diff --git a/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c b/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c index 0be28f545..02d5c5674 100755 --- a/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c +++ b/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c @@ -5654,7 +5654,7 @@ int set_clock_phase(int file_des) { sprintf(modeName, "%s clock (%d) phase %s", clock_names[c], (int)c, (inDegrees == 0 ? "" : "(degrees)")); // gotthard1d doesnt take degrees and cannot get phase -#ifndef GOTTHARDD +#ifdef GOTTHARDD if (inDegrees != 0) { ret = FAIL; strcpy(mess, "Cannot set phase in degrees for this detector.\n"); diff --git a/slsDetectorSoftware/src/CmdProxy.cpp b/slsDetectorSoftware/src/CmdProxy.cpp index 62ddd3786..e552ed9db 100644 --- a/slsDetectorSoftware/src/CmdProxy.cpp +++ b/slsDetectorSoftware/src/CmdProxy.cpp @@ -407,7 +407,7 @@ std::string CmdProxy::ClockFrequency(int action) { os << "[n_clock (0-8)] [freq_in_Hz]\n\t[Gotthard2][Mythen3] Frequency of clock n_clock in Hz. Use clkdiv to set frequency." << '\n'; } else { defs::detectorType type = det->getDetectorType().squash(defs::GENERIC); - if (type != defs::GOTTHARD2 && type != MYTHEN3) { + if (type != defs::GOTTHARD2 && type != defs::MYTHEN3) { throw sls::RuntimeError("Not implemented for this detector."); } if (action == defs::GET_ACTION) { @@ -437,7 +437,7 @@ std::string CmdProxy::ClockPhase(int action) { os << "[n_clock (0-8)] [phase] [deg (optional)]\n\t[Gotthard2][Mythen3] Phase of clock n_clock. If deg, then phase shift in degrees, else absolute phase shift values." << '\n'; } else { defs::detectorType type = det->getDetectorType().squash(defs::GENERIC); - if (type != defs::GOTTHARD2 && type != MYTHEN3) { + if (type != defs::GOTTHARD2 && type != defs::MYTHEN3) { throw sls::RuntimeError("Not implemented for this detector."); } if (action == defs::GET_ACTION) { @@ -480,7 +480,7 @@ std::string CmdProxy::MaxClockPhaseShift(int action) { os << "[n_clock (0-8)]\n\t[Gotthard2][Mythen3] Absolute Maximum Phase shift of clock n_clock." << '\n'; } else { defs::detectorType type = det->getDetectorType().squash(defs::GENERIC); - if (type != defs::GOTTHARD2 && type != MYTHEN3) { + if (type != defs::GOTTHARD2 && type != defs::MYTHEN3) { throw sls::RuntimeError("Not implemented for this detector."); } if (action == defs::GET_ACTION) { @@ -505,7 +505,7 @@ std::string CmdProxy::ClockDivider(int action) { os << "[n_clock (0-8)] [n_divider]\n\t[Gotthard2][Mythen3] Clock Divider of clock n_clock. Must be greater than 1." << '\n'; } else { defs::detectorType type = det->getDetectorType().squash(defs::GENERIC); - if (type != defs::GOTTHARD2 && type != MYTHEN3) { + if (type != defs::GOTTHARD2 && type != defs::MYTHEN3) { throw sls::RuntimeError("Not implemented for this detector."); } if (action == defs::GET_ACTION) { diff --git a/slsSupportLib/include/versionAPI.h b/slsSupportLib/include/versionAPI.h index 82056f70f..e895bfaa9 100644 --- a/slsSupportLib/include/versionAPI.h +++ b/slsSupportLib/include/versionAPI.h @@ -4,9 +4,9 @@ #define APIRECEIVER 0x190722 #define APIGUI 0x190723 #define APIMOENCH 0x190820 -#define APIJUNGFRAU 0x191106 -#define APIEIGER 0x191106 #define APIGOTTHARD 0x191106 #define APICTB 0x191106 #define APIGOTTHARD2 0x191106 #define APIMYTHEN3 0x191106 +#define APIJUNGFRAU 0x191106 +#define APIEIGER 0x191106