Enhances exclusion handling in Plotter class

Author: AndrewSazonov

src/easydiffraction/plotting/plotting.py

@@ -141,9 +141,13 @@ def plot_meas(self,
                                         x_max=x_max)
 
         # Exclude points based on the pattern's excluded mask
-        excluded = pattern.excluded
-        x = x[~excluded]
-        y_meas = y_meas[~excluded]
+        if pattern.excluded is not None:
+            excluded = self._filtered_y_array(y_array=pattern.excluded,
+                                              x_array=pattern.x,
+                                              x_min=x_min,
+                                              x_max=x_max)
+            x = x[~excluded]
+            y_meas = y_meas[~excluded]
 
         y_series = [y_meas]
         y_labels = ['meas']
@@ -182,9 +186,13 @@ def plot_calc(self,
                                         x_max=x_max)
 
         # Exclude points based on the pattern's excluded mask
-        excluded = pattern.excluded
-        x = x[~excluded]
-        y_calc = y_calc[~excluded]
+        if pattern.excluded is not None:
+            excluded = self._filtered_y_array(y_array=pattern.excluded,
+                                              x_array=pattern.x,
+                                              x_min=x_min,
+                                              x_max=x_max)
+            x = x[~excluded]
+            y_calc = y_calc[~excluded]
 
         y_series = [y_calc]
         y_labels = ['calc']
@@ -231,10 +239,14 @@ def plot_meas_vs_calc(self,
                                         x_max=x_max)
 
         # Exclude points based on the pattern's excluded mask
-        excluded = pattern.excluded
-        x = x[~excluded]
-        y_meas = y_meas[~excluded]
-        y_calc = y_calc[~excluded]
+        if pattern.excluded is not None:
+            excluded = self._filtered_y_array(y_array=pattern.excluded,
+                                              x_array=pattern.x,
+                                              x_min=x_min,
+                                              x_max=x_max)
+            x = x[~excluded]
+            y_meas = y_meas[~excluded]
+            y_calc = y_calc[~excluded]
 
         y_series = [y_meas, y_calc]
         y_labels = ['meas', 'calc']