diff --git a/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer b/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer index 073079385..529cf3440 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 6db979921..3c8dab691 100644 --- a/slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.c @@ -1710,7 +1710,7 @@ int setClockDivider(enum CLKINDEX ind, int val) { } // phase is reset by pll (when setting output frequency) - if (ind >= READOUT_C0) { + if (ind < SYSTEM_C0) { clkPhase[READOUT_C0] = 0; clkPhase[READOUT_C1] = 0; } else { @@ -2500,4 +2500,4 @@ int getTotalNumberOfChannels() { } int getNumberOfChips() { return NCHIP; } int getNumberOfDACs() { return NDAC; } -int getNumberOfChannelsPerChip() { return NCHAN; } \ No newline at end of file +int getNumberOfChannelsPerChip() { return NCHAN; } diff --git a/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer b/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer index cc759311d..b93e19cc4 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 f9c68111f..219819826 100644 --- a/slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.c @@ -1929,7 +1929,7 @@ int setClockDivider(enum CLKINDEX ind, int val) { clkDivider[ind])); // phase is reset by pll (when setting output frequency) - if (ind >= READOUT_C0) { + if (ind < SYSTEM_C0) { clkPhase[READOUT_C0] = 0; clkPhase[READOUT_C1] = 0; } else { diff --git a/slsSupportLib/include/versionAPI.h b/slsSupportLib/include/versionAPI.h index a4961b09f..bd1325b32 100644 --- a/slsSupportLib/include/versionAPI.h +++ b/slsSupportLib/include/versionAPI.h @@ -5,8 +5,8 @@ #define APIGUI 0x200409 #define APICTB 0x200703 #define APIGOTTHARD 0x200703 -#define APIGOTTHARD2 0x200703 #define APIJUNGFRAU 0x200703 #define APIMOENCH 0x200702 #define APIEIGER 0x200703 -#define APIMYTHEN3 0x200708 +#define APIGOTTHARD2 0x200713 +#define APIMYTHEN3 0x200713