mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2025-04-21 03:10:02 +02:00
* added empty c extension * added rotation to the decoding * added color map, options and findex * minor * move checks to before acquisition * added pixel map based decoder * cleanup * no thread creation for single thread processing * added rotation and test to compare * allow high and low water mark for zmq (also buffer size) for fast readouts * removed roatation during decoding * added Transpose to image and invert Y False to invert it * retains the zoomed state after the first image of gui, catch and display exception if no detector connected * moved start frame to dockable widget, removed extra frame number label, moved current measurement also to dockable widget, hide frame plot entirely when showing patternviewer * first image dependin on which plot * remember settings of main window size and position, dockewidget if docked, its size and posisiotn as well, then update it next time the gui is opened * change in comment * using c decoder for moench 04 and matterhorn * catch exception from invalid image from decoder * clean up * update row and col when choosing image type, neeeded to show values * fix for previous PR * disable resetting colormap values keep the range selected for every new acquisition * fix typos + tested on virtual matterhorn * minor print * refactored Slow ADCs Tab * refactored DAC tab * refactored power supplies * refactored signals tab * refactored transceiver tab * fix typo * fix typo2 * remove commented code * delete commented code * delete commented code * delete commented signals code * remove commented code for transceiver tab * refactor adc tab * refactor Pattern Tab * Refactor transceivers tab (PR#5) (#118) * refactored transceiver tab * remove commented code for transceiver tab --------- Co-authored-by: Erik Frojdh <erik.frojdh@gmail.com> * refactor adc tab (PR#6) (#119) * refactor adc tab * refactored Plot and Acquisition Tabs * fix the regression issue * restructure project files * applying singleton and renaming tabs to services * working install using pip * applies singleton to tab classes and remove CI erros * added pyzmq and pillow * remove the singleton implementation and keep changes * fix merge errors in mainWindow * moved misplaced init file * rename service to tab * reorganize imports * iterate over tabs * reorder tabs * add slowadc to the list * saving changes (buggy) power supply ui not showing in the gui * split power supply tab * fixed tests * add hardcoded values to defines file * fix error * separate power supply * fix errors for powerSuppliesTab * split dacs * split slow adcs * split signals tab * added tests for bit_utils * add slowAdc class to defines * split transceiver ui file * split adc.ui * split pattern ui file * split plot and acquisition ui file * added basic test for parsing bit names * removed redundant code in read_alias_file * fix dacs ui position * testing for correct exception * cmd and args at split * group radio buttons * fix comments from PR#1 * show legend * added python version and dev requirements to setup.py * fix dac issue * moved _decoder into pkg * added inplace build * removed clear * fixed dependencies * make tests run without slsdet * updated name of action * define colcount * fixed loading of alias file * add yapf and ruff * apply formatting * fix E and F rules * add more ruff rules * change variable name * squashing gh debugging commits and add pre-commit * update label values to mv units * add hook for yapf * reconfigure yapf precommit hook * add format and check_format to makefile * change gh actions * update readme * added check_format * WIP * added linting in github action * updated readme] * add more control for color choice * remove useless file * fix un-updated line after refactoring Defines BIT0_31_MASK is not found in Defines.signals * visually improve the interface * fix last commit * add only selected plots for legend * add hide legend button * change hide legend to show legend checkbox show legend is checked by default * add support for saving in numpy * solve conversations * fix acq index offset * fix browse button in pattern error * fix other browse button errors * finish tests and add usage.md * remove buffer * add file,numpy-like interface and tests * remove useless .npy files * subscriptible npz files * remove useless files * remove repetetive tests * save changes * add mode r+, add with support,remove logging * remove offset of acqIndex between raw and numpy saving * fix only saving last frame * save signals of multiple devices * add comments and move condition for clearer code * fix bug when vieweing pattern file * iterate over enabled and plotted plots * add padestal substraction to transceiver and analog data * init pedestal frames to detector.frames * restore old exception * add pedestal substraction for digital signals * remove frames spinbox from plotTab * remove comments and use str instead of Path * avoid saving all frames * correct exception and log error's trace * add gui tests * add waveform test * add pedestal test * refactor by using fixtures * add tests for moench analog and pattern * add pytest-qt to dependencies * add save and load gui parameters * remove nohup file * fix old bug IndexError * save plot type * a * handle canceling load, loading matterhorn pedestal for moench * remove comparing .png files for pattern test * save plot type * red error on status bar when shape mismatch for loaded pedestal * fix makefile and docstrings * fix PRs conversation * move code into different function * fix wrong function names for power supply * removed old ctbgui * removed unnecessary files --------- Co-authored-by: Erik Frojdh <erik.frojdh@gmail.com> Co-authored-by: Braham Bechir <braham_b@pc11979.psi.ch> Co-authored-by: Bechir <bechir.braham@psi.ch> Co-authored-by: Bechir <bechir.brahem420@gmail.com>
74 lines
1.8 KiB
Python
74 lines
1.8 KiB
Python
import json
|
|
import zmq
|
|
import numpy as np
|
|
|
|
from slsdet import Detector
|
|
import matplotlib.pyplot as plt
|
|
|
|
det = Detector()
|
|
|
|
zmqIp = det.rx_zmqip
|
|
zmqport = det.rx_zmqport
|
|
zmq_stream = det.rx_zmqstream
|
|
|
|
|
|
def zmq_receiver():
|
|
context = zmq.Context()
|
|
socket = context.socket(zmq.SUB)
|
|
socket.connect(f"tcp://{zmqIp}:{zmqport}")
|
|
socket.subscribe("")
|
|
|
|
while True:
|
|
msg = socket.recv_multipart()
|
|
if len(msg) == 2:
|
|
header, data = msg
|
|
jsonHeader = json.loads(header)
|
|
print(jsonHeader)
|
|
print(f'Data size: {len(data)}')
|
|
data_array = np.array(np.frombuffer(data, dtype=np.uint16))
|
|
break
|
|
return data_array
|
|
|
|
|
|
def analog(data_array):
|
|
adc_numbers = [
|
|
9, 8, 11, 10, 13, 12, 15, 14, 1, 0, 3, 2, 5, 4, 7, 6, 23, 22, 21, 20, 19, 18, 17, 16, 31, 30, 29, 28, 27, 26,
|
|
25, 24
|
|
]
|
|
|
|
n_pixels_per_sc = 5000
|
|
|
|
sc_width = 25
|
|
analog_frame = np.zeros((400, 400))
|
|
order_sc = np.zeros((400, 400))
|
|
|
|
for n_pixel in range(n_pixels_per_sc):
|
|
#these_dbits = int(digital_data[n_pixel])
|
|
|
|
for i_sc, adc_nr in enumerate(adc_numbers):
|
|
# ANALOG
|
|
col = ((adc_nr % 16) * sc_width) + (n_pixel % sc_width)
|
|
if i_sc < 16:
|
|
row = 199 - int(n_pixel / sc_width)
|
|
else:
|
|
row = 200 + int(n_pixel / sc_width)
|
|
|
|
index_min = n_pixel * 32 + i_sc
|
|
|
|
pixel_value = data_array[index_min]
|
|
analog_frame[row, col] = pixel_value
|
|
order_sc[row, col] = i_sc
|
|
return analog_frame
|
|
|
|
|
|
fig, ax = plt.subplots()
|
|
data = analog(data_array=zmq_receiver())
|
|
im = ax.imshow(data)
|
|
ax.invert_yaxis()
|
|
fig.colorbar(im)
|
|
plt.show()
|
|
# pg.image(data, title="test")
|
|
|
|
# if __name__ == '__main__':
|
|
# pg.QtWidgets.QApplication.exec_()
|