From 4bf7321e2d987c82d76f56932aacd78af781ad5f Mon Sep 17 00:00:00 2001 From: Alexander Steppke Date: Fri, 21 Jun 2024 20:00:19 +0200 Subject: [PATCH] during p21977 --- beamline/components.py | 2 +- beamline/undulator.py | 2 +- channels/bs_channels.py | 2 +- channels/pv_channels.py | 3 +++ cristallina.py | 6 +++--- crq_exp/dilsc.py | 4 +++- 6 files changed, 12 insertions(+), 7 deletions(-) diff --git a/beamline/components.py b/beamline/components.py index 9afaf81..e16abba 100644 --- a/beamline/components.py +++ b/beamline/components.py @@ -20,7 +20,7 @@ def test_attenuators(): try: assert tfundamental > 0 except TypeError: - logger.warning("No transmission value reported from {att.ID}") + logger.warning(f"No transmission value reported from {att.ID}") test_attenuators() diff --git a/beamline/undulator.py b/beamline/undulator.py index 1bafd85..2039a3e 100644 --- a/beamline/undulator.py +++ b/beamline/undulator.py @@ -23,7 +23,7 @@ N_UNDS = list(range(3, 15 + 1)) # Cristallina without calibration # offset is the difference between PSSS and undulator setpoint # sign convention: Undulator - PSSS -energy_offset = -104 # eV +energy_offset = -70 # eV # move the PSSS motor according to the energy diff --git a/channels/bs_channels.py b/channels/bs_channels.py index ffbe25a..bf9a11d 100644 --- a/channels/bs_channels.py +++ b/channels/bs_channels.py @@ -345,7 +345,7 @@ bs_channels = ( camera_channels + channels_gas_monitor # + channels_RF - # + channels_Xeye + + channels_Xeye + channels_PBPS053 + channels_PSSS059 + channels_PSSS059_LB diff --git a/channels/pv_channels.py b/channels/pv_channels.py index 6e84516..7536a4e 100644 --- a/channels/pv_channels.py +++ b/channels/pv_channels.py @@ -337,6 +337,9 @@ pvs_OATA150 = [ "SAROP31-OATA150:MOTOR_4", # motor Motor 4 SAROP31-CPPM-MOT7171 swissfel "SAROP31-OATA150:MOTOR_5", # motor Motor 5 SAROP31-CPPM-MOT7171 swissfel "SAROP31-OATA150:MOTOR_6", # motor Motor 6 + "SAROP31-OATA150:UsrRec.TC1", # current transmission + "SAROP31-OATA150:UsrRec.TR1", # resulting transmission + "SAROP31-OATA150:UsrRec.TD", # setpoint transmission ] diff --git a/cristallina.py b/cristallina.py index 8cd0bb7..d7d4428 100644 --- a/cristallina.py +++ b/cristallina.py @@ -63,7 +63,7 @@ from slic.core.scanner import Scanner from slic.devices.general.motor import Motor -from slic.utils import devices, Marker, as_shortcut +from slic.utils import devices, Marker, as_shortcut, snapshot from slic.utils import Channels, Config, Elog, Screenshot, PV from slic.core.acquisition.fakeacquisition import FakeAcquisition @@ -119,7 +119,7 @@ from slic.devices.xoptics import slits ## Smaract & attocube stages from gp_exp.smaract_device_def import smaract_Juraj, smaract_mini_XYZ -from gp_exp.attocube_device_def import attocube +# from gp_exp.attocube_device_def import attocube # disabled fbecause of issues with Adjustables from gp_exp.jj_device_def import jjslits # Bernina monochromator @@ -163,7 +163,7 @@ spreadsheet = Spreadsheet( "Magnet_X": dilution.x, "Magnet_Y": dilution.y, "Magnet_Z": dilution.z, - "DilSc_T_plato": dilution.T_plato, + "DilSc_T_chip": dilution.T_chip, "DilSc_T_pucksensor": dilution.T_pucksensor, }, placeholders=("comment", "sample", "run_usable"), diff --git a/crq_exp/dilsc.py b/crq_exp/dilsc.py index 708452b..fa323a7 100644 --- a/crq_exp/dilsc.py +++ b/crq_exp/dilsc.py @@ -25,7 +25,9 @@ class Dilution(Device): self.x = MagnetCoil("X", self.dilsc, 'x', limit_low=-0.6, limit_high=0.6) self.y = MagnetCoil("Y", self.dilsc, 'y', limit_low=-0.6, limit_high=0.6) self.z = MagnetCoil("Z", self.dilsc, 'z', limit_low=-5.2, limit_high=5.2) - self.T_plato = Thermometer('T_plato', self.dilsc, limit_low=0, limit_high=300) + # not in use currently + # self.T_plato = Thermometer('T_plato', self.dilsc, limit_low=0, limit_high=300) + self.T_chip = Thermometer('T_chip', self.dilsc, limit_low=0, limit_high=300) self.T_pucksensor = Thermometer('T_pucksensor', self.dilsc, limit_low=0, limit_high=300)