Merge pull request #915 from neutrons/fix_load

fix for loading multiple runs
neutrons · Feb 24, 2025 · 8a43ff2 · 8a43ff2 · github-actions · Feb 24, 2025
2 parents 00365c6 + 9ad3c36
commit 8a43ff2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/pyrs/interface/peak_fitting/event_handler.py b/pyrs/interface/peak_fitting/event_handler.py
@@ -79,7 +79,8 @@ def load_run_number_plot(self):
                         str(run_err), 'error')
             return
 
-        hidra_file_name = os.path.join(project_dir, f'HB2B_{self.parent.ui.lineEdit_expNumber.text()}.h5')
+        hidra_file_name = [os.path.join(project_dir[i_run], f'HB2B_{runs[i_run]}.h5') for i_run in range(len(runs))]
+
         self.parent.current_hidra_file_name = hidra_file_name
         self.load_and_plot(hidra_file_name)
 

diff --git a/tests/integration/test_load_split.py b/tests/integration/test_load_split.py
@@ -65,7 +65,7 @@ def test_log_time_average():
     sample_logs = processor.split_sample_logs(SUBRUNS_EXP)
 
     # verify two of the properties
-    np.testing.assert_allclose(sample_logs['2theta'], [100.0015, 100.0015, 97.50225])
+    np.testing.assert_allclose(sample_logs['2theta'], [69.99525, 80., 97.50225])
 
 
 if __name__ == '__main__':