bec/csaxs_bec
0
0
Fork 1
Code Issues 13 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

fixes during commissioning

Browse Source
This commit is contained in:
x12sa
2026-01-16 09:46:41 +01:00
committed by appel_c
parent a54c3e05a0
commit 6aefbcb2a4
2 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
csaxs_bec/bec_ipython_client/plugins/cSAXS/filter_transmission.py
View File

@@ -15,6 +15,13 @@ Implements fil_trans physics:
Motion is executed using provided position tables for each filter_array_*_x stage.
"""
#todo
#check dmm is off
#X12SA-OP-DMM-EMLS-3010:THRU translation THROUGH
#X12SA-OP-DMM-EMLS-3030:THRU bragg through
#X12SA-OP-CCM1:ENERGY-GET > 1
from __future__ import annotations
import math
@@ -150,7 +157,7 @@ class cSAXSFilterTransmission:
# -----------------------------
def fil_trans_select(
def fil_trans(
self,
transmission: Optional[float] = None,
energy_kev: Optional[float] = None,
@@ -163,10 +170,9 @@ class cSAXSFilterTransmission:
"""
if transmission is None:
print("\nUsage:")
print(" csaxs.fil_trans_select(<transmission>, energy_kev=<energy>, print_only=True)")
print("Example:")
print(" csaxs.fil_trans_select(0.10, energy_kev=6.2)")
print("\nUsage example:")
print(" csaxs.fil_trans(0.10, energy_kev=6.2)")
print(" First parameter is the transmission factor requested.\nIf energy is not specified it will be read from the monochromator (in the future)")
print("\nCurrent filter transmission:")
self._fil_trans_report(energy_kev=energy_kev)
return None

6
csaxs_bec/bec_ipython_client/plugins/cSAXS/smaract.py
View File

@@ -51,7 +51,8 @@ class cSAXSInitSmaractStages:
def __init__(self, client) -> None:
self.client = client
def smaract_initialize_all_stages(self):
def smaract_reference_stages(self):
#Todo make possible to ref all stages or just those not referenced yet. also init motion only of those newly referenced
"""
Initialize all Smaract stages by setting speed, finding the reference mark, and sleeping.
"""
@@ -103,6 +104,7 @@ class cSAXSInitSmaractStages:
self,
skip_devices=None,
):
#todo just move those that are referenced, with option to select individual ones
"""
Move all SmarAct-based components to their configured init_position.
@@ -173,7 +175,7 @@ class cSAXSInitSmaractStages:
+ ", ".join(not_referenced)
)
bec_logger.logger.error(
"[cSAXS] Aborting motion. Please reference axes first. \nOr skip the axes by e.g. \nsmaract_all_components_to_initial_position(skip_devices=[\"fast_shutter_n1_x\",\"fast_shutter_o1_x\"]"
"[cSAXS] Aborting motion. Please reference axes first. \nOr skip the axes by e.g. \nsmaract_all_components_to_initial_position(skip_devices=[\"fast_shutter_n1_x\",\"fast_shutter_o1_x\"])"
)
return