From 32d459328da55074d84adcc8f023e80d48c4e0cb Mon Sep 17 00:00:00 2001 From: robjmcgibbon Date: Tue, 22 Apr 2025 13:35:33 +0100 Subject: [PATCH 1/2] Set upper/lower as ceiling/floor --- velociraptor/autoplotter/lines.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/velociraptor/autoplotter/lines.py b/velociraptor/autoplotter/lines.py index 2d625ad..6bc10ad 100644 --- a/velociraptor/autoplotter/lines.py +++ b/velociraptor/autoplotter/lines.py @@ -254,15 +254,13 @@ def create_line( 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( From 26fbd0877ffe70a6e657960c757d29406989a4ed Mon Sep 17 00:00:00 2001 From: robjmcgibbon Date: Mon, 28 Apr 2025 09:30:58 +0100 Subject: [PATCH 2/2] Review comments --- velociraptor/autoplotter/__init__.py | 4 ++-- velociraptor/autoplotter/lines.py | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/velociraptor/autoplotter/__init__.py b/velociraptor/autoplotter/__init__.py index 55145d2..aef3f6b 100644 --- a/velociraptor/autoplotter/__init__.py +++ b/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: diff --git a/velociraptor/autoplotter/lines.py b/velociraptor/autoplotter/lines.py index 6bc10ad..c062209 100644 --- a/velociraptor/autoplotter/lines.py +++ b/velociraptor/autoplotter/lines.py @@ -252,6 +252,9 @@ 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