Merge branch 'dev'

Author: temuller

README.md

@@ -168,6 +168,11 @@ If you make use of HostPhot, please cite the following [paper](https://joss.theo
 
 ## What's new
 
+v3.1.1
+
+* Fixing minor bug when calculating dust extinction for Legacy Survey (Issue [#12](https://github.com/temuller/hostphot/issues/12))
+* Saving input for aperture extraction
+
 v3.1.0
 
 * Using DES DR2 instead of DR1

src/hostphot/_version.py

@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 
-__version__ = "3.1.0"
+__version__ = "3.1.1"

src/hostphot/cutouts/des.py

@@ -102,14 +102,12 @@ def get_DES_images(ra: float, dec: float, size: float | u.Quantity = 3, filters:
     hdu_list = []
     for url, url_w in zip(url_list, url_w_list):
         # combine image+weights on a single fits file
-        #image_hdu = fits.open(url, timeout=120)
         image_hdu = open_fits_from_url(url)
         hdu = fits.PrimaryHDU(image_hdu[0].data, header=image_hdu[0].header)
         if url_w is None:
             hdu_sublist = fits.HDUList([hdu])
         else:
             print(url_w)
-            #weight_hdu = fits.open(url_w, timeout=120)
             weight_hdu = open_fits_from_url(url_w)
             hdu_err = fits.ImageHDU(
                 weight_hdu[0].data, header=weight_hdu[0].header

src/hostphot/photometry/dust.py

@@ -32,7 +32,7 @@ def _download_dustmaps():
     maps_files = dust_files + mask_files
     existing_files = [file.is_file() for file in maps_files]
 
-    if not all(existing_files) == True:
+    if not all(existing_files):
         # download dust maps
         sfdmaps_url = "https://github.com/kbarbary/sfddata/archive/master.tar.gz"
         response = requests.get(sfdmaps_url)
@@ -124,8 +124,8 @@ def calc_extinction(
 
     Parameters
     ----------
-    filter_wave: Filter's wavelength range.
-    filter_response: Filter's response function.
+    filt: Filter name.
+    survvey: Survey name.
     ra: Right ascension.
     dec: Declinationin degrees.
     scaling: Calibration of the Milky Way dust maps. Either ``0.86``
@@ -144,7 +144,8 @@ def calc_extinction(
         # https://datalab.noirlab.edu/ls/bass.php
         # declination above ~32 and above the galactic plane
         gal_coords = SkyCoord(ra=ra * u.degree, dec=dec * u.degree, frame="icrs")
-        if (dec > 32.375) and (gal_coords.b.value > 0):
+        b_gal = gal_coords.galactic.b.value
+        if (dec > 32.375) and (b_gal > 0):
             version = "BASS+MzLS"
         else:
             version = "DECam"

src/hostphot/photometry/global_photometry.py

@@ -161,6 +161,7 @@ def extract_aperture(
     deblend_cont: float = 0.005,
     save_plots: bool = True,
     save_aperture_params: bool = True,
+    save_input: bool = True,
 ) -> tuple[np.ndarray, WCS, float, float, bool]:
     """Calculates the aperture for a given galaxy.
 
@@ -193,6 +194,7 @@ def extract_aperture(
         To entirely disable deblending, set to 1.0.
     save_plots: If `True`, the mask and galaxy aperture figures are saved.
     save_aperture_params: If `True`, the extracted mask parameters are saved into a pickle file.
+    save_input: Whether to save the input parameters.
 
     Returns
     -------
@@ -202,6 +204,11 @@ def extract_aperture(
     scale: Scale for the Kron radius.
     flip: Whether to flip the orientation of the aperture.
     """
+    input_params = locals()  # dictionary
+    # save input parameters
+    if save_input is True:
+        inputs_file = Path(workdir, name, survey, "input_aperture_parameters.csv")
+        store_input(input_params, inputs_file)
     # initial checks
     check_survey_validity(survey)
     check_work_dir(workdir)

tests/test_cutouts.py

@@ -1,7 +1,9 @@
+import pytest
+import warnings
 import unittest
 from pathlib import Path
 from hostphot.cutouts import download_images, set_HST_image, set_JWST_image
-
+from pyvo.dal import DALServiceError
 
 class TestHostPhot(unittest.TestCase):
     def __init__(self, *args, **kwargs):
@@ -74,8 +76,6 @@ def test_cutouts_VISTA(self):
             "VIDEO": [36.1, -5],
             "VIKING": [220.5, 0.0],
         }
-
-        
         for version, coords in surveys.items():
             ra, dec = coords
             #try:
@@ -89,13 +89,17 @@ def test_cutouts_VISTA(self):
             )
 
     def test_cutouts_SkyMapper(self):
-        download_images(
-            self.sn_name,
-            self.ra,
-            self.dec,
-            overwrite=True,
-            survey="SkyMapper",
-        )
+        try:
+            download_images(
+                self.sn_name,
+                self.ra,
+                self.dec,
+                overwrite=True,
+                survey="SkyMapper",
+            )
+        except DALServiceError as e:
+            warnings.warn(f"SkyMapper SIAP service failed: {e}", RuntimeWarning)
+            pytest.skip("SkyMapper SIAP service unavailable or returned 500")
 
     def test_cutouts_SPLUS(self):
         name = "SPLUS_test"