detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-02-07 14:08:39 +01:00
Code Issues Actions Packages Releases Activity

using np.take and updated pixel map
All checks were successful
Build on RHEL9 / build (push) Successful in 3m47s
Details
Build on RHEL8 / build (push) Successful in 4m42s
Details

Browse Source
This commit is contained in:
froejdh_e
2026-01-28 15:54:27 +01:00
parent c3c3970f19
commit 8a0191e3f6
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pyctbgui/pyctbgui/services/Plot.py
View File

@@ -428,7 +428,7 @@ class PlotTab(QtWidgets.QWidget):
self.mainWindow.pixel_map = pm.matterhorn1_transceiver_16bit_1_counter() self.mainWindow.pixel_map = pm.matterhorn1_transceiver_16bit_1_counter()
elif self.view.comboBoxPlot.currentText() == "Matterhorn1_16bit_4_counters": elif self.view.comboBoxPlot.currentText() == "Matterhorn1_16bit_4_counters":
print("Setting pixel map for Matterhorn1 with 4 counters") print("Setting pixel map for Matterhorn1 with 4 counters")
self.mainWindow.nTransceiverRows = Defines.Matterhorn1.nRows self.mainWindow.nTransceiverRows = Defines.Matterhorn1.nRows*4
self.mainWindow.nTransceiverCols = Defines.Matterhorn1.nCols self.mainWindow.nTransceiverCols = Defines.Matterhorn1.nCols
self.mainWindow.pixel_map = pm.matterhorn1_transceiver_16bit_4_counters() self.mainWindow.pixel_map = pm.matterhorn1_transceiver_16bit_4_counters()
elif self.view.comboBoxPlot.currentText() == "Moench04": elif self.view.comboBoxPlot.currentText() == "Moench04":

3
pyctbgui/pyctbgui/services/Transceiver.py
View File

@@ -134,7 +134,8 @@ class TransceiverTab(QtWidgets.QWidget):
transceiverOffset += nDBitEnabled * (nbitsPerDBit // 8) transceiverOffset += nDBitEnabled * (nbitsPerDBit // 8)
trans_array = np.array(np.frombuffer(data, offset=transceiverOffset, dtype=np.uint16)) trans_array = np.array(np.frombuffer(data, offset=transceiverOffset, dtype=np.uint16))
print(f'{trans_array.shape=}') print(f'{trans_array.shape=}')
tmp = decoder.decode(trans_array, self.mainWindow.pixel_map) # tmp = decoder.decode(trans_array, self.mainWindow.pixel_map)
tmp = np.take(trans_array, self.mainWindow.pixel_map)
print(f'{tmp.shape=}') print(f'{tmp.shape=}')
return tmp return tmp

2
pyctbgui/pyctbgui/utils/pixelmap.py
View File

@@ -79,7 +79,7 @@ def matterhorn1_transceiver_16bit_4_counters():
n_counters = 4 n_counters = 4
n_cols = 256 n_cols = 256
n_rows = 256 n_rows = 256
pixel_map = np.zeros((n_rows*n_counters,n_cols,n_counters), np.uint32) pixel_map = np.zeros((n_rows*n_counters,n_cols), np.uint32)
for row in range(n_rows): for row in range(n_rows):
for counter in range(n_counters): for counter in range(n_counters):