Merge pull request #818 from neutrons/mask_error

change instrument def in load_mask

Author: fanchercm

pyrs/core/nexus_conversion.py

@@ -362,8 +362,13 @@ def __load_mask(self, mask_file_name):
 
         # Load mask XML to workspace
         mask_ws_name = os.path.basename(mask_file_name.split('.')[0])
-        mask_ws = LoadMask(Instrument='nrsf2', InputFile=mask_file_name, RefWorkspace=self._event_wksp,
-                           OutputWorkspace=mask_ws_name)
+
+        try:
+            mask_ws = LoadMask(Instrument='hidra', InputFile=mask_file_name, RefWorkspace=self._event_wksp,
+                               OutputWorkspace=mask_ws_name)
+        except RuntimeError:  # second mask load added for old data measured prior to instrument rename
+            mask_ws = LoadMask(Instrument='nrsf2', InputFile=mask_file_name, RefWorkspace=self._event_wksp,
+                               OutputWorkspace=mask_ws_name)
 
         # Extract mask out
         # get the Y array from mask workspace: shape = (1048576, 1)