Adapted to comments from @marcus-oscarsson

Author: rhfogh

mxcubecore/HardwareObjects/SOLEIL/PX2/PX2Collect.py

@@ -138,20 +138,28 @@ def data_collection_hook(self):
 
         osc_seq = parameters["oscillation_sequence"][0]
         fileinfo = parameters["fileinfo"]
+        sample_reference = parameters["sample_reference"]
         experiment_type = parameters["experiment_type"]
         energy = parameters["energy"]
         transmission = parameters["transmission"]
         resolution = parameters["resolution"]
 
         exposure_time = osc_seq["exposure_time"]
+        in_queue = parameters["in_queue"] != False
 
         angle_per_frame = osc_seq["range"]
         scan_start_angle = osc_seq["start"]
         number_of_images = osc_seq["number_of_images"]
         image_nr_start = osc_seq["start_image_number"]
 
         directory = fileinfo["directory"]
+        prefix = fileinfo["prefix"]
         template = fileinfo["template"]
+        run_number = fileinfo["run_number"]
+        process_directory = fileinfo["process_directory"]
+
+        # space_group = str(sample_reference['space_group'])
+        # unit_cell = list(eval(sample_reference['cell']))
 
         self.emit("collectStarted", (self.owner, 1))
         self.emit("progressInit", ("Data collection", 100))

mxcubecore/HardwareObjects/abstract/ISPyBValueFactory.py

@@ -209,7 +209,7 @@ def from_data_collect_parameters(ws_client, mx_collect_dict):
             ) * float(osc_seq["number_of_images"])
 
             data_collection.axisRange = osc_seq["range"]
-            data_collection.offset = osc_seq["offset"]
+            data_collection.overlap = -osc_seq["offset"]
             data_collection.numberOfImages = osc_seq["number_of_images"]
             data_collection.startImageNumber = osc_seq["start_image_number"]
             data_collection.numberOfPasses = osc_seq["number_of_passes"]

mxcubecore/model/common.py

@@ -27,6 +27,7 @@ class LegacyParameters(BaseModel):
     take_dark_current: int
     inverse_beam: bool
     num_passes: int
+    offset: float
 
     class Config:
         extra = "ignore"