slic/cristallina
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Beginning beamtime March 29.03.2025

Browse Source
This commit is contained in:
steppke_a
2025-03-29 18:03:04 +01:00
parent ea8b8d6058
commit 22c061d83e
8 changed files with 79 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
cristallina.py
View File

@ -159,14 +159,14 @@ BerninaDCM = BerninaMono("SAROP21-ODCM098")
# Diffractometer
from crq_exp.diffractometer import Diffractometer
dm1 = Diffractometer("SARES30-CPCL-ECMC02")
dm1 = Diffractometer("SARES31-GPS")
dm2 = Diffractometer("SARES32-GPS")
# Set according to which diffractometer is being used
diffractometer = dm1
# Dilution fridge
from crq_exp.dilsc import Dilution
#from crq_exp.dilsc import Dilution
try:
dilution = Dilution()
@ -178,6 +178,12 @@ except Exception as e:
# MX adajustables
# import mx.mx_adjustables
# Temporary quick hack thermometer addition for stand
#TODO: make in a thermometer class ...
T_reg = PVAdjustable('SARES31-DIL-LS1:A_KELVIN')
T_plato = PVAdjustable('SARES31-DIL-LS1:7_KELVIN')
T_chip = PVAdjustable('SARES31-DIL-LS1:8_KELVIN')
################# Stand setup ##################
@ -187,7 +193,10 @@ from stand.time import Time
adjs_for_spreadsheet = {
#"Time": Time(),
"Time": Time(),
"T_reg": T_reg,
"T_plato": T_plato,
"T_chip":T_chip,
"Transmission": attenuator.trans1st,
"Upstream Transmission": upstream_attenuator.trans1st,
"Energy_setpoint": cr_photon_energy,
@ -204,11 +213,13 @@ adjs_for_spreadsheet = {
if dilution is not None:
adjs_dilsc = {
"Magnet_X": dilution.x,
"Magnet_Y": dilution.y,
"Magnet_Z": dilution.z,
"DilSc_T_chip": dilution.T_chip,
"DilSc_T_pucksensor": dilution.T_reg,
#"Magnet_X": dilution.x,
#"Magnet_Y": dilution.y,
#"Magnet_Z": dilution.z,
"DilSc_T_chip": T_chip,
"DilSc_T_plato": T_plato,
#"DilSc_T_chip": dilution.T_chip,
"DilSc_T_pucksensor": T_reg,
}
adjs_for_spreadsheet.update(adjs_dilsc)