From 658a804cca13df27c43149c6212ec2c6e6107ce8 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Wed, 2 Sep 2020 16:48:58 +0200 Subject: [PATCH] gotthard2: change default clock divider of readout clocks 1 and 2 from 8 to 6 --- .../bin/gotthard2DetectorServer_developer | Bin 211388 -> 211388 bytes .../slsDetectorServer_defs.h | 4 ++-- slsSupportLib/include/versionAPI.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer b/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer index a2cb8e6e8a1829d250cff5a1605c88937832d87e..13d74ce56a521951a9401d481b3845794bf979cd 100755 GIT binary patch delta 73 zcmdnDxQ0milpD=Py=CKml9HAJ%BGkfofI*bufWQ}q1_qXO Y8wFYzn|GDxQ0milpD=Py=CKml9HAJ%BE-UUfI*bufWQ}q1_qXO Y8wFUHns=$T?^0z1Vy5l8RGFDX0G{?2RR910 diff --git a/slsDetectorServers/gotthard2DetectorServer/slsDetectorServer_defs.h b/slsDetectorServers/gotthard2DetectorServer/slsDetectorServer_defs.h index 330e53b04..439817a66 100644 --- a/slsDetectorServers/gotthard2DetectorServer/slsDetectorServer_defs.h +++ b/slsDetectorServers/gotthard2DetectorServer/slsDetectorServer_defs.h @@ -46,8 +46,8 @@ #define DEFAULT_CURRENT_SOURCE (0) #define DEFAULT_TIMING_SOURCE (TIMING_INTERNAL) -#define DEFAULT_READOUT_C0 (8) //(108333336) // rdo_clk, 108 MHz -#define DEFAULT_READOUT_C1 (8) //(108333336) // rdo_x2_clk, 108 MHz +#define DEFAULT_READOUT_C0 (6) //(144444448) // rdo_clk, 144 MHz +#define DEFAULT_READOUT_C1 (6) //(144444448) // rdo_x2_clk, 144 MHz #define DEFAULT_SYSTEM_C0 (5) //(144444448) // run_clk, 144 MHz #define DEFAULT_SYSTEM_C1 (10) //(72222224) // chip_clk, 72 MHz #define DEFAULT_SYSTEM_C2 (5) //(144444448) // sync_clk, 144 MHz diff --git a/slsSupportLib/include/versionAPI.h b/slsSupportLib/include/versionAPI.h index 4637973d3..f45cf6141 100644 --- a/slsSupportLib/include/versionAPI.h +++ b/slsSupportLib/include/versionAPI.h @@ -5,8 +5,8 @@ #define APIGUI 0x200804 #define APICTB 0x200810 #define APIGOTTHARD 0x200810 -#define APIGOTTHARD2 0x200810 #define APIJUNGFRAU 0x200810 #define APIMOENCH 0x200810 #define APIEIGER 0x200831 #define APIMYTHEN3 0x200901 +#define APIGOTTHARD2 0x200902