Fix #899

winter-telescope · May 19, 2024 · 2ba8f75 · 2ba8f75
1 parent ebf5e74
commit 2ba8f75
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/mirar/catalog/kowalski/__init__.py b/mirar/catalog/kowalski/__init__.py
@@ -4,5 +4,5 @@
 
 from mirar.catalog.kowalski.base_kowalski_catalog import get_kowalski
 from mirar.catalog.kowalski.gaia import Gaia, GaiaBright
-from mirar.catalog.kowalski.ps1 import PS1, PS1SGSc, PS1STRM
+from mirar.catalog.kowalski.ps1 import PS1, PS1STRM, PS1SGSc
 from mirar.catalog.kowalski.tmass import TMASS
diff --git a/mirar/pipelines/winter/blocks.py b/mirar/pipelines/winter/blocks.py
@@ -7,7 +7,7 @@
 
 from winterrb.model import WINTERNet
 
-from mirar.catalog.kowalski import PS1, TMASS, Gaia, GaiaBright, PS1SGSc, PS1STRM
+from mirar.catalog.kowalski import PS1, PS1STRM, TMASS, Gaia, GaiaBright, PS1SGSc
 from mirar.downloader.get_test_data import get_test_data_dir
 from mirar.paths import (
     BASE_NAME_KEY,

diff --git a/mirar/pipelines/winter/generator/candidates.py b/mirar/pipelines/winter/generator/candidates.py
@@ -287,8 +287,16 @@ def winter_candidate_quality_filterer(source_table: SourceBatch) -> SourceBatch:
             & (src_df["fwhm"] < 10.0)
             & (src_df["mindtoedge"] > 50.0)
             & (src_df["isdiffpos"])
-            & ((src_df["sgscore1"] < 0.5) | pd.isnull(src_df["sgscore1"]) | (src_df["distpsnr1"] > min_dist_to_star))
-            & ((src_df["ps1strmprobstar1"] < 0.5) | pd.isnull(src_df["ps1strmprobstar1"]) | (src_df["distpsnr1"] > min_dist_to_star))
+            & (  # Cut on sgscore1
+                (src_df["sgscore1"] < 0.5)
+                | pd.isnull(src_df["sgscore1"])
+                | (src_df["distpsnr1"] > min_dist_to_star)
+            )
+            & (  # Cut on PS1STRM Star Probability
+                (src_df["ps1strmprobstar1"] < 0.5)
+                | pd.isnull(src_df["ps1strmprobstar1"])
+                | (src_df["distpsnr1"] > min_dist_to_star)
+            )
             & (src_df["ndethist"] > 0)
         )
         filtered_df = src_df[mask].reset_index(drop=True)