plotastrodata 1.0.5.post2__tar.gz → 1.0.7__tar.gz

{plotastrodata-1.0.5.post2 → plotastrodata-1.0.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: plotastrodata
-Version: 1.0.5.post2
+Version: 1.0.7
 Summary: plotastrodata is a tool for astronomers to create figures from FITS files and perform fundamental data analyses with ease.
 Home-page: https://github.com/yusukeaso-astron/plotastrodata
 Download-URL: https://github.com/yusukeaso-astron/plotastrodata

{plotastrodata-1.0.5.post2 → plotastrodata-1.0.7}/plotastrodata/__init__.py

@@ -1,4 +1,4 @@
 import warnings
 
 warnings.simplefilter('ignore', UserWarning)
-__version__ = '1.0.5-2'
+__version__ = '1.0.7'

{plotastrodata-1.0.5.post2 → plotastrodata-1.0.7}/plotastrodata/analysis_utils.py

@@ -3,11 +3,11 @@ from dataclasses import dataclass
 from scipy.interpolate import RegularGridInterpolator as RGI
 from scipy.optimize import curve_fit
 from scipy.signal import convolve
-from astropy import constants
 
 from plotastrodata.other_utils import (coord2xy, rel2abs, estimate_rms, trim,
                                        Mfac, Mrot, dot2d, gaussian2d)
 from plotastrodata.fits_utils import FitsData, data2fits, Jy2K
+from plotastrodata import const_utils as cu
 
 
 def to4dim(data: np.ndarray) -> np.ndarray:
@@ -510,11 +510,10 @@ class AstroData():
         h['CRVAL2'] = cy
         h['CDELT2'] = (self.y[1] - self.y[0]) / 3600
         if self.v is not None:
-            clight = constants.c.to('km*s**(-1)').value
             h['NAXIS3'] = len(self.v)
             h['CRPIX3'] = i = np.argmin(np.abs(self.v)) + 1
-            h['CRVAL3'] = (1 - self.v[i]/clight) * self.restfreq
-            h['CDELT3'] = (self.v[0]-self.v[1]) / clight * self.restfreq
+            h['CRVAL3'] = (1 - self.v[i]/cu.c_kms) * self.restfreq
+            h['CDELT3'] = (self.v[0]-self.v[1]) / cu.c_kms * self.restfreq
         if None not in self.beam:
             h['BMAJ'] = self.beam[0] / 3600
             h['BMIN'] = self.beam[1] / 3600

{plotastrodata-1.0.5.post2 → plotastrodata-1.0.7}/plotastrodata/const_utils.py

@@ -81,3 +81,4 @@ quecto = 1e-30
 # Others
 mumol = 2.37 * m_p  # kg; Kauffmann et al. 2008, for sound speed
 muH2 = 2.8 * m_p  # kg; Kauffmann et al. 2008, for mass-H2 conversion
+c_kms = constants.c.to('km*s**(-1)').value

{plotastrodata-1.0.5.post2 → plotastrodata-1.0.7}/plotastrodata/fits_utils.py

@@ -1,8 +1,9 @@
 import numpy as np
 from astropy.io import fits
-from astropy import constants, units, wcs
+from astropy import units, wcs
 
 from plotastrodata.other_utils import coord2xy, xy2coord, estimate_rms, trim
+from plotastrodata import const_utils as cu
 
 
 def Jy2K(header=None, bmaj: float | None = None, bmin: float | None = None,
@@ -216,10 +217,38 @@ class FitsData:
                 print('restfreq is assumed to be the center.')
             else:
                 freq = restfreq
-            if freq == 0:
-                print('v is frequency because restfreq=0.')
-            else:
-                s = (1 - s / freq) * constants.c.to('km*s**(-1)').value - vsys
+
+            vaxis = '2' if pv else '3'
+            key = f'CUNIT{vaxis}'
+            cunitv = h[key]
+            match cunitv:
+                case 'Hz':
+                    if freq == 0:
+                        print('v is frequency because restfreq=0.')
+                    else:
+                        s = (1 - s / freq) * cu.c_kms - vsys
+                case 'HZ':
+                    if freq == 0:
+                        print('v is frequency because restfreq=0.')
+                    else:
+                        s = (1 - s / freq) * cu.c_kms - vsys
+                case 'm/s':
+                    print(f'{key}=\'m/s\' was found.')
+                    s = s * 1e-3 - vsys
+                case 'M/S':
+                    print(f'{key}=\'M/S\' was found.')
+                    s = s * 1e-3 - vsys
+                case 'km/s':
+                    print(f'{key}=\'km/s\' was found.')
+                    s = s - vsys
+                case 'KM/S':
+                    print(f'{key}=\'KM/S\' was found.')
+                    s = s - vsys
+                case _:
+                    print(f'Unknown CUNIT3 {cunitv} was found.'
+                          + ' v is read as is.')
+                    s = s - vsys
+            
             self.v, self.dv = s, s[1] - s[0]
 
         if h['NAXIS'] > 0 and h['NAXIS1'] > 1:

{plotastrodata-1.0.5.post2 → plotastrodata-1.0.7}/plotastrodata.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: plotastrodata
-Version: 1.0.5.post2
+Version: 1.0.7
 Summary: plotastrodata is a tool for astronomers to create figures from FITS files and perform fundamental data analyses with ease.
 Home-page: https://github.com/yusukeaso-astron/plotastrodata
 Download-URL: https://github.com/yusukeaso-astron/plotastrodata