Handle HB2A run merge exceptions - ornl-next (#39166)

Handle HB2A run merge exceptions (#39112)

* fixing format

* fix format

* add in unit test data

* add in test

---------

Co-authored-by: Yuanpeng Zhang <zyroc1990@gmail.com>
Co-authored-by: y8z <zhangy3@ornl.gov>

Author: 3 people

Framework/PythonInterface/plugins/algorithms/HB2AReduce.py

@@ -18,6 +18,7 @@
 from mantid.simpleapi import SaveGSSCW, SaveFocusedXYE, AnalysisDataService, RenameWorkspace, mtd
 from mantid import logger
 import numpy as np
+import numpy.lib.recfunctions as rfn
 import datetime
 import os
 import os.path
@@ -246,7 +247,20 @@ def PyExec(self):
                 raise RuntimeError("Could not read {}, file likely malformed".format(filename))
 
             # Accumulate data
-            data = d if data is None else np.append(data, d)
+            if data is None:
+                data = d
+            else:
+                # Ensure both data and d have the same columns
+                all_cols = sorted(list(set(data.dtype.names) | set(d.dtype.names)))
+                for col in all_cols:
+                    if col not in data.dtype.names:
+                        data = rfn.append_fields(data, col, np.zeros(len(data), dtype=float), usemask=False)
+                    if col not in d.dtype.names:
+                        d = rfn.append_fields(d, col, np.zeros(len(d), dtype=float), usemask=False)
+
+                data = data[all_cols]
+                d = d[all_cols]
+                data = np.append(data, d)
 
         # Get any masked detectors
         detector_mask = self.get_detector_mask(exp, indir)

Framework/PythonInterface/test/python/plugins/algorithms/HB2AReduceTest.py

@@ -31,6 +31,22 @@ def test_IndividualDetectors(self):
         HB2AReduce_ws.delete()
         norm_time_wsk.delete()
 
+    def test_mergeRuns(self):
+        HB2AReduce_ws = HB2AReduce("HB2A_exp0954_scan0017.dat,HB2A_exp0954_scan0018.dat,HB2A_exp0954_scan0022.dat", SaveData=False)
+        self.assertTrue(HB2AReduce_ws)
+        self.assertEqual(HB2AReduce_ws.getNumberHistograms(), 1)
+        self.assertEqual(HB2AReduce_ws.blocksize(), 2439)
+        self.assertEqual(np.argmax(HB2AReduce_ws.extractY()), 724)
+        self.assertAlmostEqual(np.max(HB2AReduce_ws.extractY()), 2.316557925)
+        norm_time_wsk = mtd[HB2AReduce_ws.name() + "_norm_time"]
+        self.assertTrue(norm_time_wsk)
+        self.assertEqual(norm_time_wsk.getNumberHistograms(), 1)
+        self.assertEqual(norm_time_wsk.blocksize(), 2439)
+        self.assertEqual(np.argmax(norm_time_wsk.extractY()), 724)
+        self.assertAlmostEqual(np.max(norm_time_wsk.extractY()), 29.890032119)
+        HB2AReduce_ws.delete()
+        norm_time_wsk.delete()
+
     def test_NotBinned(self):
         HB2AReduce_ws = HB2AReduce("HB2A_exp0666_scan0024.dat", BinData=False, SaveData=False)
         self.assertTrue(HB2AReduce_ws)

Testing/Data/UnitTest/HB2A_exp0954__Ge_113_IN_vcorr.txt.md5

@@ -0,0 +1 @@
+fc2bf0b3b285ed6f3f3d51884ec3f360

Testing/Data/UnitTest/HB2A_exp0954_scan0017.dat.md5

@@ -0,0 +1 @@
+ddcbe5bc61697d3d528f977470157505

Testing/Data/UnitTest/HB2A_exp0954_scan0018.dat.md5

@@ -0,0 +1 @@
+4b83f09f2c3e6e62e2be7fb3fbd40a20

Testing/Data/UnitTest/HB2A_exp0954_scan0022.dat.md5

@@ -0,0 +1 @@
+a33f7423d207a2e809b8db5d23c7670c

docs/source/release/v6.13.0/Diffraction/Powder/Bugfixes/39112.rst

@@ -0,0 +1 @@
+- Handle the special case where runs to merge do not share common columns in :ref:`HB2AReduce <algm-HB2AReduce>`.