New method upsert_xray_centring_result + tests

ispyb/sp/mxacquisition.py

@@ -68,6 +68,17 @@ def __init__(self):
   _fluo_mapping_roi_params =\
     StrictOrderedDict([('id',None), ('start_energy',None), ('end_energy',None), ('element',None), ('edge',None), ('r',None), ('g',None), ('b',None)])
 
+  _xray_centring_params =\
+   StrictOrderedDict([('id',None), ('grid_info_id',None), ('method',None), ('status',None), ('x',None), ('y',None)])
+
+  @classmethod
+  def get_xray_centring_result_params(cls):
+      return copy.deepcopy(cls._xray_centring_params)
+
+  def upsert_xray_centring_result(self, values):
+    '''Insert or update the xray centring result associated with a grid info'''
+    return self.get_connection().call_sp_write('upsert_xray_centring_result', values)
+
   @classmethod
   def get_dc_position_params(cls):
     return copy.deepcopy(cls._dc_position_params)

tests/test_mxacquisition.py

@@ -92,6 +92,20 @@ def test_mxacquisition_methods(testconfig):
         assert gridinfo['steps_x'] == params['steps_x']
         assert gridinfo['steps_y'] == params['steps_y']
 
+        params = mxacquisition.get_xray_centring_result_params()
+        params['grid_info_id'] = dcg_grid_id
+        params['method'] = 'diffraction'
+        params['status'] = 'pending'
+        xray_cr_id = mxacquisition.upsert_xray_centring_result(list(params.values()))
+        assert xray_cr_id and xray_cr_id > 0
+
+        params = mxacquisition.get_xray_centring_result_params()
+        params['id'] = xray_cr_id
+        params['status'] = 'success'
+        params['x'] = 19.7
+        params['y'] = 22.4
+        mxacquisition.upsert_xray_centring_result(list(params.values()))
+
         params = mxacquisition.get_dc_position_params()
         params['id'] = id1
         params['pos_x'] = 2.1