This commit is contained in:
gac bernina committed 2026-10-04 10:06:41 +02:00
1 parent 819c14e730
commit dd94f3bbdd
3 files changed
+114 -11

No files matched your search

+41 -3
View File
@@ -146,6 +146,25 @@ namespace.append_obj(
# "kwargs": {},
# },
# backup config 2025-02-27 broken drivers
#def_blade_up={
# "args": [SmaractRecord, "SARES20-MCS1:MOT_14"],
# "kwargs": {},
#},
#def_blade_down={
# "args": [SmaractRecord, "SARES20-MCS1:MOT_13"],
# "kwargs": {},
#},
#def_blade_left={
# "args": [SmaractRecord, "SARES20-MCS1:MOT_18"],
# "kwargs": {},
#},
#def_blade_right={
# "args": [SmaractRecord, "SARES20-MCS1:MOT_4"],
# "kwargs": {},
#},
# backup config 2026-10-01 broken drivers
def_blade_up={
"args": [SmaractRecord, "SARES20-MCS1:MOT_14"],
"kwargs": {},
@@ -159,7 +178,7 @@ namespace.append_obj(
"kwargs": {},
},
def_blade_right={
"args": [SmaractRecord, "SARES20-MCS1:MOT_4"],
"args": [SmaractRecord, "SARES20-MCS2:MOT_1"],
"kwargs": {},
},
module_name="eco.xoptics.slits",
@@ -240,12 +259,31 @@ namespace.append_obj(
# "kwargs": {},
# },
# backup config 2025-02-27 broken drivers
#def_blade_up={
# "args": [SmaractRecord, "SARES20-MCS1:MOT_6"],
# "kwargs": {},
#},
#def_blade_down={
# "args": [SmaractRecord, "SARES20-MCS1:MOT_5"],
# "kwargs": {},
#},
#def_blade_left={
# "args": [SmaractRecord, "SARES20-MCS1:MOT_17"],
# "kwargs": {},
#},
#def_blade_right={
# "args": [SmaractRecord, "SARES20-MCS1:MOT_16"],
# "kwargs": {},
#},
#backup config 2026-10-01 broken drivers
def_blade_up={
"args": [SmaractRecord, "SARES20-MCS1:MOT_6"],
"args": [SmaractRecord, "SARES20-MCS2:MOT_3"],
"kwargs": {},
},
def_blade_down={
"args": [SmaractRecord, "SARES20-MCS1:MOT_5"],
"args": [SmaractRecord, "SARES20-MCS2:MOT_2"],
"kwargs": {},
},
def_blade_left={
+11 -2
View File
@@ -35,7 +35,10 @@ from .detectors import DetectorVirtual
from ..epics_utils.detector import DetectorPvData
import json
from .powerbrick import PowerBrickChannelPars
from .schneider_settings import SchneiderMotorSettings, SETTINGS_SELECTION as SCHNEIDER_SETTINGS_SELECTION
from .schneider_settings import (
SchneiderMotorSettings,
SETTINGS_SELECTION as SCHNEIDER_SETTINGS_SELECTION,
)
from time import sleep
if hasattr(global_config, "elog"):
@@ -1699,7 +1702,13 @@ class MotorRecord(Assembly):
# duplication), just an additional selection tag so a
# SelectionCatalog("schneider_motor_settings") entry captures
# them together with schneider_settings' own items.
for attr_name in ("description", "unit", "direction", "speed", "acceleration_time"):
for attr_name in (
"description",
"unit",
"direction",
"speed",
"acceleration_time",
):
self.status_collection.append(
self.__dict__[attr_name], selection=SCHNEIDER_SETTINGS_SELECTION
)
+62 -6
View File
@@ -84,6 +84,7 @@ class IncouplingCleanBernina(Assembly):
is_display=True,
)
class THzWork(Assembly):
def __init__(self, name=None):
super().__init__(name=name)
@@ -93,13 +94,25 @@ class THzWork(Assembly):
name="delaystage_ftir",
is_setting=True,
)
self._append(
DelayTime,
self.delaystage_ftir,
name="delay_ftir",
is_setting=True,
)
self._append(
SmaractRecord,
"SLAAR21-LMTS-SMAR1:MOT_0",
name="delaystage_lno_eos",
is_setting=True,
)
self._append(
DelayTime,
self.delaystage_lno_eos,
name="delay_lno_eos",
is_setting=True,
)
self._append(
SmaractRecord,
"SLAAR21-LMTS-SMAR1:MOT_4",
@@ -112,6 +125,36 @@ class THzWork(Assembly):
name="dfg_pos",
is_setting=True,
)
self._append(
MotorRecord,
"SLAAR21-LMOT-M532:MOT",
name="compressor_35fs",
is_setting=True,
)
self._append(
MotorRecord,
"SLAAR21-LMOT-M547:MOT",
name="compressor_100fs",
is_setting=True,
)
self.motor_configuration_thorlabs = {
"beam_1": {
"pvname": "SLAAR21-LMOT-ELL2",
},
"beam_2": {
"pvname": "SLAAR21-LMOT-ELL5",
},
}
### thorlabs piezo motors ###
for name, config in self.motor_configuration_thorlabs.items():
self._append(
ThorlabsPiezoRecord,
pvname=config["pvname"],
name=name,
is_setting=True,
)
class MIRVirtualStages(Assembly):
def __init__(self, name=None, nx=None, nz=None, mx=None, mz=None):
@@ -672,8 +715,11 @@ class FilterWheel(Assembly):
# offsetMirrors_new/swissfel/motors do (see AdjustablePvEnum._resolve()),
# instead of treating .RBV and .VAL as two independent, unrelated enums.
self._append(
AdjustablePvEnum, f"{pvname}.RBV", pvname_set=f"{pvname}.VAL",
name="_val", is_setting=True,
AdjustablePvEnum,
f"{pvname}.RBV",
pvname_set=f"{pvname}.VAL",
name="_val",
is_setting=True,
)
# Separate, untranslated handle onto raw .VAL indices for the
# home/remote/manual controller commands below (native codes 6/7/8):
@@ -1219,7 +1265,16 @@ class LaserBernina(Assembly):
# Table 2, Bernina hutch
self._append(
MotorRecord, self.pvname + "-M532:MOT", name="compressor", is_setting=True
MotorRecord,
self.pvname + "-M532:MOT",
name="compressor_35fs",
is_setting=True,
)
self._append(
MotorRecord,
self.pvname + "-M547:MOT",
name="compressor_100fs",
is_setting=True,
)
self._append(
@@ -1460,7 +1515,7 @@ class LaserBernina(Assembly):
print("spectrum_in spectrometer not configured!")
time.sleep(0.5)
def fluence(self, a,b,energy, alpha=5):
def fluence(self, a, b, energy, alpha=5):
"""This function calculates the fluence on the sample, taking spot size elongation into account.
Args:
@@ -1472,7 +1527,8 @@ class LaserBernina(Assembly):
Returns:
fluence in mJ/cm2
"""
return energy/(a/2*b/2*np.pi)*1e3/1e4*np.sin(np.deg2rad(alpha))
return energy / (a / 2 * b / 2 * np.pi) * 1e3 / 1e4 * np.sin(np.deg2rad(alpha))
from eco.epics_utils.adjustable import AdjustablePvString