detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-10 20:07:14 +02:00
Code Issues Actions Packages Releases Activity

m3 and g2: while setting clock freq, change phase only if there is a change in phase (removing more printouts, will still only set if needed )

Browse Source
This commit is contained in:
maliakal_d
2019-11-25 10:54:30 +01:00
parent a95ab1e13e
commit 94382c1ece
5 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer
View File

Binary file not shown.

7
slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.c
View File

@ -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;

BIN
slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer
View File

Binary file not shown.

8
slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.c
View File

@ -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;

4
slsSupportLib/include/versionAPI.h
View File

@ -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