hyper-py-photometry 1.0.0__py3-none-any.whl → 1.0.1__py3-none-any.whl

hyper_py/data_output.py

@@ -23,7 +23,7 @@ def write_tables(data_dict, output_dir, config, sigma_thres, real_rms, base_file
         flux_units_beam = 'mJy/beam'
     else:
         flux_units_beam = 'Jy/beam'
-        flux_units = 'Jy/beam'
+        flux_units = 'Jy'
         
     units = {
         'MAP_ID': '', 'HYPER_ID': '', 'BAND': 'GHz',

hyper_py/detection.py

@@ -50,7 +50,8 @@ def estimate_rms(image, sigma_clip=3.0):
     return sigma
 
 
-def detect_peaks(filtered_image, threshold, fwhm_pix, roundlim=(-1.0, 1.0), sharplim=(-1.0, 2.0)):
+def detect_peaks(filtered_image, threshold, fwhm_pix, roundlim=(-1.0, 1.0), sharplim=(-1.0, 2.0)):  
+    
     finder = DAOStarFinder(
         threshold=threshold,
         fwhm=fwhm_pix,

hyper_py/map_io.py

@@ -50,8 +50,10 @@ def read_and_prepare_map(filepath, beam, beam_area_arcsec2, beam_area_sr, conver
 
 
     # --- Unit conversions ---
-    bunit = header.get('BUNIT')
-    if bunit == 'MJy /sr':
+    header_for_units = hdul[0].header
+    bunit = header_for_units.cards['BUNIT'].value
+
+    if bunit == 'MJy/sr' or bunit == 'MJy / sr':
         arcsec_to_rad = np.pi / (180.0 * 3600.0)
         pix_area_sr = (pix_dim * arcsec_to_rad)**2
         image_data *= 1e6 * pix_area_sr  # MJy/sr to Jy/pixel

hyper_py/single_map.py

@@ -95,7 +95,7 @@ def main(map_name=None, cfg=None, dir_root=None, logger=None, logger_file_only=N
     flux_err = []
 
 
-    fit_statuts_val = []
+    fit_status_val = []
     deblend_val = []
     cluster_val = []
 
@@ -143,14 +143,16 @@ def main(map_name=None, cfg=None, dir_root=None, logger=None, logger_file_only=N
     
 
     # --- map rms used to define real sources in the map - accounting for non-zero background --- #
+    map_zero_mean_detect = real_map - np.nanmean(real_map)
+    
     use_maual_rms = cfg.get("detection", "use_manual_rms", False)
     if use_maual_rms == True:
         real_rms = cfg.get("detection", "rms_value", False)
     else:         
         sigma_clip = SigmaClip(sigma=3.0, maxiters=10)
-        map_zero_mean_detect = real_map - np.nanmean(real_map)
         clipped = sigma_clip(map_zero_mean_detect)    
         real_rms = np.sqrt(np.nanmean(clipped**2))
+    
         
         
     # --- run sources identification  --- #
@@ -234,12 +236,24 @@ def main(map_name=None, cfg=None, dir_root=None, logger=None, logger_file_only=N
         # Convert to sky coordinates
         x_pixels = np.array(xcen, dtype=np.float64)
         y_pixels = np.array(ycen, dtype=np.float64)
-        ra, dec = wcs.wcs_pix2world(x_pixels, y_pixels, 0)
-        ra_save = np.where(ra < 0., ra + 360., ra)
-        
-        skycoords = SkyCoord(ra=ra, dec=dec, unit='deg', frame='icrs')
-        glon = skycoords.galactic.l.deg
-        glat = skycoords.galactic.b.deg
+
+        ctype1 = header.get('CTYPE1', '').upper()
+        ctype2 = header.get('CTYPE2', '').upper()
+
+        if 'GLON' in ctype1 and 'GLAT' in ctype2:
+            # Input coordinates are Galactic
+            glon, glat = wcs.wcs_pix2world(x_pixels, y_pixels, 0)
+            skycoords = SkyCoord(l=glon, b=glat, unit='deg', frame='galactic')
+            ra = skycoords.fk5.ra.deg
+            dec = skycoords.fk5.dec.deg
+            ra_save = np.where(ra < 0., ra + 360., ra)
+        else:
+            # Assume input coordinates are Equatorial (FK5/ICRS)
+            ra, dec = wcs.wcs_pix2world(x_pixels, y_pixels, 0)
+            ra_save = np.where(ra < 0., ra + 360., ra)
+            skycoords = SkyCoord(ra=ra, dec=dec, unit='deg', frame='fk5')
+            glon = skycoords.galactic.l.deg
+            glat = skycoords.galactic.b.deg
     
         # Prepare zeroed output table
         N = len(xcen)
@@ -386,7 +400,7 @@ def main(map_name=None, cfg=None, dir_root=None, logger=None, logger_file_only=N
         redchi_val.append(final_redchi)
         bic_val.append(final_bic)
         
-        fit_statuts_val.append(fit_status)
+        fit_status_val.append(fit_status)
         deblend_val.append(0)       # not deblended
         cluster_val.append(1)       # only one source
         
@@ -568,7 +582,7 @@ def main(map_name=None, cfg=None, dir_root=None, logger=None, logger_file_only=N
             redchi_val.append(final_redchi)
             bic_val.append(final_bic)
             
-            fit_statuts_val.append(fit_status)
+            fit_status_val.append(fit_status)
             deblend_val.append(1)                   # multi-Gaussian fit
             cluster_val.append(len(group_indices))  # number of sources in the group
             
@@ -586,18 +600,31 @@ def main(map_name=None, cfg=None, dir_root=None, logger=None, logger_file_only=N
             
     # Assuming you have your WCS object (usually from your FITS header)
     header = map_struct["header"]
-    # Convert pixel coordinates to sky coordinates (RA, Dec)
     x_pixels = np.array(updated_xcen, dtype=np.float64)
     y_pixels = np.array(updated_ycen, dtype=np.float64)
     
     # Initialize WCS from header
     wcs = WCS(header)
-    ra, dec = wcs.wcs_pix2world(x_pixels, y_pixels, 0)
-    ra_save = np.where(ra < 0., ra + 360., ra)
-        
-    skycoords = SkyCoord(ra=ra, dec=dec, unit='deg', frame='icrs')
-    glon = skycoords.galactic.l.deg
-    glat = skycoords.galactic.b.deg
+
+    # Detect coordinate type from header
+    ctype1 = header.get('CTYPE1', '').upper()
+    ctype2 = header.get('CTYPE2', '').upper()
+
+    if 'GLON' in ctype1 and 'GLAT' in ctype2:
+        # Input coordinates are Galactic
+        glon, glat = wcs.wcs_pix2world(x_pixels, y_pixels, 0)
+        # Convert to FK5 (RA/Dec)
+        skycoords = SkyCoord(l=glon, b=glat, unit='deg', frame='galactic')
+        ra = skycoords.fk5.ra.deg
+        dec = skycoords.fk5.dec.deg
+        ra_save = np.where(ra < 0., ra + 360., ra)
+    else:
+        # Assume input coordinates are Equatorial (FK5/ICRS)
+        ra, dec = wcs.wcs_pix2world(x_pixels, y_pixels, 0)
+        ra_save = np.where(ra < 0., ra + 360., ra)
+        skycoords = SkyCoord(ra=ra, dec=dec, unit='deg', frame='fk5')
+        glon = skycoords.galactic.l.deg
+        glat = skycoords.galactic.b.deg
 
 
 ######################## Write Table after photometry ########################
@@ -639,7 +666,7 @@ def main(map_name=None, cfg=None, dir_root=None, logger=None, logger_file_only=N
             "FWHM_1": list(radius_val_1),
             "FWHM_2": list(radius_val_2),
             "PA": list(PA_val),
-            "STATUS": list(fit_statuts_val),
+            "STATUS": list(fit_status_val),
             "GLON": list(glon),
             "GLAT": list(glat),
             "RA": list(ra_save),

{hyper_py_photometry-1.0.0.dist-info → hyper_py_photometry-1.0.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hyper-py-photometry
-Version: 1.0.0
+Version: 1.0.1
 Summary: HYPER: Hybrid Photometry Photometry and Extraction Routine
 Author-email: Alessio Traficante <alessio.traficante@inaf.it>
 Project-URL: Homepage, https://github.com/alessio-traficante/hyper-py

{hyper_py_photometry-1.0.0.dist-info → hyper_py_photometry-1.0.1.dist-info}/RECORD

@@ -4,25 +4,25 @@ hyper_py/bkg_multigauss.py,sha256=SuVlEMkPOccqOuATCaoEBU_WpQARAlHJa2qwAkglHII,22
 hyper_py/bkg_single.py,sha256=stGiZIAFabOW3QHxakA2pJ0__HjgyvcPD2TnB3ARbZc,20269
 hyper_py/config.py,sha256=evafwkxft8YK4vbAjOlBdB796gYd4zNnHt8wJbOabPs,1473
 hyper_py/create_background_slices.py,sha256=VjR_cwRYWFFmEkpcJ8fXcnc6oSAbtY2DPjGWvbs5ecc,6090
-hyper_py/data_output.py,sha256=VKtYPBdez3N2imZFE4Ugwa9JmFFUC28J7XdVFmqhGYE,5532
-hyper_py/detection.py,sha256=wQQ7BHmNzWF2Rlf49jGZ1uT7B6wuZJg4u6WIkz9nIXM,4709
+hyper_py/data_output.py,sha256=ae2pVAfcX3NlIGL-OhLyJz3aEg_w7y5HnGy4QMFfbZY,5527
+hyper_py/detection.py,sha256=Bbcz5FsQnfWPRqxmT8vieGGL7cxmaebPsJ4yj6vXQaE,4716
 hyper_py/extract_cubes.py,sha256=hmfp5MoA5HKOwEduXqmV8uahfBbL479Qr5cC84zT7z0,1643
 hyper_py/fitting.py,sha256=MTw9Yt4LYAybVXM5uI_IgQiT5Maiz_W9EyWqHLEXVkY,26010
 hyper_py/gaussfit.py,sha256=t_LlKd5hJZB1K2fGnZsd6v-q2h-M5XCW214FYjDCFOU,22833
 hyper_py/groups.py,sha256=Q2xQ4MqYR-sRpRhNtayMqTVPMi2rm0ie34mmCDwTbNY,2303
 hyper_py/hyper.py,sha256=574EnlwCXTesCkOK_L3dMMnIo8uU4G1RWj_Tgaz2F7c,6018
 hyper_py/logger.py,sha256=He18tjVOvG7_OVGY6262wj30HExoEa7vCFO6WziHSFk,2864
-hyper_py/map_io.py,sha256=QHYsMFOA1Jzmx-ou_CFHAdRLXl00ynf2dYK8PZGh2CQ,2363
+hyper_py/map_io.py,sha256=4i0G_Hs4IR0GeYTHzPJsu-NAPt-Dd4nNA_mJRNIanwM,2442
 hyper_py/paths_io.py,sha256=fUl0GjwUZLEDXZAUlLK88DB6mBQ_il7fIa-vvKVUxRI,3770
 hyper_py/photometry.py,sha256=4oCRZy8FVjV9BZL5f85LlcNnXuNq0wgtGAm8_cL5f9w,3869
 hyper_py/run_hyper.py,sha256=ed2n7yf8mLATWXtjPxOAs1odiBcUsDsEU4bwDiXd24w,5388
-hyper_py/single_map.py,sha256=YXlMiixK-CLfiFjmLiqP8RkKu6JkekEDjVi-3bQu05w,28831
+hyper_py/single_map.py,sha256=C6bn1sljPMVmzOqpn2QdTdE_BdwH-KYCAlhaXSl0K40,29931
 hyper_py/survey.py,sha256=ymOJk-H4Bf515OwSNFkmODKk7x3MteT6l51ylaYy9Cg,2807
 hyper_py/visualization.py,sha256=AJRuR_Y-_AaZ2NwX1w07lRABV0C2-w8QP1tSqs9_kvk,5662
 hyper_py/assets/default_config.yaml,sha256=64DJtYhwHX6XkbOyuGMmn51WwjK0uJpNafRe8CwkkO4,10616
-hyper_py_photometry-1.0.0.dist-info/licenses/LICENSE,sha256=aB7cqE2-X_8mxy-EmQuVMkKmP8DQA2BnQaqD5k5C5nE,584
-hyper_py_photometry-1.0.0.dist-info/METADATA,sha256=TpIYTRS9Oa_XkVwRJa9GPXvmJsSFrjz0P_-q1z_mE0A,37007
-hyper_py_photometry-1.0.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-hyper_py_photometry-1.0.0.dist-info/entry_points.txt,sha256=0AVwuatL0ri5juy_Ccgt_9Bd4V0McpOrWSSnNX8cCzs,120
-hyper_py_photometry-1.0.0.dist-info/top_level.txt,sha256=Pw-Iuf0SQwcibLdOwx4RkmEas3I6s0Ym_D0_oUnXEr4,9
-hyper_py_photometry-1.0.0.dist-info/RECORD,,
+hyper_py_photometry-1.0.1.dist-info/licenses/LICENSE,sha256=aB7cqE2-X_8mxy-EmQuVMkKmP8DQA2BnQaqD5k5C5nE,584
+hyper_py_photometry-1.0.1.dist-info/METADATA,sha256=5H0bNqXRu52VbLK4odAAx6qTo-jK0AZmF3A7XjpSpig,37007
+hyper_py_photometry-1.0.1.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+hyper_py_photometry-1.0.1.dist-info/entry_points.txt,sha256=0AVwuatL0ri5juy_Ccgt_9Bd4V0McpOrWSSnNX8cCzs,120
+hyper_py_photometry-1.0.1.dist-info/top_level.txt,sha256=Pw-Iuf0SQwcibLdOwx4RkmEas3I6s0Ym_D0_oUnXEr4,9
+hyper_py_photometry-1.0.1.dist-info/RECORD,,

{hyper_py_photometry-1.0.0.dist-info → hyper_py_photometry-1.0.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.9.0)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any