Merge pull request #1613 from HEXRD/flip-overlay-data-fixes

Fix a few issues due to the flipped overlay data
HEXRD · Nov 9, 2023 · 1e0aaf9 · 1e0aaf9
2 parents 97c5fbb + edc584b
commit 1e0aaf9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/hexrdgui/calibration/calibration_runner.py b/hexrdgui/calibration/calibration_runner.py
@@ -518,7 +518,7 @@ def reset_overlay_data_index_map(self):
                     if hkl_index == -1:
                         continue
 
-                    tth_values = data[key][data_key][hkl_index][:, 1]
+                    tth_values = data[key][data_key][hkl_index][:, 0]
                     min_value = min(min_value, np.nanmin(tth_values))
 
                 min_tth_values.append(min_value)
@@ -542,7 +542,7 @@ def reset_overlay_data_index_map(self):
                     rings = data[key][data_key]
 
                     keys.append(key)
-                    min_eta_values[key] = np.nanmin(rings[hkl_index][:, 0])
+                    min_eta_values[key] = np.nanmin(rings[hkl_index][:, 1])
                     hkl_indices[key] = hkl_index
 
                 keys.sort(key=lambda x: min_eta_values[x])

diff --git a/hexrdgui/main_window.py b/hexrdgui/main_window.py
@@ -817,8 +817,7 @@ def action_edit_apply_powder_mask_to_polar(self):
             for _, val in overlay.data.items():
                 a = iter(val['rbnds'])
                 for start, end in zip(a, a):
-                    ranges = np.array(np.flip(start, axis=1))
-                    ranges = np.append(ranges, np.flip(end), axis=0)
+                    ranges = np.append(start, np.flip(end, axis=0), axis=0)
                     ranges = np.append(ranges, [ranges[0]], axis=0)
                     data.append(ranges[~np.isnan(ranges).any(axis=1)])