#None: better decision on when to plan observation (see RELEASE_NOTES)

Author: mickolaua

RELEASE_NOTES

@@ -152,6 +152,15 @@ do not repeat trying
 alerts)
 - Removed some unnecessary imports
 
+## 0.4.16
+
+- Improved decision making for planning: no plans will be generated for a given event
+if the database already contains a cross-matched event, which localization completely 
+covers the skymap of the current event. Thus, if the older cross-matched event has an 
+error radius smaller than 1.5 arcmin or new area is more than 75% of the older one, no 
+plans will be created.
+- Fixed type hint for `GladeCatalog.lazy_load_catalog`.
+
 
 # v0.3.0
 

aware/__version__.py

@@ -1,2 +1,2 @@
-__version__ = (0, 4, 15)
+__version__ = (0, 4, 16)
 __strversion__ = "{}.{}.{}".format(__version__)

aware/consumer/main.py

@@ -14,6 +14,7 @@
 from __future__ import annotations
 
 import asyncio
+from io import BytesIO
 import pickle
 from contextlib import suppress
 from datetime import datetime
@@ -56,7 +57,6 @@
 from ..site import Telescopes, default_sites
 from ..topic import TOPICS, full_topic_name_to_short
 
-
 topics = CfgOption("topics", TOPICS, list)
 timeout = CfgOption("timeout", -1, float)
 start_date = CfgOption(
@@ -204,7 +204,7 @@ async def consume_messages(self):
             message = await self._poll_message(timeout=timeout.value)
             await self._process_message(message)
             # await self.consume_messages()
-            
+
             # Read several new messages to have concurrency. Otherwise, if we poll,
             # only for the last alert type in topics alerts will be received.
             # for message in self.consumer.consume(
@@ -230,7 +230,7 @@ async def _poll_message(self, timeout: float) -> Message | None:
         """
         try:
             message = await poll_message(self.consumer, timeout)
-            
+
             log.debug(
                 "ConsumeLoop._consume_message(): received message on %s",
                 datetime.now().isoformat(),
@@ -322,7 +322,7 @@ def name_xmatch(info: TargetInfo) -> list[dict]:
             except Exception as e:
                 log.error("Failed to crossmatch alert by name: %s", e)
             return matched_alerts
-                
+
         if info.localization:
             matched_alerts = await spatial_xmatch(info)
         else:
@@ -359,6 +359,7 @@ def name_xmatch(info: TargetInfo) -> list[dict]:
                     matched_error_radii = [a["error_radius"] for a in matched_alerts]
                     i_min = np.argmin(matched_error_radii)
                     matched_error_radius = matched_error_radii[i_min]
+                    matched_localization = matched_alerts[i_min]["localization"]
                     error_radius = info.localization.error_radius().to_value(u.deg)
 
                     if error_radius < matched_error_radius:
@@ -369,8 +370,32 @@ def name_xmatch(info: TargetInfo) -> list[dict]:
                             event,
                             len(matched_alerts),
                         )
-                        send_obs_data = True
+
                         refines_localization = True
+
+                        # If matched error radius is already small enough, no need to
+                        # run the planner again. Since, skymap is wholy inside FOV of a
+                        # telescope anyway.
+                        SMALL_RADIUS = 1.5 / 60  # 1.5 arcmin
+                        refines_small = matched_error_radius < SMALL_RADIUS
+
+                        # The same, when newer sky map is fully contained inside old one
+                        # borders, and its area not significantly smaller than the old
+                        # one. We probably already have plans for that skymap region.
+                        matched_moc = pickle.loads(matched_localization).moc()
+                        new_moc = info.localization.moc()
+                        SKY_MAP_AREA_FRACTION = 0.75
+                        new_inside_old = (
+                            new_moc.union(matched_moc) == new_moc
+                            and new_moc.sky_fraction
+                            > SKY_MAP_AREA_FRACTION * matched_moc.sky_fraction
+                        )
+
+                        if refines_small or new_inside_old:
+                            send_obs_data = False
+                        else:
+                            send_obs_data = True
+
                     else:
                         send_obs_data = False
                         refines_localization = False
@@ -457,7 +482,8 @@ def name_xmatch(info: TargetInfo) -> list[dict]:
 
             # Run planner in the separate thread, because it is a blocking function
             @aiomisc.threaded
-            def plan_func(planner: ObservationPlanner):
+            def plan_func(planner: ObservationPlanner) -> dict:
+                plan_dicts = {}
                 try:
                     planner.plan_observations(
                         epoch=now,
@@ -471,10 +497,11 @@ def plan_func(planner: ObservationPlanner):
                     plan_result = planner.save_or_update_planning()
                     json_plan_reg_fn, plan_data = plan_result
                     plan_dicts = plan_data.get("plans", [])
-                    return plan_dicts
                 except Exception as e:
                     log.error("Error while planning observations: %s", e)
 
+                return plan_dicts
+
             # Plan only for not-empty localization skymaps
             if info.localization is not None:
                 plan_dicts = await plan_func(planner)
@@ -496,7 +523,7 @@ def plan_func(planner: ObservationPlanner):
                                 target_info=info,
                             )
                         except (LookupError, TypeError, ArithmeticError):
-                            # If registry contains site_id not presented in 
+                            # If registry contains site_id not presented in
                             # default_sites
                             pass
                         else:

aware/glade/main.py

@@ -105,7 +105,7 @@ class GladeCatalog:
     coord = None
 
     @staticmethod
-    def lazy_load_catalog() -> tuple(Table, SkyCoord):
+    def lazy_load_catalog() -> tuple[Table, SkyCoord]:
         if not getattr(GladeCatalog, "table", None) or not getattr(
             GladeCatalog, "coord", None
         ):
@@ -130,10 +130,10 @@ def query_skymap_local(
         dist_hi_bound: u.Unit = np.inf * u.Mpc,
         prob: float = 0.9,
     ) -> list[GladeGalaxy]:
-        log.debug("loading local GLADE+ catalog into RAM")
+        log.debug("loading local GLADE+ catalog into RAM ...")
         table, coord = GladeCatalog.lazy_load_catalog()
 
-        log.debug("query GLADE+ catalog against %.1f per cent contour", prob * 100)
+        log.debug("query GLADE+ catalog against %.1f per cent contour ...", prob * 100)
         match_res = crossmatch(sky_map_moc, coordinates=coord, contours=(prob,))
         galaxies = [
             GladeGalaxy(

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "AWARE"
-version = "0.4.15"
+version = "0.4.16"
 authors = [{name="Nicolai Pankov", email="colinsergesen@gmail.com"}]
 requires-python = ">=3.9,<3.12"
 dependencies = [