start of beamtime p21741

cristallina.py

@@ -175,6 +175,10 @@ from devices.diffractometer import Diffractometer
 diffractometer = Diffractometer("diffractometer")
 
 
+from devices.dilsc import Dilution
+dilution = Dilution()
+
+
 ################# Stand setup ##################
 
 # TODO: requires the stand client, need small howto how to start and configure or let it run all the time
@@ -193,10 +197,15 @@ spreadsheet = Spreadsheet(
         "TRXBASE": diffractometer.trx_base,
         "TRYBASE": diffractometer.try_base,
         "THETA": diffractometer.theta,
-        "TWOTHETA": diffractometer.twotheta,
+        "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"),
+    placeholders=("comment", "sample", "run_usable"),
     host="saresc-vcons-02.psi.ch",
     port=9090,
 )
@@ -231,7 +240,7 @@ instrument = "cristallina"
 # pgroup = "p21238"  # Cristallina photon diagnostics p-group with Chris
 # pgroup = "p21224"  # SwissMX commisioning 7
 
-pgroup = "p19150"  # Scratch
+# pgroup = "p19150"  # Scratch
 # pgroup = "p19152"  # Scratch
 
 # pgroup = "p20840"  # Cr beamline commisioning (Jan-Feb 2023)
@@ -243,7 +252,11 @@ pgroup = "p19150"  # Scratch
 
 # pgroup = "p21569"   #  Dil-Sc / diffractometer / tilted bunch / LiErF4 (/ TmVO4), November 17-
 # pgroup = "p21592"   # HVE commissioning
-pgroup = "p21640" # Dil-Sc / diffractometer / LiErF4 : 4 March 2024 
+# pgroup = "p21640" # Dil-Sc / diffractometer / LiErF4 : 4 March 2024 
+
+# pgroup = "p21920"  # Beamline commissioning 2024
+
+pgroup = "p21741"    # CrQ - DilSc - SAXS LiHoF4
 
 # setup pgroup specific logger
 setup_logging_pgroup(pgroup)
@@ -255,6 +268,7 @@ daq = SFAcquisition(
     default_pvs=pvs,
     default_detectors=detectors,
     rate_multiplicator=1,
+    spreadsheet=spreadsheet,
 )