Minor improvements (#176)

- Improve astrometry parameters for blue filters.
- Fix aperture photometry preview cutout size in admin.
- Increase number of calibrators added from PanSTARRS.
- Allow filtering by instruments and date with `--astrosource`.

Author: juanep97

iop4admin/modeladmins/astrosource.py

@@ -17,7 +17,7 @@
 from astropy.coordinates import SkyCoord
 
 # iop4lib imports
-from iop4lib.enums import BANDS
+from iop4lib.enums import BANDS, SRCTYPES
 
 # logging
 import logging
@@ -169,16 +169,18 @@ def add_field_stars_from_panstarrs(self, request, queryset):
 
         catalog_data.remove_columns([col for col in catalog_data.columns if col not in column_names])
 
-        logger.info(f"Filtered down to {len(catalog_data)} PanSTARRS field stars with {MIN_R_MAG} <= R <= {MAX_R_MAG}, std < {MAX_MAG_STD} and n_obs > {MIN_N_OBS}")
+        n_valid = len(catalog_data)
 
-        if len(catalog_data) == 0:
+        logger.info(f"Filtered down to {n_valid} PanSTARRS field stars with {MIN_R_MAG} <= R <= {MAX_R_MAG}, std < {MAX_MAG_STD} and n_obs > {MIN_N_OBS}")
+
+        if n_valid == 0:
             logger.error(f"No PanSTARRS field stars found for {main_src.name}, skipping")
 
         # sort by number of observations in R, take top 10 only
-        if len(catalog_data) > 10:
-            logger.info("Keeping only top 10 field stars by number of R observations")
+        if n_valid > 30:
+            logger.info("Keeping only top 30 field stars by number of R observations")
             catalog_data.sort('rMeanApMagNpt')
-            catalog_data = catalog_data[-10:]
+            catalog_data = catalog_data[-30:]
 
         field_stars = list()
 
@@ -209,7 +211,7 @@ def add_field_stars_from_panstarrs(self, request, queryset):
                                                 f"Autogenerated from PanSTARRS catalog query.\n"
                                                 f"SDSS to Johnson-Cousins transformation by Lupton (2005).\n"
                                                 f"Field `other_names` corresponds to PanSTARRS `objName`.\n"),
-                                        srctype="star",
+                                        srctype=SRCTYPES.STAR,
                                         mag_B=B, mag_B_err=err_B,
                                         mag_V=V, mag_V_err=err_V,
                                         mag_R=R, mag_R_err=err_R,
@@ -222,11 +224,11 @@ def add_field_stars_from_panstarrs(self, request, queryset):
                 logger.error(f"Error with {row['objName']}: {e}")
                 continue
 
-        logger.info(f"Added {len(field_stars)} PanSTARRS field stars for {main_src.name}")
+        logger.info(f"Added {len(field_stars)} out of {n_valid} PanSTARRS field stars for {main_src.name}")
 
         main_src.calibrators.add(*field_stars)
 
-        messages.success(request, f"Added {len(field_stars)} PanSTARRS field stars for {main_src.name}")
+        messages.success(request, f"Added {len(field_stars)} out of {n_valid} PanSTARRS field stars for {main_src.name}")
 
 
     @admin.action(description='Remove all field stars from PanSTARRS')
@@ -243,4 +245,4 @@ def remove_field_stars_from_panstarrs(self, request, queryset):
         field_stars.delete()
         logger.info(f"Removed {n_field_stars} PanSTARRS field stars for {main_src.name}")
 
-        messages.success(request, f"Removed {n_field_stars} PanSTARRS field stars for {main_src.name}")
+        messages.success(request, f"Removed {n_field_stars} PanSTARRS field stars for {main_src.name}")

iop4lib/db/aperphotresult.py

@@ -103,10 +103,10 @@ def get_img(self, force_rebuild=True, **kwargs):
 
         wcs = self.reducedfit.wcs1 if self.pairs == 'O' else self.reducedfit.wcs2
 
+        cutout_size = np.ceil(2.2*self.r_out)
+
         if self.reducedfit.has_pairs:
-            cutout_size = np.ceil(2.2*np.linalg.norm(Instrument.by_name(self.reducedfit.instrument).disp_sign_mean))
-        else:
-            cutout_size = np.ceil(1.3*self.r_out)
+            cutout_size = max(cutout_size, 2.2*np.ceil(np.linalg.norm(Instrument.by_name(self.reducedfit.instrument).disp_sign_mean)))
 
         cutout = Cutout2D(self.reducedfit.mdata, (self.x_px, self.y_px), (cutout_size, cutout_size), wcs)
 
@@ -124,6 +124,8 @@ def get_img(self, force_rebuild=True, **kwargs):
                 with open(fpath, 'rb') as f:
                     return f.read()
 
+        logger.info(f"Building image preview for AperPhotResult {self.id}.")
+
         cmap = plt.cm.gray.copy()
         cmap.set_bad(color='red')
         cmap.set_under(color='black')
@@ -134,7 +136,6 @@ def get_img(self, force_rebuild=True, **kwargs):
         elif normtype == "logstretch":
             norm = ImageNormalize(stretch=LogStretch(a=a))
 
