after beamtime May 2024

channels/bs_channels.py

@@ -22,16 +22,28 @@ detectors = [
 #     downsample = tuple,
 #     factor = Number,
 #     geometry = bool,
-#     remove_raw_files = bool,
-#     roi = dict, #TODO: check on contents of the dict?
+#     remove_raw_files = bool, 
+#     roi = dict, # TODO: test with these definitions: {'beam': [1775, 1875, 1070, 1170]} achtung: doesnt work with geometry = True
 #     save_dap_results = bool
 # )
 
-detectors_with_config = DetectorConfig(detectors)
+detectors = DetectorConfig(detectors)
 # detectors_with_config["JF16T03V01"]['save_dap_results'] = True
 # detectors_with_config["JF16T03V01"]['remove_raw_files'] = True
 # detectors_with_config["JF16T03V01"]['disabled_modules'] = [0, 1] # bottom module:0, middle module:1, top module:2
 
+detectors["JF17T16V01"]['disabled_modules'] = [0, 1, 2, 3, 
+                                                9, 10, 11,
+                                                12, 13, 14, 15] # bottom module:0, middle module:1, top module:2
+
+
+detectors["JF17T16V01"]['remove_raw_files'] = True # We switched off quite a few modules, let's not keep all the raw data.
+detectors["JF17T16V01"]['compression'] = True 
+detectors["JF17T16V01"]['adc_to_energy'] = True # We switched off quite a few modules, let's not keep all the raw data.
+detectors["JF17T16V01"]['factor'] = 0.2 # Some useful compromise to save space.
+detectors["JF17T16V01"]['save_dap_results'] = False
+detectors["JF17T16V01"]['geometry'] = False
+
 
 detectors_MX = DetectorConfig()
 detectors_MX.add("JF17T16V01", adc_to_energy=True, compression=True, crystfel_lists_laser=True, double_pixels_action="mask", factor=12.08, remove_raw_files=True, save_dap_results=True, geometry=False)
@@ -166,7 +178,7 @@ channels_PSSS059 = [
     "SARFE10-PSSS059:SPECTRUM_Y_SUM",
     "SARFE10-PSSS059:SPECTRUM_X",
     "SARFE10-PSSS059:SPECTRUM_Y",
-    "SARFE10-PSSS059:FPICTURE",
+    # "SARFE10-PSSS059:FPICTURE",
     "SARFE10-PSSS059:processing_parameters",
 ]
 

cristallina.py

@@ -68,7 +68,7 @@ from slic.devices.timing.events import CTASequencer
 
 from channels.bs_channels import (
     detectors,
-    detectors_with_config,
+    detectors,
     detectors_MX,
     bs_channels,
     camera_channels,

devices/dilsc.py

@@ -54,12 +54,35 @@ class Thermometer(Adjustable):
     @_check_connection
     def set_target_value(self, value):
         self.dilsc.setParameter(f'{self.name}', 'target', value)
+
+    @_check_connection
+    def get_target_value(self):
+        cacheitem = self.dilsc.getParameter(f'{self.name}', 'target', trycache=False)
+        return cacheitem.value
+
             
     @_check_connection
     def is_moving(self):
         response = self.dilsc.getParameter(f'{self.name}','status', trycache=False)
         return response[0][0] > StatusType.PREPARED
-
+    
+    @_check_connection
+    def get_PID_parameters(self):
+        """ Returns the current PID parameters associated with the control loop for 
+            this thermometer.
+        """
+        response = self.dilsc.getParameter(f'{self.name}','ctrlpars', trycache=False)
+        return response
+    
+    @_check_connection
+    def set_PID_parameters(self, p, i, d):
+        """ Sets the PID parameters for the associated control loop. 
+            TODO:
+            - This still returns a timeout error but sets the correct values.
+            - The range is limited to less than the Lakeshore range allows, this needs
+              to be fixed in frappy.
+        """
+        self.dilsc.setParameter(f'{self.name}', 'ctrlpars', {'p': p, 'i': i, 'd': d})
 
 
 class MagnetCoil(Adjustable):