Merge pull request #849 from neutrons/fix_mantid67_error

catch runtimeerror for mantid 67
neutrons · Jul 21, 2023 · 4a2e508 · 4a2e508 · github-actions · Jul 21, 2023
2 parents feb7392 + 257b60f
commit 4a2e508
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/pyrs/core/nexus_conversion.py b/pyrs/core/nexus_conversion.py
@@ -538,6 +538,13 @@ def __split_property(self, runObj, log_name, log_array_size):
         else:
             try:
                 split_log[:] = runObj.getPropertyAsSingleValue(log_name)
+            except RuntimeError:
+                if isinstance(log_property.value, str):
+                    split_log[:] = log_property.value
+                elif isinstance(log_property.value, list):
+                    split_log[:] = log_property.value[0]
+                else:
+                    raise RuntimeError('Cannot filter log "{}" of type "{}"'.format(log_name, log_dtype))
             except ValueError:
                 if isinstance(log_property.value, str):
                     split_log[:] = log_property.value

diff --git a/pyrs/interface/manual_reduction/pyrs_api.py b/pyrs/interface/manual_reduction/pyrs_api.py
@@ -286,7 +286,7 @@ def reduce_hidra_workflow(nexus, output_dir, progressbar, instrument=None, calib
 
     # process the data
     converter = NeXusConvertingApp(nexus, mask)
-    hidra_ws = converter.convert(use_mantid=False)
+    hidra_ws = converter.convert()
 
     # Update
     if progressbar: