detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-23 18:17:59 +02:00
Code Issues Actions Packages Releases Activity

changing g_108MHz enum to g2_108MHZ (similarly 144), adding readoutspeedlist command

Browse Source
This commit is contained in:
maliakal_d
2021-10-08 11:05:25 +02:00
parent b1ae47d189
commit 417bfbaf38
12 changed files with 37 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.c
View File

@ -2086,7 +2086,7 @@ int getVCOFrequency(enum CLKINDEX ind) {
int setReadoutSpeed(int val) {
switch (val) {
case G_108MHZ:
case G2_108MHZ:
LOG(logINFOBLUE, ("Setting readout speed to 108 MHz\n"));
if (setClockDivider(READOUT_C0, SPEED_108_CLKDIV_0) == FAIL) {
return FAIL;
@ -2098,7 +2098,7 @@ int setReadoutSpeed(int val) {
return FAIL;
}
break;
case G_144MHZ:
case G2_144MHZ:
LOG(logINFOBLUE, ("Setting readout speed to 144 MHz\n"));
if (setClockDivider(READOUT_C0, SPEED_144_CLKDIV_0) == FAIL) {
return FAIL;
@ -2123,13 +2123,13 @@ int getReadoutSpeed(int* retval) {
if (clkDivider[READOUT_C0] == SPEED_108_CLKDIV_0 &&
clkDivider[READOUT_C1] == SPEED_108_CLKDIV_1 &&
getPhase(READOUT_C1, 1) == SPEED_108_CLKPHASE_DEG_1) {
*retval = G_108MHZ;
*retval = G2_108MHZ;
}
else if (clkDivider[READOUT_C0] == SPEED_144_CLKDIV_0 &&
clkDivider[READOUT_C1] == SPEED_144_CLKDIV_1 &&
getPhase(READOUT_C1, 1) == SPEED_144_CLKPHASE_DEG_1) {
*retval = G_144MHZ;
*retval = G2_144MHZ;
}
else {

2
slsDetectorServers/gotthard2DetectorServer/slsDetectorServer_defs.h
View File

@ -59,7 +59,7 @@
#define DEFAULT_SYSTEM_C2 (5) //(144444448) // sync_clk, 144 MHz
#define DEFAULT_SYSTEM_C3 (5) //(144444448) // str_clk, 144 MHz
#define DEFAULT_READOUT_SPEED (G_108MHZ)
#define DEFAULT_READOUT_SPEED (G2_108MHZ)
#define SPEED_144_CLKDIV_0 (6)
#define SPEED_144_CLKDIV_1 (6)
#define SPEED_144_CLKPHASE_DEG_1 (122) // 125 not possible

4
slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c
View File

@ -9290,8 +9290,8 @@ int set_readout_speed(int file_des) {
case HALF_SPEED:
case QUARTER_SPEED:
#elif GOTTHARD2D
case G_108MHZ:
case G_144MHZ:
case G2_108MHZ:
case G2_144MHZ:
#endif
break;
default: