Preliminary code for handling more parameters from the diffractionPlan

Author: rhfogh

mxcubecore/HardwareObjects/Gphl/GphlWorkflow.py

@@ -86,6 +86,12 @@ class GphlWorkflowStates(enum.Enum):
 EMULATION_DATA = {
     "3n0s": {"radiationSensitivity": 0.9},
     "4j8p": {"radiationSensitivity": 1.1},
+    "4mxt":{
+        "exposureTime": 0.055,
+        "oscillationRange": 0.15,
+        "radiationSensitivity": 1.0,
+        "energy": 12.2222,
+    },
 }
 
 # Centring modes for use in centring mode pulldown.
@@ -2759,14 +2765,11 @@ def get_emulation_samples(self):
                     # Use "Mad, "SAD", "OSC"
                     dfp = data["diffractionPlan"] = {
                         # "diffractionPlanId": 457980,
-                        "experimentKind": "Default",
-                        "numberOfPositions": 0,
-                        "observedResolution": 0.0,
-                        "preferredBeamDiameter": 0.0,
+                        # "experimentKind": "Default",
+                        "exposureTime": 0.0,
+                        "oscillationRange": 0.0,
                         "radiationSensitivity": 1.0,
-                        "requiredCompleteness": 0.0,
-                        "requiredMultiplicity": 0.0,
-                        # "requiredResolution": 0.0,
+                        "energy": 0.0,
                     }
                     dfp["aimedResolution"] = resolution
                     dfp["diffractionPlanId"] = 5000000 + serial

mxcubecore/model/queue_model_objects.py

@@ -2431,25 +2431,41 @@ def init_from_task_data(self, sample_model, params):
         )
 
         # Set parameters from diffraction plan
-        diffraction_plan = sample_model.diffraction_plan
-        if diffraction_plan:
+        plan = sample_model.diffraction_plan
+        if plan:
             # It is not clear if diffraction_plan is a dict or an object,
             # and if so which kind
-            if hasattr(diffraction_plan, "radiationSensitivity"):
-                radiation_sensitivity = diffraction_plan.radiationSensitivity
-            else:
-                radiation_sensitivity = diffraction_plan.get("radiationSensitivity")
-
-            if radiation_sensitivity:
-                self.relative_rad_sensitivity = radiation_sensitivity
-
-            if hasattr(diffraction_plan, "aimedResolution"):
-                resolution = diffraction_plan.aimedResolution
-            else:
-                resolution = diffraction_plan.get("aimedResolution")
-
-            if resolution:
-                self.aimed_resolution = resolution
+            # NB if 'val' is ever not None but zero we still want to skip it
+            tag = "radiationSensitivity"
+            val = getattr(plan, tag, plan.get(tag))
+            if val:
+                self.relative_rad_sensitivity = val
+            tag = "aimedResolution"
+            val = getattr(plan, tag, plan.get(tag))
+            if val:
+                self.aimed_resolution = val
+            if self.automation_mode:
+                tag = "exposureTime"
+                val = getattr(plan, tag, plan.get(tag))
+                if val:
+                    self.auto_acq_parameters[-1]["exposure_time"] = val
+                tag = "oscillationRange"
+                val = getattr(plan, tag, plan.get(tag))
+                if val:
+                    self.auto_acq_parameters[-1]["image_width"] = val
+            tag = "energy"
+            val = getattr(plan, tag, plan.get(tag))
+            if val:
+                if self.wftype == "diffractcal":
+                    energy_tag = "Main"
+                else:
+                    energy_tag = "Characterisation"
+                self.wavelengths = (
+                    GphlMessages.PhasingWavelength(
+                        wavelength=HWR.beamline.energy.calculate_wavelength(val),
+                        role=energy_tag,
+                    ),
+                )
 
     # Parameters for start of workflow
     def get_path_template(self):