mx/AareDAQ
0
1
Fork 0
Code Issues 49 Pull Requests Actions Packages Projects Releases 84 Wiki Activity

feat: X10SA energy range 6-30 keV
CI / lint (push) Skipped
CI / test (3.12) (push) Skipped
CI / test (3.13) (push) Skipped
CI / test-with-beamline-plugins (pxi_bec) (push) Skipped
CI / test-with-beamline-plugins (pxii_bec) (push) Skipped
CI / test-with-beamline-plugins (pxiii_bec) (push) Skipped
CI / lint (pull_request) Successful in 42s
Details
CI / test (3.12) (pull_request) Successful in 1m2s
Details
CI / test (3.13) (pull_request) Successful in 1m6s
Details
CI / test (3.14) (pull_request) Successful in 1m6s
Details
CI / test-with-beamline-plugins (pxi_bec) (pull_request) Successful in 1m10s
Details
CI / test-with-beamline-plugins (pxii_bec) (pull_request) Successful in 1m17s
Details
CI / test-with-beamline-plugins (pxiii_bec) (pull_request) Successful in 1m28s
Details
CI / test-with-coverage (pull_request) Successful in 1m36s
Details
CI / coverage-analysis (pull_request) Successful in 4s
Details

Browse Source 
Pick the mono limits by BEAMLINE env via mx_beamline(): X10SA gets
6-30 keV, other beamlines keep the 4-20 placeholder until confirmed.

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
This commit is contained in:
duan_j
2026-09-10 14:42:19 +02:00
co-authored by Claude Fable 5.1
parent 55a6eff115
commit 6a6d2e080b
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/aare/gui/panels/monochromator_panel.py
+4 -2
View File
@@ -1,3 +1,5 @@
from aarecommon.config.beamline import mx_beamline
from aarecommon.models.beamline import MXBeamline
from aarecommon.models.models import DAQStatusModel
from PySide6.QtCore import Signal, Slot
from PySide6.QtWidgets import QDoubleSpinBox, QGridLayout, QLabel, QPushButton, QWidget
@@ -9,8 +11,8 @@ from aare.gui.widgets.title_label import TitleLabel
# TODO: placeholder range (was an arbitrary 1-30; nothing downstream validates —
# daq.change_energy forwards straight to bec) — confirm the real monochromator
# limits with the Beamline Scientist. Shared by both Set Energy rows.
ENERGY_MIN_KEV = 4.0
ENERGY_MAX_KEV = 20.0
# X10SA mono reaches 6-30 keV; others keep the placeholder until confirmed.
ENERGY_MIN_KEV, ENERGY_MAX_KEV = (6.0, 30.0) if mx_beamline() == MXBeamline.X10SA else (4.0, 20.0)
# "arrived" window for the moving->neutral transition; per-hardware knob like
# MotorMoveGroup's tol (the mono never lands exactly on the setpoint)
ENERGY_AT_TARGET_TOL_KEV = 0.001