Improve whether the sample has protein acronym or

mxcube · Feb 14, 2024 · 22eccef · 22eccef
1 parent ab68b4f
commit 22eccef
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/mxcubecore/HardwareObjects/Session.py b/mxcubecore/HardwareObjects/Session.py
@@ -280,7 +280,10 @@ def get_default_prefix(self, sample_data_node=None, generic_name=False):
         prefix = proposal
 
         if sample_data_node:
-            if sample_data_node.has_lims_data():
+            if (
+                sample_data_node.has_lims_data()
+                or sample_data_node.has_protein_acronym()
+            ):
                 protein_acronym = sample_data_node.crystals[0].protein_acronym
                 name = sample_data_node.name
                 if protein_acronym:

diff --git a/mxcubecore/model/queue_model_objects.py b/mxcubecore/model/queue_model_objects.py
@@ -322,6 +322,14 @@ def has_lims_data(self):
         except TypeError:
             return False
         return False
+
+    def has_protein_acronym(self):
+        try:
+            if hasattr(self.crystals[0], "protein_acronym"):
+                return True
+        except TypeError:
+            return False
+        return False
 
     def get_name(self):
         return self._name