Make sure offset_valid=True except when not valid

Author: albireox

src/jaeger/fvc.py

@@ -478,15 +478,19 @@ def process_fvc_image(
             assigned = fdata.filter(
                 (
                     polars.col.assigned.any()
+                    & polars.col.disabled.not_().all()
                     & polars.col.offline.not_().all()
                     & polars.col.dubious.not_().all()
+                    & polars.col.valid.all()
                 ).over("positioner_id")
             )
         else:
             self.log("No assigned fibres found. Using all matched fibres.")
             assigned = fdata.filter(
                 polars.col.offline.not_().all(),
+                polars.col.disabled.not_().all(),
                 polars.col.dubious.not_().all(),
+                polars.col.valid.all(),
             )
 
         # Now get the metrology fibre from those groups.

src/jaeger/target/assignment.py

@@ -165,6 +165,8 @@ def create_fibre_data(self):
                     "delta_ra": None,
                     "delta_dec": None,
                     "assigned": False,
+                    "offset_valid": True,
+                    "valid": True,
                     "too": False,
                 }
 
@@ -194,6 +196,7 @@ def create_fibre_data(self):
                                 "delta_dec": tdata_row_dict["delta_dec"],
                                 "assigned": True,
                                 "offset_valid": offset_valid,
+                                "valid": offset_valid,
                                 "too": tdata_row_dict["is_too"],
                             }
                         )
@@ -381,8 +384,10 @@ def compute_coordinates(self, epoch: Optional[float] = None):
 
         # Select only the rows with valid ICRS coordinates.
         fibre_data_icrs = self.fibre_data.filter(
-            polars.col("ra_icrs").is_not_null(),
-            polars.col("dec_icrs").is_not_null(),
+            polars.col.ra_icrs.is_not_null(),
+            polars.col.dec_icrs.is_not_null(),
+            polars.col.offset_valid,
+            polars.col.valid,
         )
 
         # Get the positioner data for the targets with ICRS. The returned
@@ -433,6 +438,7 @@ def compute_coordinates(self, epoch: Optional[float] = None):
             polars.col.alpha.is_null(),
             polars.col.beta.is_null(),
             polars.col.offset_valid.not_(),
+            polars.col.valid.not_(),
         )
         unassigned = unassigned.with_columns(
             alpha=when.then(alpha0).otherwise(polars.col.alpha),