From 3b32cec7af17f390a0cba140a5131cc327f6b481 Mon Sep 17 00:00:00 2001 From: Sven Augustin Date: Thu, 16 Feb 2023 17:33:34 +0100 Subject: [PATCH] a few new devices; new spreadsheet; some shortcuts --- maloja.py | 70 ++++++++++---- spreadsheet.py | 244 ++++++++++++++++++++++++++++++++++++------------- 2 files changed, 231 insertions(+), 83 deletions(-) diff --git a/maloja.py b/maloja.py index 61df706..73b6f09 100644 --- a/maloja.py +++ b/maloja.py @@ -4,7 +4,7 @@ from time import sleep from datetime import datetime import numpy as np from tqdm import trange -#from epics import PV +from epics import PV from slic.gui import GUI from slic.core.adjustable import Adjustable, PVAdjustable, DummyAdjustable @@ -22,10 +22,11 @@ from slic.utils import devices, Marker, as_shortcut from devices.attenuator import Attenuator from devices.undulator import Undulators, TwoColorChicane, Phases +from devices.holo_sample_motion import HoloSample #from devices.phases import UndPhases from channels import channels, pvs, detectors -from spreadsheet import overview, print_overview, print_line_for_spreadsheet +from spreadsheet import overview, print_overview, print_line_for_spreadsheet, spreadsheet_info import colors @@ -53,8 +54,14 @@ pump_probe_delay = Motor("SLAAT21-LMOT-M703:MOT", name="pump_probe_delay") laser_delay = Motor("SLAAT21-LMOT-M708:MOT", name="Laser Global Delay") lxt = PVAdjustable("SLAAT01-LTIM-PDLY:DELAY", pvname_done_moving="SLAAT01-LTIM-PDLY:WAITING", name="LXT") -source_y = Motor("SATES20-MANIP1:MOTOR_1", name="Aerosol Injector x") -source_x = Motor("SATES20-MANIP1:MOTOR_2", name="Aerosol Injector y") +source_y = Motor("SATES20-MANIP2:MOTOR_2", name="Needle y") +source_x = Motor("SATES20-MANIP2:MOTOR_1", name="Needle x") + + +injector_x = Motor("SATES20-MANIP1:MOTOR_1", name="Injector X") + + +pump_pulse_energy = Motor("SLAAT21-LMOT-M702:MOT", name="Pump Pulse Energy (Waveplate)") att = Attenuator("SATFE10-OATT064") shutter = Shutter("SATOP21-OPSH138") @@ -70,7 +77,6 @@ und1.set_limits(390, 1100) und2.set_limits(390, 1100) - class MonoUndCoupled(Adjustable): def __init__(self, mono, und, und_energy_offset=0): @@ -94,10 +100,20 @@ class MonoUndCoupled(Adjustable): -mono_und_coupled = MonoUndCoupled(mono, und, und_energy_offset=3) +mono_und_coupled = MonoUndCoupled(mono, und, und_energy_offset=5) +### Smaract stage at an angle in the Yaxis: +#mot_x = SmarActAxis("SATES21-XSMA166:MOT8", name="Table 1: flagx") +#mot_y = Converted( + +m1 = PVAdjustable("SATES23-XSMA169:MOT7:DRIVE", internal=True) +m2 = PVAdjustable("SATES23-XSMA169:MOT8:DRIVE", internal=True) +holo_sample_motion_y = HoloSample(m1, m2) +holo_sample_motion_x = SmarActAxis("SATES23-XSMA169:MOT7", name="Table 3: Sample X") + + #params = unpickle("devices/phases/UE38_meas_and_fit_data.pickle")["fitdata"] #und_names = [f"SATUN{i:02}" for i in range(6, 22+1) if i != 14] #polarization = UndPhases("SATUN-PHASES", params, und_names=und_names, isparallel=True, name="z Polarization") @@ -130,19 +146,19 @@ mark_gascell = Marker(standa, 88.334, "Gas Cell") mark_tof = Marker(standa, 28.330, "TOF") -#magn = PV("SATUN14-MBND100:CYCLE") +magn = PV("SATUN14-MBND100:CYCLE") -#@as_shortcut -#def cycle_magnet(): -# magn.put(1, wait=True) -# for _ in trange(250): -# sleep(1) -# # set the current to 1 and 5 consecutively, -# # since the results after the first step always looks strange -# chic_delay.set(1).wait() -# sleep(1) -# chic_delay.set(5).wait() -# sleep(1) +@as_shortcut +def cycle_magnet(): + magn.put(1, wait=True) + for _ in trange(250): + sleep(1) + # set the current to 1 and 5 consecutively, + # since the results after the first step always looks strange + chic_delay.set(1).wait() + sleep(1) + chic_delay.set(5).wait() + sleep(1) # add some more devices to the overview @@ -153,6 +169,16 @@ overview.LXT = lxt +@as_shortcut +def unstuck_undulators(): + und.unstuck() + + + +from slic.core.acquisition.spreadsheet import Spreadsheet + +spreadsheet = Spreadsheet(spreadsheet_info, placeholders=["comment", "sample"], host="satese-cons-01", port=9090) + instrument = "maloja" @@ -177,9 +203,13 @@ instrument = "maloja" #pgroup = "p20553" # liquid jet #pgroup = "p20561" # HHGX beamtime #pgroup = "p20568" # COLTRIMS commissioning -pgroup = "p20562" # CD -- Woerner +#pgroup = "p20562" # Circular dichroism -- Woerner +#pgroup = "p20560" # Four-wave-mixing -- Knopp +#pgroup = "p20279" # SPI -- Ban +pgroup = "p20848" # Holo -- Boris +#pgroup = "p20851" # Camera test Edwin -daq = SFAcquisition(instrument, pgroup, default_channels=channels, default_pvs=pvs, default_detectors=detectors, rate_multiplicator=1, append_user_tag_to_data_dir=True) +daq = SFAcquisition(instrument, pgroup, default_channels=channels, default_pvs=pvs, default_detectors=detectors, rate_multiplicator=1, append_user_tag_to_data_dir=True, spreadsheet=spreadsheet) #daq = FakeAcquisition(instrument, pgroup) #daqPV = PVAcquisition(instrument, pgroup, default_channels=channels_ks) # workaround for KS not going to DB diff --git a/spreadsheet.py b/spreadsheet.py index 154df18..f8e5134 100644 --- a/spreadsheet.py +++ b/spreadsheet.py @@ -20,109 +20,221 @@ for i in n_unds: undulator_info[f"polarisation{i}"] = PVEnumAdjustable(f"SATUN{i:02}-UIND030:POL-SET", internal=True) - -overview = SimpleDevice("Maloja Overview", +overview_info = dict( # standa = standa, # exp_delay = exp_delay, # laser_delay = laser_delay, # LXT = lxt, FELrepRate = PVAdjustable("SWISSFEL-STATUS:Bunch-2-Appl-Freq-RB", internal=True), - PaddleChamber1x = PVAdjustable("SATES21-XSMA166:MOT1:MOTRBV", internal=True), - PaddleChamber1y = PVAdjustable("SATES21-XSMA166:MOT2:MOTRBV", internal=True), - PaddleChamber1z = PVAdjustable("SATES21-XSMA166:MOT3:MOTRBV", internal=True), - SmartActTTx = PVAdjustable("SATES22-XSMA168:MOT10:MOTRBV", internal=True), - SmartActTTy = PVAdjustable("SATES22-XSMA168:MOT11:MOTRBV", internal=True), - SmartActTTz = PVAdjustable("SATES22-XSMA168:MOT12:MOTRBV", internal=True), - ToFV1m = PVAdjustable("SATES21-XSHV166:V-1-S-CH0", internal=True), - ToFV1p = PVAdjustable("SATES21-XSHV166:V-0-S-CH0", internal=True), - ToFV2m = PVAdjustable("SATES21-XSHV166:V-1-S-CH1", internal=True), - ToFV2p = PVAdjustable("SATES21-XSHV166:V-0-S-CH1", internal=True), - ToFV3m = PVAdjustable("SATES21-XSHV166:V-1-S-CH2", internal=True), - ToFV3p = PVAdjustable("SATES21-XSHV166:V-0-S-CH2", internal=True), + +# PaddleChamber1MaskX = PVAdjustable("SATES21-XSMA166:MOT7:MOTRBV", internal=True), +# PaddleChamber1MaskY = PVAdjustable("SATES21-XSMA166:MOT8:MOTRBV", internal=True), +# PaddleChamber1FrameX = PVAdjustable("SATES21-XSMA166:MOT4:MOTRBV", internal=True), +# PaddleChamber1YagY = PVAdjustable("SATES21-XSMA166:MOT6:MOTRBV", internal=True), +# PaddleChamber1z = PVAdjustable("SATES21-XSMA166:MOT3:MOTRBV", internal=True), +# PaddleChamber1YagX = PVAdjustable("SLAAT21-LMOT-M711:MOT.RBV", internal=True), + +# AttenuationLaser = PVAdjustable("SLAAT21-LMOT-M702:MOT.RBV", internal=True), + +# Timedelay = PVAdjustable("SLAAT01-LTIM-PDLY:DELAY", internal=True), + +# SmartActTTx = PVAdjustable("SATES22-XSMA168:MOT10:MOTRBV", internal=True), +# SmartActTTy = PVAdjustable("SATES22-XSMA168:MOT11:MOTRBV", internal=True), +# SmartActTTz = PVAdjustable("SATES22-XSMA168:MOT12:MOTRBV", internal=True), +# ToFV1m = PVAdjustable("SATES21-XSHV166:V-1-S-CH0", internal=True), +# ToFV1p = PVAdjustable("SATES21-XSHV166:V-0-S-CH0", internal=True), +# ToFV2m = PVAdjustable("SATES21-XSHV166:V-1-S-CH1", internal=True), +# ToFV2p = PVAdjustable("SATES21-XSHV166:V-0-S-CH1", internal=True), +# ToFV3m = PVAdjustable("SATES21-XSHV166:V-1-S-CH2", internal=True), +# ToFV3p = PVAdjustable("SATES21-XSHV166:V-0-S-CH2", internal=True), # energy1 = PVAdjustable("SATUN06-UIND030:FELPHOTENE", internal=True), # energy2 = PVAdjustable("SATUN15-UIND030:FELPHOTENE", internal=True), - manip2needleESx = PVAdjustable("SATES20-MANIP2:MOTOR_1.VAL", internal=True), - manip2needleESy = PVAdjustable("SATES20-MANIP2:MOTOR_2.VAL", internal=True), - manip2needleESz = PVAdjustable("SATES20-MANIP2:MOTOR_3.VAL", internal=True), +# manip2needleESy = PVAdjustable("SATES20-MANIP2:MOTOR_2.VAL", internal=True), +# manip3ESy = PVAdjustable("SATES20-MANIP3:MOTOR_2.VAL", internal=True), +# manip7ESy = PVAdjustable("SATES20-MANIP7:MOTOR_1.VAL", internal=True), + # manip2needleESy = PVAdjustable("SATES20-MANIP2:MOTOR_2.VAL", internal=True), +# manip2needleESz = PVAdjustable("SATES20-MANIP2:MOTOR_3.VAL", internal=True), # pol1 = PVEnumAdjustable("SATUN06-UIND030:POL-SET", internal=True), # pol2 = PVEnumAdjustable("SATUN15-UIND030:POL-SET", internal=True), - Manip1_x = PVAdjustable("SATES20-MANIP1:MOTOR_1.RBV", internal = True), - Manip1_y = PVAdjustable("SATES20-MANIP1:MOTOR_2.RBV", internal = True), - Manip1_z = PVAdjustable("SATES20-MANIP1:MOTOR_3.RBV", internal = True), - Manip4_x = PVAdjustable("SATES20-MANIP4:MOTOR_1.RBV", internal = True), - Manip4_y = PVAdjustable("SATES20-MANIP4:MOTOR_3.RBV", internal = True), - pressChamb1 = PVAdjustable("SATES21-VM-VT1010:PRESSURE", internal=True), - pressJF = PVAdjustable("SATES21-VM-VT1020:PRESSURE", internal=True), - pressChamb2 = PVAdjustable("SATES21-VM-VT2020:PRESSURE", internal=True), - pressChamb3 = PVAdjustable("SATES21-VM-VT3010:PRESSURE", internal=True), - pressChamb3GasCell = PVAdjustable("SATES21-VM-VT3030:PRESSURE", internal=True), - pulse_energy = PVAdjustable("SATFE10-PEPG046:PHOTON-ENERGY-PER-PULSE-AVG", internal=True), - timeStamp = PVAdjustable("SF-CPCL-TIM:TIME", internal=True), +# Manip1_x = PVAdjustable("SATES20-MANIP1:MOTOR_1.RBV", internal = True), + # Manip1_y = PVAdjustable("SATES20-MANIP1:MOTOR_2.RBV", internal = True), + # Manip1_z = PVAdjustable("SATES20-MANIP1:MOTOR_3.RBV", internal = True), +# Manip4_x = PVAdjustable("SATES20-MANIP4:MOTOR_1.RBV", internal = True), +# Manip4_y = PVAdjustable("SATES20-MANIP4:MOTOR_3.RBV", internal = True), +# pressChamb1 = PVAdjustable("SATES21-VM-VT1010:PRESSURE", internal=True), +# pressJF = PVAdjustable("SATES21-VM-VT1020:PRESSURE", internal=True), +# pressChamb2 = PVAdjustable("SATES21-VM-VT2020:PRESSURE", internal=True), +# pressChamb3 = PVAdjustable("SATES21-VM-VT3010:PRESSURE", internal=True), +# pressSmallChamber = PVAdjustable("SATES21-VM-VT3030:PRESSURE", internal=True), +# pressChamb3GasCell = PVAdjustable("SATES21-VM-VT3040:PRESSURE", internal=True), +# standaChamber3 = PVAdjustable("SLAAT21-LMOT-M707:MOT.RBV", internal=True), - chicane_current_rb = PVAdjustable("SATUN14-MBND100:I-READ", internal=True), - chicane_current_sv = PVAdjustable("SATUN14-MBND100:I-SET", internal=True), +# LshapeRakX = PVAdjustable("SATES24-XSMA171:MOT4:MOTRBV", internal=True), +# LshapeRakY = PVAdjustable("SATES24-XSMA171:MOT5:MOTRBV", internal=True), +# LshapeRakZ = PVAdjustable("SATES24-XSMA171:MOT6:MOTRBV", internal=True), +# LshapeDoorX = PVAdjustable("SATES24-XSMA171:MOT7:MOTRBV", internal=True), +# LshapeDoorY = PVAdjustable("SATES24-XSMA171:MOT8:MOTRBV", internal=True), +# YagX = PVAdjustable("SATES24-XSMA171:MOT9:MOTRBV", internal=True), +# YagY = PVAdjustable("SATES24-XSMA171:MOT10:MOTRBV", internal=True), + timeStamp = PVAdjustable("SF-CPCL-TIM:TIME", internal=True), + photonEnergy = PVAdjustable("SATUN:FELPHOTENE", internal=True), + pulse_energy = PVAdjustable("SATFE10-PEPG046:PHOTON-ENERGY-PER-PULSE-AVG", internal=True), + +# pressure_sample = PVAdjustable("SATES21-VM-VT2020:PRESSURE", internal=True), +# pressure_hemi = PVAdjustable("SATES21-VM-VT2010:PRESSURE", internal=True), +# Manip2_y = PVAdjustable("SATES20-MANIP2:MOTOR_2.RBV", internal=True), +# PressureGasAtt= PVAdjustable("ATFE10-VMCP054-A050:PRESSURE", internal=True), +# VoltsSetGasAtt= PVAdjustable("SATFE10-VVRE054-A010:SET_VAL-UI", internal=True), + +# chicane_current_rb = PVAdjustable("SATUN14-MBND100:I-READ", internal=True), +# chicane_current_sv = PVAdjustable("SATUN14-MBND100:I-SET", internal=True), + + pulse_energy_attgas = PVStringAdjustable("SATFE10-OGAT053:pulseenergy", internal=True), + transmission_attgas = PVStringAdjustable("SATFE10-OGAT053:transmission", internal=True), att64 = PVStringAdjustable("SATFE10-OATT064:MOT2TRANS.VALD", internal=True), att65 = PVStringAdjustable("SATFE10-OATT065:MOT2TRANS.VALD", internal=True), - ToFMCPRupp = PVAdjustable("SATES21-XSHV166:V-2-S-CH3", internal=True), - ToFrepelerRupp = PVAdjustable("SATES21-XSHV166:V-3-S-CH3", internal=True), - trigger14Delay = PVAdjustable("SATES20-CVME-EVR0:Pul14-Delay-RB", internal=True), - pressSkimmer = PVAdjustable("SATES21-VM-VT1030:PRESSURE", internal=True), - photonEnergy = PVAdjustable("SATUN:FELPHOTENE", internal=True), - SourceTemp = PVAdjustable("SLAAT21-LENG-LAKE1:GET_TEMP", internal=True), - skimmerRuppUpstream = PVAdjustable("SATES22-XSMA168:MOT1:MOTRBV", internal=True), - skimmerRuppDownstream = PVAdjustable("SATES22-XSMA168:MOT2:MOTRBV", internal=True), - pressattn40 = PVAdjustable("SATFE10-VMFR054-A050:PRESSURE", internal=True), +# TOF_ext_neg = PVAdjustable("SATES21-XSHV166:V-0-S-CH13", internal=True), +# TOF_Behlke_lessneg = PVAdjustable("SATES21-XSHV166:V-0-S-CH14", internal=True), +# TOF_MCP_front = PVAdjustable("SATES21-XSHV166:V-0-S-CH15", internal=True), +# TOF_ext_pos = PVAdjustable("SATES21-XSHV166:V-1-S-CH13", internal=True), +# TOF_rep_pos = PVAdjustable("SATES21-XSHV166:V-1-S-CH14", internal=True), +# TOF_unused = PVAdjustable("SATES21-XSHV166:V-1-S-CH15", internal=True), + +# ToFMCPRupp = PVAdjustable("SATES21-XSHV166:V-2-S-CH3", internal=True), +# ToFrepelerRupp = PVAdjustable("SATES21-XSHV166:V-3-S-CH3", internal=True), +# trigger14Delay = PVAdjustable("SATES20-CVME-EVR0:Pul14-Delay-RB", internal=True), +# pressSkimmer = PVAdjustable("SATES21-VM-VT1030:PRESSURE", internal=True), + +# SourceTemp = PVAdjustable("SLAAT21-LENG-LAKE1:GET_TEMP", internal=True), +# skimmerRuppUpstream = PVAdjustable("SATES22-XSMA168:MOT1:MOTRBV", internal=True), +# skimmerRuppDownstream = PVAdjustable("SATES22-XSMA168:MOT2:MOTRBV", internal=True), +# pressattn40 = PVAdjustable("SATFE10-VMFR054-A050:PRESSURE", internal=True), + +# inc_mirror_tip = PVAdjustable("SATES20-XSMA165:MOT16:MOTRBV", internal=True),### +# +# inc_mirror_tip = PVAdjustable("SATES20-XSMA165:MOT16:MOTRBV", internal=True), +# inc_mirror_tilt = PVAdjustable("SATES20-XSMA165:MOT17:MOTRBV", internal=True), +# mic_linear = PVAdjustable("SATES21-XSMA166:MOT2:MOTRBV", internal=True), +# mic_paddle_y = PVAdjustable("SATES21-XSMA166:MOT4:MOTRBV", internal=True), +# mic_paddle_x = PVAdjustable("SATES21-XSMA166:MOT5:MOTRBV", internal=True), +# mic_paddle_z = PVAdjustable("SATES21-XSMA166:MOT6:MOTRBV", internal=True), +# zigzag_y = PVAdjustable("SATES21-XSMA166:MOT7:MOTRBV", internal=True), +# zigzag_x = PVAdjustable("SATES21-XSMA166:MOT8:MOTRBV", internal=True), +# zigzag_z = PVAdjustable("SATES21-XSMA166:MOT9:MOTRBV", internal=True), +# slit_downstream_top = PVAdjustable("SATES21-XSMA166:MOT10:MOTRBV", internal=True), +# slit_downstream_x = PVAdjustable("SATES21-XSMA166:MOT11:MOTRBV", internal=True), +# slit_downstream_bottom = PVAdjustable("SATES21-XSMA166:MOT12:MOTRBV", internal=True), +# slit_front_xneg = PVAdjustable("SATES21-XSMA166:MOT13:MOTRBV", internal=True), +# slit_front_xpos = PVAdjustable("SATES21-XSMA166:MOT14:MOTRBV", internal=True), + +# Holography beamtime + sample_stage_x = PVAdjustable("SATES23-XSMA169:MOT7:MOTRBV", internal=True), + sample_stage_y = PVAdjustable("SATES23-XSMA169:MOT8:MOTRBV", internal=True), + sample_stage_z = PVAdjustable("SATES23-XSMA169:MOT9:MOTRBV", internal=True), + diode_x = PVAdjustable("SATES23-XSMA169:MOT10:MOTRBV", internal=True), + diode_y = PVAdjustable("SATES23-XSMA169:MOT11:MOTRBV", internal=True), + diode_z = PVAdjustable("SATES23-XSMA169:MOT12:MOTRBV", internal=True), + beam_block = PVAdjustable("SATES23-XSMA169:MOT6:MOTRBV", internal=True), + pressChamb3 = PVAdjustable("SATES21-VM-VT3010:PRESSURE", internal=True), + pressChamb3bis = PVAdjustable("SATES21-VM-VT3012:PRESSURE", internal=True), **undulator_info ) +overview = SimpleDevice("Maloja Overview", **overview_info) + + + spreadsheet_line = [ - "timeStamp", "run name", "File name", "comments", "static/scan", "start", "stop", "step size", "shots", "Liquid flow", "Gas flow", "Sample", - "ppressChamb3", + "FEL", "UV", + "timeStamp", "fileName", "Comments", +# "timeStamp", "name", "Comments", # "pressJF", # "pressattn40", # "SourceTemp", # "skimmerRuppUpstream", # "skimmerRuppDownstream", -# "Manip1_x", -# "Manip1_y", -# "Manip1_z", -# "Manip4_x", -# "Manip4_y", "type", "mobility density", "particle size", "flow rate", "n2", "co2", "voltage", "current", "upper skim","gap up", "lower skim", "gap low", + "Manip1_x", + "Manip1_y", + "Manip1_z", + "Manip4_x", + "Manip4_y", "type", "core size AAC", "core size measured", "core size estimated", "coating thickness AAC", "coating thickness expected", "uppernozzleskimmer", "lowernozzleskimmer", "entrancepressure", # "trigger14Delay", -# "ToFMCPRupp", -# "ToFrepelerRupp", - -# "pressSkimmer", -# "Gas cell / TOF", -# "standa","Sample", -# "pressChamb3", -# "pressChamb3GasCell", "Static/scan", "Scan parameter", "ScanStep", "shots", "Comments", "Two colors (Y/N)", "energy1", +# "Gas cell / TOF","Sample","shots", "Two colors (Y/N)", "energy1", # "polarisation10", "energy2", # "polarisation19", "photonEnergy", "pulse_energy", + "pulse_energy_attgas", + "transmission_attgas", "FELrepRate", - "att64", - "att65", -# "pressChamb2", "Gas", -# "manip2needleESx", + "AttenuationLaser", + "Timedelay", +# "VoltsSetGasAtt", +# "PressureGasAtt", + "pressChamb1", + "pressJF", "anotherpressure", "andanotherpressure","anotherpressure2", "andanotherpressure2", +# "PaddleChamber1MaskX", +# "PaddleChamber1MaskY", +# "PaddleChamber1FrameX", +# "PaddleChamber1YagX", +# "PaddleChamber1YagY", +# "pressChamb2", "Gas", "Slit", "Ek", "Ep", "mode", # "manip2needleESy", -# "manip2needleESz", +# "manip7ESy", +# "pressChamb3", +# "pressChamb3GasCell", # "ToFV1p", # "ToFV2p", # "ToFV3p", # "ToFV1m", # "ToFV2m", # "ToFV3m", -# "PaddleChamber1x", -# "PaddleChamber1y", -# "PaddleChamber1z", +# "pressSmallChamber", +# "LshapeRakX", +# "LshapeRakY", +# "LshapeRakZ", +# "LshapeDoorX", +# "LshapeDoorY", +# "YagX", +# "YagY", "PhotonSpec Det", "PhotonSpec X", "PhotonSpec Y", "PhotonSpec order", "PhotonSpec slit", +# "manip3ESy", +# "chicane_current_rb", +# "chicane_current_sv", + + + "TOF_ext_neg", + "TOF_Behlke_lessneg", + "TOF_MCP_front", + "TOF_ext_pos", + "TOF_rep_pos", + "TOF_unused", + + + "att64", + "att65", + + "inc_mirror_tip", + "inc_mirror_tilt", + "standaChamber3", + "mic_linear", + "mic_paddle_y", + "mic_paddle_x", + "mic_paddle_z", + "zigzag_y", + "zigzag_x", + "zigzag_z", + "slit_downstream_top", + "slit_downstream_x", + "slit_downstream_bottom", + "slit_front_xneg", + "slit_front_xpos", + "energy6", "energy7", "energy8", @@ -140,9 +252,14 @@ spreadsheet_line = [ "energy20", "energy21", "energy22", + + ] +spreadsheet_info = {n: v for n, v in overview_info.items() if n in spreadsheet_line} + + @as_shortcut def print_overview(): @@ -155,6 +272,7 @@ def print_line_for_spreadsheet(): if i in ov: return str(ov[i].get()) return "" + res = [get(i) for i in spreadsheet_line] res = ",".join(res) print(res)