Merge pull request #114 from SWIFTSIM/floor_values

Set upper/lower as ceiling/floor

Author: robjmcgibbon

velociraptor/autoplotter/__init__.py

@@ -70,10 +70,10 @@
          units: end value units
        # Restriction of binning vertically
        lower:
-         value: lower value for median/mean line
+         value: floor value when computing median/mean line
          units: lower value units
        upper:
-         value: upper value for median/mean line
+         value: ceiling value when computing median/mean line
          units: upper value units
      # Generic metadata for plot
      metadata:

velociraptor/autoplotter/lines.py

@@ -252,17 +252,18 @@ def create_line(
             mask = isnan(x)
             masked_x = masked_x[~mask]
 
+        if (self.lower is not None) and (self.upper is not None):
+            assert self.upper > self.lower
+
         if self.lower is not None:
             self.lower.convert_to_units(y.units)
-            mask = masked_y > self.lower
-            masked_x = masked_x[mask]
-            masked_y = masked_y[mask]
+            mask = masked_y < self.lower
+            masked_y[mask] = self.lower
 
         if self.upper is not None:
             self.upper.convert_to_units(y.units)
-            mask = masked_y < self.upper
-            masked_x = masked_x[mask]
-            masked_y = masked_y[mask]
+            mask = masked_y > self.upper
+            masked_y[mask] = self.upper
 
         if self.median:
             self.output = lines.binned_median_line(