diff --git a/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer b/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer index b93f1de1b..e5d72b775 100755 Binary files a/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer and b/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer differ diff --git a/slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.c index 6818b40b6..08b682205 100644 --- a/slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.c @@ -1156,8 +1156,11 @@ int setClockDivider(enum CLKINDEX ind, int val) { { int i = 0; for (i = 0; i < NUM_CLOCKS; ++i) { - FILE_LOG(logINFO, ("\tCorrecting %s clock (%d) phase to %d degrees\n", clock_names[i], i, oldPhases[i])); - setPhase(i, oldPhases[i], 1); + int currPhaseDeg = getPhase(i, 1); + if (oldPhases[i] != currPhaseDeg) { + FILE_LOG(logINFO, ("\tCorrecting %s clock (%d) phase from %d to %d degrees\n", clock_names[i], i, currPhaseDeg, oldPhases[i])); + setPhase(i, oldPhases[i], 1); + } } } return OK; diff --git a/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer b/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer index c7b8af238..92ef7a182 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 ce419125b..5c0d8ea46 100644 --- a/slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.c @@ -1156,7 +1156,6 @@ int setClockDivider(enum CLKINDEX ind, int val) { int i = 0; for (i = 0; i < NUM_CLOCKS; ++i) { oldPhases [i] = getPhase(i, 1); - FILE_LOG(logDEBUG1, ("\tRemembering %s clock (%d) phase: %d degrees\n", clock_names[ind], ind, oldPhases[i])); } } @@ -1181,8 +1180,11 @@ int setClockDivider(enum CLKINDEX ind, int val) { { int i = 0; for (i = 0; i < NUM_CLOCKS; ++i) { - FILE_LOG(logINFO, ("\tCorrecting %s clock (%d) phase to %d degrees\n", clock_names[i], i, oldPhases[i])); - setPhase(i, oldPhases[i], 1); + int currPhaseDeg = getPhase(i, 1); + if (oldPhases[i] != currPhaseDeg) { + FILE_LOG(logINFO, ("\tCorrecting %s clock (%d) phase from %d to %d degrees\n", clock_names[i], i, currPhaseDeg, oldPhases[i])); + setPhase(i, oldPhases[i], 1); + } } } return OK; diff --git a/slsSupportLib/include/versionAPI.h b/slsSupportLib/include/versionAPI.h index a73ea7629..187ab0710 100644 --- a/slsSupportLib/include/versionAPI.h +++ b/slsSupportLib/include/versionAPI.h @@ -8,5 +8,5 @@ #define APIJUNGFRAU 0x191111 #define APIEIGER 0x191111 #define APICTB 0x191121 -#define APIMYTHEN3 0x191122 -#define APIGOTTHARD2 0x191122 +#define APIGOTTHARD2 0x191125 +#define APIMYTHEN3 0x191125