lightstack 0.1.5__tar.gz → 0.1.6__tar.gz

{lightstack-0.1.5/src/lightstack.egg-info → lightstack-0.1.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lightstack
-Version: 0.1.5
+Version: 0.1.6
 Summary: Tools for building and processing multi-filter astrophysical datacubes
 Author: Andressa Wille, Thallis Pessi
 License: MIT License

{lightstack-0.1.5 → lightstack-0.1.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "lightstack"
-version = "0.1.5"
+version = "0.1.6"
 description = "Tools for building and processing multi-filter astrophysical datacubes"
 readme = "README.md"
 authors = [{name = "Andressa Wille"}, {name="Thallis Pessi"}]

{lightstack-0.1.5 → lightstack-0.1.6}/src/lightstack/datacube.py

@@ -24,11 +24,11 @@ def align_reproject_fits(fits_list, ref_file, method="interp", crop=1):
     method : str, optional
         Reprojection method:
         - "interp" (default): faster, interpolates values
-        - "exact": slower   --> but reproject_exact has precision issues with resolutions below ~0.05 arcsec, so the results may not be accurate.
+        - "exact": slower --> but reproject_exact has precision issues
+          with resolutions below ~0.05 arcsec.
 
     crop : int, optional
-        Number of pixels to remove from each border after reprojection
-        (helps remove edge artifacts from interpolation).
+        Number of pixels to remove from each border after reprojection.
 
     Returns
     -------
@@ -36,7 +36,6 @@ def align_reproject_fits(fits_list, ref_file, method="interp", crop=1):
         List in the form [(aligned_fits_path, filter_name), ...].
     """
 
-
     # Choose reprojection method
     if method == "exact":
         reproj_func = reproject_exact
@@ -49,7 +48,9 @@ def align_reproject_fits(fits_list, ref_file, method="interp", crop=1):
     with fits.open(ref_file) as hdul_ref:
         ext_ref = find_ext(hdul_ref)
         if ext_ref is None:
-            raise ValueError(f"No valid image data in reference file '{ref_file}'.")
+            raise ValueError(
+                f"No valid image data in reference file '{ref_file}'."
+            )
 
         ref_header = hdul_ref[ext_ref].header
         ref_wcs = WCS(ref_header)
@@ -83,14 +84,20 @@ def align_reproject_fits(fits_list, ref_file, method="interp", crop=1):
             data_aligned, footprint = reproj_func(
                 (data, wcs_in),
                 ref_wcs,
-                shape_out=shape_out)
-
-            # Area correction
-            area_ratio = (scale_out / scale_in)**2
-            data_aligned *= area_ratio
+                shape_out=shape_out
+            )
 
             print(f"Pixel scale in/out: {scale_in:.4f} -> {scale_out:.4f}")
-            print(f"Applied area correction: {area_ratio:.4f}")
+
+            # Apply area correction only if scales differ
+            if not np.isclose(scale_in, scale_out, rtol=1e-6):
+                area_ratio = (scale_out / scale_in) ** 2
+                data_aligned *= area_ratio
+                print(f"Applied area correction: {area_ratio:.4f}")
+                area_corrected = True
+            else:
+                print("Pixel scales identical: no area correction applied.")
+                area_corrected = False
 
             # Crop border
             if crop > 0:
@@ -108,19 +115,33 @@ def align_reproject_fits(fits_list, ref_file, method="interp", crop=1):
 
             ref_filter = infer_filter(ref_file)
             header_aligned.add_history(
-                f"Reprojected to {ref_filter} using {method} method (reproject package)")
-            header_aligned.add_history(
-                "Flux corrected by pixel area ratio")
+                f"Reprojected to {ref_filter} using {method} method "
+                "(reproject package)"
+            )
+
+            if area_corrected:
+                header_aligned.add_history(
+                    "Flux corrected by pixel area ratio"
+                )
+            else:
+                header_aligned.add_history(
+                    "No area correction applied "
+                    "(identical pixel scale)"
+                )
 
             if crop > 0:
-                header_aligned.add_history(f"Cropped {crop} pixels from each border")
+                header_aligned.add_history(
+                    f"Cropped {crop} pixels from each border"
+                )
 
             # Save
             suffix = f"_aligned_{method}"
             out_name = os.path.splitext(fpath)[0] + f"{suffix}.fits"
 
-            fits.PrimaryHDU(data_aligned, header=header_aligned).writeto(
-                out_name, overwrite=True)
+            fits.PrimaryHDU(
+                data_aligned,
+                header=header_aligned
+            ).writeto(out_name, overwrite=True)
 
             # Flux sanity check
             sum_in = np.nansum(data)
@@ -131,7 +152,6 @@ def align_reproject_fits(fits_list, ref_file, method="interp", crop=1):
             print(f"Saved: {out_name}")
 
     return aligned_list
-
     
     
 def build_datacube(aligned_fits_files, reference_file, output_path):
@@ -255,45 +275,43 @@ def cut_region_datacube(cube_fits_file, x_start, x_end, y_start, y_end, output_p
     None
         Saves the cut datacube.
     """
-    # Open datacube
+    
     with fits.open(cube_fits_file) as hdul:
         ext = find_ext(hdul)
         if ext is None:
             raise ValueError(f"No image data found in {cube_fits_file}")
 
         cube_data = hdul[ext].data
-        cube_header = hdul[ext].header
+        cube_header = hdul[ext].header.copy() 
 
-        # Cut the data array
+        # Cut data
         cut_data = cube_data[:, y_start:y_end, x_start:x_end]
 
-        # Get and update WCS
+        # Update WCS
         wcs_3d = WCS(cube_header)
         wcs_3d.wcs.crpix[0] -= x_start
         wcs_3d.wcs.crpix[1] -= y_start
 
-        # Create new header with updated size and WCS
-        new_header = wcs_3d.to_header()
-        new_header['NAXIS'] = 3
+        # New header
+        new_header = cube_header.copy()
+        new_header.update(wcs_3d.to_header())
+
         new_header['NAXIS1'] = x_end - x_start
         new_header['NAXIS2'] = y_end - y_start
         new_header['NAXIS3'] = cube_data.shape[0]
 
-        # Filter info
-        for key in cube_header:
-            if key.startswith('FILTER'):
-                new_header[key] = cube_header[key]
-
-        # Crop window
+        # Crop window 
         new_header['XMINPIX'] = x_start
         new_header['XMAXPIX'] = x_end
         new_header['YMINPIX'] = y_start
         new_header['YMAXPIX'] = y_end
 
-        # Save cut datacube
+        # Save
         fits.PrimaryHDU(cut_data, header=new_header).writeto(output_path, overwrite=True)
+
         print(f"Cut datacube saved to '{output_path}'")
-        
+
+
 def build_valid_datacube(cube_fits_file, output_cube, threshold=0.0, frac_valid=0.01):
     """
     Remove empty filters in a datacube, saves the new datacube and returns the valid filter names.

{lightstack-0.1.5 → lightstack-0.1.6}/src/lightstack/psf.py

@@ -133,7 +133,7 @@ def resample_psf(
     psf_resampled = zoom(psf, zoom_factor, order=order)
     
     # Area correction
-    psf_resampled /= zoom_factor**2
+    psf_resampled /= zoom_factor
 
     # Ensure odd shape
     if make_odd_shape:

{lightstack-0.1.5 → lightstack-0.1.6}/src/lightstack/utils.py

@@ -33,7 +33,7 @@ def pick_folder(filt):
 
 def get_filter(fname):
     """
-    Extracts the filter name from a FITS filename using a regular expression.
+    Extracts the filter name from a FITS filename using a regular expression. Function for HST and JWST filters.
 
     Parameters
     ----------
@@ -58,7 +58,7 @@ def get_filter(fname):
 
 def infer_filter(fname):
     """
-    Infers the filter name from a FITS filename.
+    Infers the filter name from a FITS filename. Function for HST and JWST filters.
 
     Parameters
     ----------
@@ -79,7 +79,7 @@ def infer_filter(fname):
 
 def filter_id(filt):
     """
-    Extracts the numeric part of a filter name for sorting.
+    Extracts the numeric part of a filter name for sorting. Function for HST and JWST filters.
 
     Parameters
     ----------

{lightstack-0.1.5 → lightstack-0.1.6/src/lightstack.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lightstack
-Version: 0.1.5
+Version: 0.1.6
 Summary: Tools for building and processing multi-filter astrophysical datacubes
 Author: Andressa Wille, Thallis Pessi
 License: MIT License