detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-01-22 03:31:03 +01:00
Code Issues Actions Packages Releases Activity

Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into dev/automate_documentation_build

Browse Source
This commit is contained in:
mazzol_a
2026-01-20 11:51:37 +01:00
parent f020eff659 b2f1ed3022
commit c30136d6c6
3 changed files with 4 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
python/slsdet/detector.py
View File

@@ -1907,6 +1907,8 @@ class Detector(CppDetectorApi):
raise ValueError("bit_position must be provided when passing int address") raise ValueError("bit_position must be provided when passing int address")
if not isinstance(bit_position, int): if not isinstance(bit_position, int):
raise ValueError("bit_position must be int") raise ValueError("bit_position must be int")
if isinstance(bitname_or_addr, int):
bitname_or_addr = RegisterAddress(bitname_or_addr)
return BitAddress(bitname_or_addr, bit_position) return BitAddress(bitname_or_addr, bit_position)
# New usage with str or BitAddress # New usage with str or BitAddress

25
slsDetectorServers/xilinx_ctbDetectorServer/chip_config_xilinx.txt
View File

@@ -1,24 +1 @@
# Prepare MH02 configuration # nothing
reg 0xC00C 0x00040041
reg 0xC010 0x01200004
# configure Matterhorn SPI
setbit 0xC014 0
# wait till config is done
pollbit 0xC014 3 0
# reset transceiver
reg 0xC120 0x0
reg 0xC120 0x1
reg 0xC120 0x0
# set MSB LSB inversions and polarity for transceiver
reg 0xC120 0x1e0
# Enable MH02 PLL clock
pattern enable_clock_pattern.pyat
# start the flow
setbit 0xB030 0
clearbit 0xB030 0
sleep 1

39
slsDetectorServers/xilinx_ctbDetectorServer/reset_chip_xilinx.txt
View File

@@ -1,39 +1,2 @@
# turn off clock # nothing
clearbit 0xB018 15
setbit 0xB010 15
sleep 1
# reset Matterhorn periphery
setbit 0xC014 1
sleep 1
# turn on clock
clearbit 0xB010 15
sleep 1
# reset rx transceiver datapath
setbit 0xC120 4
sleep 1
# reset 8b10b counters
setbit 0xC120 9
setbit 0xC120 10
setbit 0xC120 11
setbit 0xC120 12
sleep 1
clearbit 0xC120 9
clearbit 0xC120 10
# reset buffer fifos
reg 0x9024 0xFFFFFFFF
reg 0x9028 0xFFFFFFFF
reg 0x902C 0xFFFFFFFF
reg 0x9024 0x0
reg 0x9028 0x0
reg 0x902C 0x0
setbit 0xA000 18
# load default pattern
pattern readout_pattern.pyat