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

added ctb

Browse Source
This commit is contained in:
Erik Frojdh 2020-09-11 15:25:23 +02:00
parent 884da7197e
commit aa10c4665f
4 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/CMakeLists.txt
View File

@ -81,3 +81,5 @@ add_custom_target(rst
${SPHINX_BUILD}/src ${SPHINX_BUILD}/src
${SPHINX_BUILD}/html ${SPHINX_BUILD}/html
COMMENT "Generating documentation with Sphinx") COMMENT "Generating documentation with Sphinx")
add_custom_target(server_rst python gen_server_doc.py)

2
docs/gen_server_doc.py.in
View File

@ -6,7 +6,7 @@ from pathlib import Path
src = Path('@CMAKE_SOURCE_DIR@')/'slsDetectorServers/' src = Path('@CMAKE_SOURCE_DIR@')/'slsDetectorServers/'
detectors = ['Mythen3', 'Gotthard2', 'Eiger', 'Jungfrau', 'Moench', 'Gotthard'] detectors = ['Mythen3', 'Gotthard2', 'Eiger', 'Jungfrau', 'Moench', 'Gotthard', 'Ctb']
for det in detectors: for det in detectors:

8
docs/src/servers.rst
View File

@ -27,6 +27,14 @@ Moench
:widths: 35, 35 :widths: 35, 35
:header-rows: 1 :header-rows: 1
Ctb
-------------
.. csv-table:: Default values
:file: ctb.csv
:widths: 35, 35
:header-rows: 1
Eiger Eiger
------------- -------------

2
slsDetectorServers/ctbDetectorServer/slsDetectorServer_defs.h
View File

@ -95,7 +95,7 @@ enum CLKINDEX { RUN_CLK, ADC_CLK, SYNC_CLK, DBIT_CLK, NUM_CLOCKS };
#define NDAC_ONLY (NDAC - NPWR) #define NDAC_ONLY (NDAC - NPWR)
#define DYNAMIC_RANGE (16) #define DYNAMIC_RANGE (16)
#define NUM_BYTES_PER_PIXEL (DYNAMIC_RANGE / 8) #define NUM_BYTES_PER_PIXEL (DYNAMIC_RANGE / 8)
#define CLK_FREQ (156.25) /* MHz */ #define CLK_FREQ (156.25) // MHz
#define I2C_POWER_VIO_DEVICE_ID (0x40) #define I2C_POWER_VIO_DEVICE_ID (0x40)
#define I2C_POWER_VA_DEVICE_ID (0x41) #define I2C_POWER_VA_DEVICE_ID (0x41)
#define I2C_POWER_VB_DEVICE_ID (0x42) #define I2C_POWER_VB_DEVICE_ID (0x42)