current state

This commit is contained in:
2022-05-17 09:51:25 +02:00
parent 452b0f89c3
commit 065d48b4b3

View File

@ -47,6 +47,13 @@ overview = SimpleDevice("Maloja Overview",
manip2needleESz = PVAdjustable("SATES20-MANIP2:MOTOR_3.VAL", internal=True), manip2needleESz = PVAdjustable("SATES20-MANIP2:MOTOR_3.VAL", internal=True),
# pol1 = PVEnumAdjustable("SATUN06-UIND030:POL-SET", internal=True), # pol1 = PVEnumAdjustable("SATUN06-UIND030:POL-SET", internal=True),
# pol2 = PVEnumAdjustable("SATUN15-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), pressChamb2 = PVAdjustable("SATES21-VM-VT2020:PRESSURE", internal=True),
pressChamb3 = PVAdjustable("SATES21-VM-VT3010:PRESSURE", internal=True), pressChamb3 = PVAdjustable("SATES21-VM-VT3010:PRESSURE", internal=True),
pressChamb3GasCell = PVAdjustable("SATES21-VM-VT3030:PRESSURE", internal=True), pressChamb3GasCell = PVAdjustable("SATES21-VM-VT3030:PRESSURE", internal=True),
@ -59,54 +66,77 @@ overview = SimpleDevice("Maloja Overview",
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),
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),
**undulator_info **undulator_info
) )
spreadsheet_line = [ spreadsheet_line = [
"timeStamp", "File name", "timeStamp", "File name", "run name", "comments", "static/scan", "start", "stop", "step size", "shots", "steps", "GasMixture", "concentration", "backing pressure",
"Gas cell / TOF", "SourceTemp",
"standa","Sample", "skimmerRuppUpstream",
"pressChamb3", "skimmerRuppDownstream",
"pressChamb3GasCell", "Static/scan", "Scan parameter", "ScanStep", "shots", "Comments", "Two colors (Y/N)", "energy1", # "Manip1_x",
"polarisation10", "energy2", # "Manip1_y",
"polarisation19", # "Manip1_z",
"pulse_energy", # "Manip4_x",
"chicane_current_rb", # "Manip4_y", "type", "mobility density", "particle size", "flow rate", "n2", "co2", "voltage", "current", "upper skim","gap up", "lower skim", "gap low",
"FELrepRate", "trigger14Delay",
"att64", "ToFMCPRupp",
"att65", "Grating", "order", "Slit", "Detector position X", "Detector position Y", "Detector position (angle)","Ek", "Ep", "Slit", "Mode", "ToFrepelerRupp",
"pressChamb2", "Gas", "pressChamb1",
"manip2needleESx", "pressJF",
"manip2needleESy", "pressSkimmer",
"manip2needleESz", # "Gas cell / TOF",
"ToFV1p", # "standa","Sample",
"ToFV2p", # "pressChamb3",
"ToFV3p", # "pressChamb3GasCell", "Static/scan", "Scan parameter", "ScanStep", "shots", "Comments", "Two colors (Y/N)", "energy1",
"ToFV1m", # "polarisation10", "energy2",
"ToFV2m", # "polarisation19",
"ToFV3m", "photonEnergy",
"PaddleChamber1x", "pulse_energy",
"PaddleChamber1y", "FELrepRate",
"PaddleChamber1z", "att64",
"energy6", "att65",
"energy7", # "pressChamb2", "Gas",
"energy8", # "manip2needleESx",
"energy9", # "manip2needleESy",
"energy10", # "manip2needleESz",
"energy11", # "ToFV1p",
"energy12", # "ToFV2p",
"energy13", # "ToFV3p",
"energy14", # "ToFV1m",
"energy15", # "ToFV2m",
"energy16", # "ToFV3m",
"energy17", # "PaddleChamber1x",
"energy18", # "PaddleChamber1y",
"energy19", # "PaddleChamber1z",
"energy20", "energy6",
"energy21", "energy7",
"energy22", "energy8",
"energy9",
"energy10",
"energy11",
"energy12",
"energy13",
"energy14",
"energy15",
"energy16",
"energy17",
"energy18",
"energy19",
"energy20",
"energy21",
"energy22",
] ]