From 96802c13d391fdd45439d3de2082f18ef5b32d84 Mon Sep 17 00:00:00 2001
From: Alexander Steppke <alexander.steppke@psi.ch>
Date: Mon, 27 May 2024 16:21:58 +0200
Subject: [PATCH] re-enabled spreadsheet

---
 cristallina.py | 56 +++++++++++++++++++++++++-------------------------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/cristallina.py b/cristallina.py
index cbcc6e0..6db21c8 100644
--- a/cristallina.py
+++ b/cristallina.py
@@ -147,43 +147,43 @@ dilution = Dilution()
 ################# Stand setup ##################
 
 # TODO: requires the stand client, need small howto how to start and configure or let it run all the time
-#from slic.core.acquisition.spreadsheet import Spreadsheet
+from slic.core.acquisition.spreadsheet import Spreadsheet
 
 # setup spreadsheet for transmission to stand
-#spreadsheet = Spreadsheet(
-#    {
-#        "Transmission" : attenuator.trans1st,
-#        "Upstream Transmission": upstream_attenuator.trans1st,
-#        "Energy_setpoint" : undulators,
-#        "Energy_offset": undulator.energy_offset,
-#        "TD": diffractometer.td,
-#        "TRX": diffractometer.tr_x,
-#        "TRY": diffractometer.tr_y,
-#        "TRXBASE": diffractometer.trx_base,
-#        "TRYBASE": diffractometer.try_base,
-#        "THETA": diffractometer.theta,
-#        "TWOTHETA": diffractometer.twotheta,      
-#        "Magnet_X": dilution.x,
-#        "Magnet_Y": dilution.y,
-#        "Magnet_Z": dilution.z,
-#        "DilSc_T_plato": dilution.T_plato,
-#        "DilSc_T_pucksensor": dilution.T_pucksensor,
-#    },
-#    
-#    placeholders=("comment", "sample", "run_usable"),
-#    host="saresc-vcons-02.psi.ch",
-#    port=9090,
-#)
+spreadsheet = Spreadsheet(
+   {
+       "Transmission" : attenuator.trans1st,
+       "Upstream Transmission": upstream_attenuator.trans1st,
+       "Energy_setpoint" : undulators,
+       "Energy_offset": undulator.energy_offset,
+       "TD": diffractometer.td,
+       "TRX": diffractometer.tr_x,
+       "TRY": diffractometer.tr_y,
+       "TRXBASE": diffractometer.trx_base,
+       "TRYBASE": diffractometer.try_base,
+       "THETA": diffractometer.theta,
+       "TWOTHETA": diffractometer.twotheta,      
+       "Magnet_X": dilution.x,
+       "Magnet_Y": dilution.y,
+       "Magnet_Z": dilution.z,
+       "DilSc_T_plato": dilution.T_plato,
+       "DilSc_T_pucksensor": dilution.T_pucksensor,
+   },
+   
+   placeholders=("comment", "sample", "run_usable"),
+   host="saresc-vcons-02.psi.ch",
+   port=9090,
+)
 
 try:
-    from stand.stand_client import Client
+    from stand.client import Client
 
     stand_host = "saresc-vcons-02.psi.ch"
     stand_client = Client(host=stand_host, port=9090)
     response = stand_client.get()
     logger.info("Connected to stand server")
 except Exception as error:
-    # catching with a broad net because different connection errors can occur.
+    # catching excpetions with a broad net because different connection errors can occur.
     logger.warning(f"Cannot connect to stand server on {stand_host}. Disabling spreadsheet.")
     spreadsheet = None 
 
@@ -205,7 +205,7 @@ daq = SFAcquisition(
     default_pvs=pvs,
     default_detectors=detectors,
     rate_multiplicator=1,
-    spreadsheet=None,
+    spreadsheet=spreadsheet,
 )