Code indexing in gitaly is broken and leads to code not being visible to the user. We work on the issue with highest priority.

Skip to content
Snippets Groups Projects
Commit 90e33ba5 authored by augustin_s's avatar augustin_s :snake:
Browse files

updated channels; slightly simpler logic

parent 1cc634f8
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 39 additions and 144 deletions
spreadsheet.py
+ 39
− 144
View file @ 90e33ba5
......@@ -20,7 +20,7 @@ for i in n_unds:
undulator_info[f"polarisation{i}"] = PVEnumAdjustable(f"SATUN{i:02}-UIND030:POL-SET", internal=True)
overview_info = dict(
spreadsheet_info = dict(
# standa = standa,
# exp_delay = exp_delay,
# laser_delay = laser_delay,
......@@ -37,7 +37,7 @@ overview_info = dict(
# AttenuationLaser = PVAdjustable("SLAAT21-LMOT-M702:MOT.RBV", internal=True),
# Timedelay = PVAdjustable("SLAAT01-LTIM-PDLY:DELAY", 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),
......@@ -57,13 +57,13 @@ overview_info = dict(
# 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_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),
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),
......@@ -78,6 +78,7 @@ overview_info = dict(
# YagX = PVAdjustable("SATES24-XSMA171:MOT9:MOTRBV", internal=True),
# YagY = PVAdjustable("SATES24-XSMA171:MOT10:MOTRBV", internal=True),
timeStamp = PVAdjustable("SF-CPCL-TIM:TIME", internal=True),
# empty="", # just an example!
photonEnergy = PVAdjustable("SATUN:FELPHOTENE", internal=True),
pulse_energy = PVAdjustable("SATFE10-PEPG046:PHOTON-ENERGY-PER-PULSE-AVG", internal=True),
......@@ -90,12 +91,6 @@ overview_info = dict(
# 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),
# 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),
......@@ -117,147 +112,47 @@ overview_info = dict(
#
# 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),
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),
pulse_energy_attgas = PVStringAdjustable("SATFE10-OGAT053:pulseenergy", internal=True),
transmission_attgas = PVStringAdjustable("SATFE10-OGAT053:transmission", internal=True),
**undulator_info
)
att64 = PVStringAdjustable("SATFE10-OATT064:MOT2TRANS.VALD", internal=True),
att65 = PVStringAdjustable("SATFE10-OATT065:MOT2TRANS.VALD", internal=True),
# LaserIn = PVAdjustable("SLAAT21-LDIO-LAS6291:SET_BO01.DESC", internal=True),
overview = SimpleDevice("Maloja Overview", **overview_info)
spreadsheet_line = [
"FEL", "UV",
"timeStamp", "fileName", "Comments",
# "timeStamp", "name", "Comments",
# "pressJF",
# "pressattn40",
# "SourceTemp",
# "skimmerRuppUpstream",
# "skimmerRuppDownstream",
"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",
# "Gas cell / TOF","Sample","shots", "Two colors (Y/N)", "energy1",
# "polarisation10", "energy2",
# "polarisation19",
"photonEnergy",
"pulse_energy",
"pulse_energy_attgas",
"transmission_attgas",
"FELrepRate",
"AttenuationLaser",
"Timedelay",
# "VoltsSetGasAtt",
# "PressureGasAtt",
"pressChamb1",
"pressJF", "anotherpressure", "andanotherpressure","anotherpressure2", "andanotherpressure2",
# "PaddleChamber1MaskX",
# "PaddleChamber1MaskY",
# "PaddleChamber1FrameX",
# "PaddleChamber1YagX",
# "PaddleChamber1YagY",
# "pressChamb2", "Gas", "Slit", "Ek", "Ep", "mode",
# "manip2needleESy",
# "manip7ESy",
# "pressChamb3",
# "pressChamb3GasCell",
# "ToFV1p",
# "ToFV2p",
# "ToFV3p",
# "ToFV1m",
# "ToFV2m",
# "ToFV3m",
# "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",
"energy9",
"energy10",
"energy11",
"energy12",
"energy13",
"energy14",
"energy15",
"energy16",
"energy17",
"energy18",
"energy19",
"energy20",
"energy21",
"energy22",
# 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
)
]
spreadsheet_info = {n: v for n, v in overview_info.items() if n in spreadsheet_line}
overview = SimpleDevice("Maloja Overview", **spreadsheet_info)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment