From 4395e7b5f6a9251e0ec647288e6649dcc962b69f Mon Sep 17 00:00:00 2001 From: AliceMazzoleni99 Date: Fri, 26 Jun 2026 17:43:27 +0200 Subject: [PATCH] added moench05 to pyctbgui (#1481) * added moench05 to pyctbgui * use moench05 defs from aare --- pyctbgui/pyctbgui/services/Plot.py | 6 +++++- pyctbgui/pyctbgui/ui/plot.ui | 5 +++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/pyctbgui/pyctbgui/services/Plot.py b/pyctbgui/pyctbgui/services/Plot.py index 2b66e71f5..688265484 100644 --- a/pyctbgui/pyctbgui/services/Plot.py +++ b/pyctbgui/pyctbgui/services/Plot.py @@ -7,7 +7,7 @@ import numpy as np from PyQt5 import QtWidgets, QtGui, QtCore, uic from aare import transform, ReadoutMode -from aare._aare import Matterhorn10, Matterhorn02, Moench04 +from aare._aare import Matterhorn10, Matterhorn02, Moench04, Moench05 import pyqtgraph as pg from pyctbgui.utils import recordOrApplyPedestal @@ -529,6 +529,10 @@ class PlotTab(QtWidgets.QWidget): self.mainWindow.nAnalogRows = Moench04.nRows self.mainWindow.nAnalogCols = Moench04.nCols self.mainWindow.decoder = transform.Moench04AnalogTransform() + elif self.view.comboBoxPlot.currentText() == "Moench05": + self.mainWindow.nAnalogRows = Moench05.nRows + self.mainWindow.nAnalogCols = Moench05.nCols + self.mainWindow.decoder = transform.Moench05Transform() try: if hasattr(self.mainWindow.decoder, "compatibility") and callable(getattr(self.mainWindow.decoder, "compatibility")): diff --git a/pyctbgui/pyctbgui/ui/plot.ui b/pyctbgui/pyctbgui/ui/plot.ui index 3abb75fb4..01d2b5ec1 100644 --- a/pyctbgui/pyctbgui/ui/plot.ui +++ b/pyctbgui/pyctbgui/ui/plot.ui @@ -424,6 +424,11 @@ Moench04 + + + + Moench05 +