Refactor and fix bug

nuztf/base_scanner.py

@@ -58,6 +58,7 @@ def __init__(
     ):
         self.cone_nside = cone_nside
         self.t_min = t_min
+
         (
             self.map_coords,
             self.pixel_nos,
@@ -906,17 +907,6 @@ def calculate_overlap_with_observations(
 
         self.logger.info("Unpacking observations")
 
-        if self.nside < 1024:
-            (
-                self.map_coords,
-                self.pixel_nos,
-                self.nside,
-                self.map_probs,
-                self.data,
-                self.total_pixel_area,
-                self.key,
-            ) = self.unpack_skymap(output_nside=1024)
-
         pix_map = dict()
         pix_obs_times = dict()
 

nuztf/neutrino_scanner.py

@@ -152,15 +152,19 @@ def filter_f_no_prv(self, res: dict):
         # Require 2 detections separated by 15 mins
         if (endhist - starthist) < 0.01:
             self.logger.debug(
-                f"❌ {ztf_id}: Does have 2 detections, but these are not separated by >15 mins (delta t = {(endhist-starthist)*1440:.0f} min)"
+                f"❌ {ztf_id}: Does have 2 detections, but these are not separated by "
+                f">15 mins (delta t = {(endhist-starthist)*1440:.0f} min)"
             )
             return False
 
         self.logger.debug(f"✅ {ztf_id}: Passes first filtering stage (no prv).")
         return True
 
     def filter_f_history(self, res: dict):
-        """Filter based on 2 detection requirement and probability contour requirement"""
+        """
+        Filter based on 2 detection requirement
+        and probability contour requirement
+        """
 
         ztf_id = res["objectId"]
 
@@ -215,8 +219,14 @@ def in_contour(self, ra_deg, dec_deg):
 
         return np.logical_and(in_ra, in_dec)
 
-    def unpack_skymap(self, skymap=None, output_nside: None | int = None):
-        """ """
+    def unpack_skymap(self, output_nside: None | int = None):
+        """
+        Unpack the skymap and return the pixel coordinates and probabilities
+
+        :param output_nside: Nside of the output map
+        :return: Map coordinates, pixel numbers, output nside,
+        map probabilities, data, total pixel area, key
+        """
         output_nside = 2048 if output_nside is None else output_nside
 
         map_coords = []
@@ -225,7 +235,8 @@ def unpack_skymap(self, skymap=None, output_nside: None | int = None):
         center_ra = np.radians(np.mean([self.ra_max, self.ra_min]))
         center_dec = np.radians(np.mean([self.dec_max, self.dec_min]))
         # Take the larger of the two sides and convert to radians
-        # To make sure to include all pixels until the edge of the rectangle, we have to devide by sqrt(2)
+        # To make sure to include all pixels until the edge of the rectangle,
+        # we have to devide by sqrt(2)
         # (not 2 as previously done here!)
         rad = np.radians(
             max(self.ra_max - self.ra_min, self.dec_max - self.dec_min)