Merge pull request #41 from SWIFTSIM/bug_stretch_final_bin

Bug in plots with adaptive binning

Author: JBorrow

velociraptor/tools/adaptive.py

@@ -190,11 +190,18 @@ def create_adaptive_bins(
             number_in_bin.append(current_bin_count)
         elif current_bin_count == 1:
             # Extend the previous bin (otherwise error is consistent with zero)
-            bin_edges_right[-1] = value
-            number_in_bin[-1] += 1
-            bin_medians[-1] = np.median(sorted_values[-number_in_bin[-1] :])
-            # We don't need the next bin now.
-            bin_edges_left = bin_edges_left[:-1]
+            try:
+                bin_edges_right[-1] = value
+                number_in_bin[-1] += 1
+                bin_medians[-1] = np.median(sorted_values[-number_in_bin[-1]:])
+                # We don't need the next bin now.
+                bin_edges_left = bin_edges_left[:-1]
+
+            # There is no previous bin because we have just one bin in total
+            except IndexError:
+                bin_edges_right.append(value)
+                number_in_bin.append(1)
+                bin_medians.append(sorted_values[-1])
         else:
             # This bin doesn't exist anyway, boo...
             bin_edges_left = bin_edges_left[:-1]

velociraptor/tools/mass_functions.py

@@ -272,11 +272,18 @@ def create_adaptive_mass_function(
         number_in_bin.append(current_bin_count)
     elif current_bin_count == 1:
         # Extend the previous bin (otherwise error is consistent with zero)
-        bin_edges_right[-1] = mass
-        number_in_bin[-1] += 1
-        bin_medians[-1] = np.median(sorted_masses[-number_in_bin[-1] :])
-        # We don't need the next bin now.
-        bin_edges_left = bin_edges_left[:-1]
+        try:
+            bin_edges_right[-1] = mass
+            number_in_bin[-1] += 1
+            bin_medians[-1] = np.median(sorted_masses[-number_in_bin[-1] :])
+            # We don't need the next bin now.
+            bin_edges_left = bin_edges_left[:-1]
+
+        # There is no previous bin because we have just one bin in total
+        except IndexError:
+            bin_edges_right.append(mass)
+            number_in_bin.append(1)
+            bin_medians.append(sorted_masses[-1])
     else:
         # This bin doesn't exist anyway, boo...
         bin_edges_left = bin_edges_left[:-1]