diff --git a/spreadsheet.py b/spreadsheet.py index bc87e02..3ac4aed 100644 --- a/spreadsheet.py +++ b/spreadsheet.py @@ -47,6 +47,13 @@ overview = SimpleDevice("Maloja Overview", 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), @@ -59,54 +66,77 @@ overview = SimpleDevice("Maloja Overview", 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), + **undulator_info ) spreadsheet_line = [ - "timeStamp", "File name", - "Gas cell / TOF", - "standa","Sample", - "pressChamb3", - "pressChamb3GasCell", "Static/scan", "Scan parameter", "ScanStep", "shots", "Comments", "Two colors (Y/N)", "energy1", - "polarisation10", "energy2", - "polarisation19", - "pulse_energy", - "chicane_current_rb", - "FELrepRate", - "att64", - "att65", "Grating", "order", "Slit", "Detector position X", "Detector position Y", "Detector position (angle)","Ek", "Ep", "Slit", "Mode", - "pressChamb2", "Gas", - "manip2needleESx", - "manip2needleESy", - "manip2needleESz", - "ToFV1p", - "ToFV2p", - "ToFV3p", - "ToFV1m", - "ToFV2m", - "ToFV3m", - "PaddleChamber1x", - "PaddleChamber1y", - "PaddleChamber1z", - "energy6", - "energy7", - "energy8", - "energy9", - "energy10", - "energy11", - "energy12", - "energy13", - "energy14", - "energy15", - "energy16", - "energy17", - "energy18", - "energy19", - "energy20", - "energy21", - "energy22", + "timeStamp", "File name", "run name", "comments", "static/scan", "start", "stop", "step size", "shots", "steps", "GasMixture", "concentration", "backing pressure", + "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", + "trigger14Delay", + "ToFMCPRupp", + "ToFrepelerRupp", + "pressChamb1", + "pressJF", + "pressSkimmer", +# "Gas cell / TOF", +# "standa","Sample", +# "pressChamb3", +# "pressChamb3GasCell", "Static/scan", "Scan parameter", "ScanStep", "shots", "Comments", "Two colors (Y/N)", "energy1", +# "polarisation10", "energy2", +# "polarisation19", + "photonEnergy", + "pulse_energy", + "FELrepRate", + "att64", + "att65", +# "pressChamb2", "Gas", +# "manip2needleESx", +# "manip2needleESy", +# "manip2needleESz", +# "ToFV1p", +# "ToFV2p", +# "ToFV3p", +# "ToFV1m", +# "ToFV2m", +# "ToFV3m", +# "PaddleChamber1x", +# "PaddleChamber1y", +# "PaddleChamber1z", + "energy6", + "energy7", + "energy8", + "energy9", + "energy10", + "energy11", + "energy12", + "energy13", + "energy14", + "energy15", + "energy16", + "energy17", + "energy18", + "energy19", + "energy20", + "energy21", + "energy22", ]