add in support for mts for sofq import

neutrons · Jun 28, 2024 · c19f681 · c19f681 · github-actions · Jun 28, 2024
1 parent fe2bdc6
commit c19f681
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/addie/addiedriver.py b/addie/addiedriver.py
@@ -455,7 +455,7 @@ def load_sq(self, file_name):
             simpleapi.ConvertToPointData(
                 InputWorkspace=sq_ws_name,
                 OutputWorkspace=sq_ws_name)  # TODO REMOVE THIS LINE
-        elif ext == 'DAT' or ext == 'txt':
+        elif ext == 'DAT' or ext == 'TXT':
             try:
                 simpleapi.LoadAscii(
                     Filename=file_name,
@@ -468,6 +468,16 @@ def load_sq(self, file_name):
             # the workspace
             out_ws = AnalysisDataService.retrieve(sq_ws_name)
             out_ws += 1
+        elif ext == 'SQ':
+            try:
+                simpleapi.LoadAscii(
+                    Filename=file_name,
+                    OutputWorkspace=sq_ws_name,
+                    Unit='MomentumTransfer',
+                    SkipNumLines=2)
+            except RuntimeError:
+                sq_ws_name, q_min, q_max = "InvalidInput", 0, 0
+                return sq_ws_name, q_min, q_max
 
         assert AnalysisDataService.doesExist(
             sq_ws_name), 'Unable to load S(Q) file %s.' % file_name