cleaned up spreadsheet line a bit

This commit is contained in:
2021-12-02 14:13:10 +01:00
parent bbbcf33dd4
commit acd4b4342d

View File

@ -142,21 +142,17 @@ overview = SimpleDevice("Maloja Overview",
pulse_energy = PVAdjustable("SATFE10-PEPG046:PHOTON-ENERGY-PER-PULSE-AVG", internal=True), pulse_energy = PVAdjustable("SATFE10-PEPG046:PHOTON-ENERGY-PER-PULSE-AVG", internal=True),
timeStamp = PVAdjustable("SF-CPCL-TIM:TIME", internal=True), timeStamp = PVAdjustable("SF-CPCL-TIM:TIME", internal=True),
chicane_current = PVAdjustable("SATUN14-MBND100:I-READ", internal=True), chicane_current_rb = PVAdjustable("SATUN14-MBND100:I-READ", internal=True),
chicane_set_current = PVAdjustable("SATUN14-MBND100:I-SET", internal=True), chicane_current_sv = PVAdjustable("SATUN14-MBND100:I-SET", internal=True),
att64 = PVStringAdjustable("SATFE10-OATT064:MOT2TRANS.VALD", internal=True), att64 = PVStringAdjustable("SATFE10-OATT064:MOT2TRANS.VALD", internal=True),
att65 = PVStringAdjustable("SATFE10-OATT065:MOT2TRANS.VALD", internal=True), att65 = PVStringAdjustable("SATFE10-OATT065:MOT2TRANS.VALD", internal=True),
**undulator_info **undulator_info
) )
@as_shortcut
def print_overview():
print(overview)
@as_shortcut spreadsheet_line = [
def print_line_for_spreadsheet():
line = [
"timeStamp", "File name", "timeStamp", "File name",
"Gas cell / TOF", "Gas cell / TOF",
"standa","Sample", "standa","Sample",
@ -165,7 +161,7 @@ def print_line_for_spreadsheet():
"polarisation10", "energy2", "polarisation10", "energy2",
"polarisation19", "polarisation19",
"pulse_energy", "pulse_energy",
"chicane_current", "chicane_current_rb",
"FELrepRate", "FELrepRate",
"att64", "att64",
"att65", "Grating", "order", "Slit", "Detector position X", "Detector position Y", "Detector position (angle)","Ek", "Ep", "Slit", "Mode", "att65", "Grating", "order", "Slit", "Detector position X", "Detector position Y", "Detector position (angle)","Ek", "Ep", "Slit", "Mode",
@ -199,13 +195,23 @@ def print_line_for_spreadsheet():
"energy20", "energy20",
"energy21", "energy21",
"energy22", "energy22",
] ]
@as_shortcut
def print_overview():
print(overview)
@as_shortcut
def print_line_for_spreadsheet():
ov = overview.__dict__ ov = overview.__dict__
def get(i): def get(i):
if i in ov: if i in ov:
return str(ov[i].get()) return str(ov[i].get())
return "" return ""
res = [get(i) for i in line] res = [get(i) for i in spreadsheet_line]
res = ",".join(res) res = ",".join(res)
print(res) print(res)