-
         buf = io.BytesIO()
 
         fig = mplt.figure.Figure(figsize=(width/100, height/100), dpi=iop4conf.mplt_default_dpi)
@@ -165,4 +166,4 @@ def get_img(self, force_rebuild=True, **kwargs):
             with open(fpath, 'wb') as f:
                 f.write(imgbytes)
 
-        return imgbytes
+        return imgbytes

iop4lib/iop4.py

@@ -103,23 +103,38 @@ def process_astrosource(args):
 
     astrosource = AstroSource.objects.get(name=args.astrosource)
 
-    qs_all = ReducedFit.objects.filter(epoch__night__gte=args.date_start, epoch__night__lte=args.date_end)
+    qs_redf = ReducedFit.objects.all()
 
-    logger.info(f"Found {qs_all.count()} reduced fits between {args.date_start} and {args.date_end}.")
+    logger.debug(f"Found {qs_redf.count()} files in the DB")
+
+    if args.date_start:
+        qs_redf = qs_redf.filter(epoch__night__gte=args.date_start)
+        logger.debug(f"After {args.date_start}, {qs_redf.count()} files") 
+    
+    if args.date_end:
+        qs_redf = qs_redf.filter(epoch__night__lte=args.date_end)
+        logger.debug(f"Before {args.date_end}, {qs_redf.count()} files") 
+
+
+    if args.instruments:
+        qs_redf = qs_redf.filter(instrument__in=args.instruments)
+        logger.debug(f"For {args.instruments}, {qs_redf.count()} files") 
+
+    logger.info(f"Found {qs_redf.count()} reduced fits.")
 
     if args.only_sources_in_field:
-        qs_all = qs_all.filter(sources_in_field__name=args.astrosource)
-        redfL = list(qs_all)
+        qs_redf = qs_redf.filter(sources_in_field__name=args.astrosource)
+        redfL = list(qs_redf)
     else:
         # filter files that have identified this source (in sources_in_field) or have this source as header_hintobject
         redfL = list()
-        for redf in qs_all:
+        for redf in qs_redf:
             if redf.sources_in_field.filter(name=args.astrosource).exists() or redf.header_hintobject == astrosource:
                 redfL.append(redf)
 
     qs_redf = ReducedFit.objects.filter(pk__in=[redf.pk for redf in redfL])
 
-    logger.info(f"Found {len(redfL)} reduced fits for astrosource {args.astrosource}")
+    logger.info(f"Selected {len(redfL)} reduced fits for astrosource {args.astrosource}")
 
     if args.force_rebuild:
         logger.info("Forcing rebuild of reduced fits.")
@@ -174,6 +189,8 @@ def process_astrosource(args):
                 except Exception as e:
                     logger.exception(f"Error computing host galaxy correction for {result}.")
 
+        logger.info("Done.")
+
 def list_local_epochnames() -> list[str]:
     """List all local epochnames in local archives (by looking at the raw directory)."""
 
@@ -363,6 +380,7 @@ def main():
 
     # astrosource processing options
     parser.add_argument('--astrosource', type=str, default=None, help='<Optional> Select files only of this source')
+    parser.add_argument('--instruments', nargs='+', help='<Optional> List of instruments')
     parser.add_argument('--recompute', action='store_true', help='<Optional> Recompute photometry and polarimetry results')
     parser.add_argument('--retry-failed', action='store_true', help='<Optional> Retry failed reduced fits')
     parser.add_argument('--only-sources-in-field', action='store_true', help='<Optional> Only process files that have this source in sources_in_field')
@@ -502,7 +520,7 @@ def main():
     if args.date_start is not None or args.date_end is not None:
         logger.info("Filtering files by date...")
         filelocs_to_process = filter_filelocs_by_date(filelocs_to_process, args.date_start, args.date_end)    
-        logger.info(f"Filtered to {len(filelocs_to_process)} filelocs_to_process  between {args.date_start} and {args.date_end}.")
+        logger.info(f"Filtered to {len(filelocs_to_process)} filelocs_to_process between {args.date_start} and {args.date_end}.")
 
         filelocs_missing = set(filelocs_to_process).intersection(filelocs_missing)
 

iop4lib/utils/astrometry.py

@@ -26,6 +26,7 @@
 from iop4lib.utils.sourcepairing import (get_pairs_d, get_pairs_dxy, get_best_pairs)
 from iop4lib.utils.sourcedetection import (get_bkg, get_segmentation, get_cat_sources_from_segment_map)
 from iop4lib.utils.plotting import build_astrometry_summary_images
+from iop4lib.enums import BANDS
 
 # logging
 
@@ -129,6 +130,12 @@ def build_wcs_params_shotgun(redf: 'ReducedFit', shotgun_params_kwargs : dict =
     params["npixels"] = [32, 8, 16]
     params["allsky"] = [False]
 
+    if redf.band == BANDS.B or redf.band == BANDS.U:
+        params["n_rms_seg"] = [0.8, 0.66]
+        params["npixels"] = [32, 16, 8]
+        params["bkg_filter_size"] = [5, 7]
+        params["bkg_box_size"] = [8]
+
     ## Substitute default params combinations with specified ones
 
     if shotgun_params_kwargs is not None: