From acd4b4342dae3273436c2be4b80de6050b0f5f93 Mon Sep 17 00:00:00 2001
From: Sven Augustin <sven.augustin@psi.ch>
Date: Thu, 2 Dec 2021 14:13:10 +0100
Subject: [PATCH] cleaned up spreadsheet line a bit

---
 maloja.py | 100 +++++++++++++++++++++++++++++-------------------------
 1 file changed, 53 insertions(+), 47 deletions(-)

diff --git a/maloja.py b/maloja.py
index a836a44..e86cdb9 100644
--- a/maloja.py
+++ b/maloja.py
@@ -142,70 +142,76 @@ overview = SimpleDevice("Maloja Overview",
     pulse_energy       = PVAdjustable("SATFE10-PEPG046:PHOTON-ENERGY-PER-PULSE-AVG", internal=True),
     timeStamp          = PVAdjustable("SF-CPCL-TIM:TIME", internal=True),
 
-    chicane_current    = PVAdjustable("SATUN14-MBND100:I-READ", internal=True),
-    chicane_set_current    = PVAdjustable("SATUN14-MBND100:I-SET", internal=True),
+    chicane_current_rb = PVAdjustable("SATUN14-MBND100:I-READ", internal=True),
+    chicane_current_sv = PVAdjustable("SATUN14-MBND100:I-SET", internal=True),
+
     att64              = PVStringAdjustable("SATFE10-OATT064:MOT2TRANS.VALD", internal=True),
     att65              = PVStringAdjustable("SATFE10-OATT065:MOT2TRANS.VALD", 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", 
+]
+
+
+
+
 @as_shortcut
 def print_overview():
     print(overview)
 
 @as_shortcut
 def print_line_for_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", 
-        "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",
-            ]
     ov = overview.__dict__
     def get(i):
         if i in ov:
             return str(ov[i].get())
         return ""
-    res = [get(i) for i in line]
+    res = [get(i) for i in spreadsheet_line]
     res = ",".join(res)
     print(res)