plotastrodata 1.4.3__tar.gz → 1.4.4__tar.gz

{plotastrodata-1.4.3 → plotastrodata-1.4.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: plotastrodata
-Version: 1.4.3
+Version: 1.4.4
 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.4.3 → plotastrodata-1.4.4}/plotastrodata/__init__.py

@@ -1,4 +1,4 @@
 import warnings
 
 warnings.simplefilter('ignore', UserWarning)
-__version__ = '1.4.3'
+__version__ = '1.4.4'

{plotastrodata-1.4.3 → plotastrodata-1.4.4}/plotastrodata/fits_utils.py

@@ -189,33 +189,24 @@ class FitsData:
             pv (bool, optional): Mode for position-velocity diagram. Defaults to False.
         """
         h = self.get_header()
-        # spatial center
-        if center is not None:
-            c0 = xy2coord([h['CRVAL1'], h['CRVAL2']])
-            if 'RADESYS' in h:
-                radesys = h['RADESYS']
-                c0 = f'{radesys}  {c0}'
-            cx, cy = coord2xy(center, c0)
-        else:
-            cx, cy = 0, 0
-        # rest frequency
-        if restfreq is None:
-            if 'RESTFRQ' in h:
-                restfreq = h['RESTFRQ']
-            if 'RESTFREQ' in h:
-                restfreq = h['RESTFREQ']
-        self.x, self.y, self.v = None, None, None
-        self.dx, self.dy, self.dv = None, None, None
         # WCS rotation (Calabretta & Greisen 2002, Astronomy & Astrophysics, 395, 1077)
         self.wcsrot = False
         cdij = ['CD1_1', 'CD1_2', 'CD2_1', 'CD2_2']
         if np.all([s in list(h.keys()) for s in cdij]):
             self.wcsrot = True
             cd11, cd12, cd21, cd22 = [h[s] for s in cdij]
-            cdelt1cdelt2 = cd11 * cd22 - cd12 * cd21
-            sin_2rho = 2 * cd21 * cd22 / cdelt1cdelt2
-            cos_2rho = (cd11 * cd22 + cd12 * cd21) / cdelt1cdelt2
-            crota2 = np.arctan2(sin_2rho, cos_2rho) / 2.
+            if cd21 == 0:
+                rho_a = 0
+            else:
+                rho_a = np.arctan2(np.abs(cd21), np.sign(cd21) * cd11)
+            if cd12 == 0:
+                rho_b = 0
+            else:
+                rho_b = np.arctan2(np.abs(cd12), -np.sign(cd12) * cd22)
+            if (drho := np.abs(np.degrees(rho_a - rho_b))) > 1.0:
+                print('Angles from (CD21, CD11) and (CD12, CD22)'
+                      + f' are different by {drho:.2} degrees.')
+            crota2 = (rho_a + rho_b) / 2.
             sin_rho = np.sin(crota2)
             cos_rho = np.cos(crota2)
             cdelt1 = cd11 * cos_rho + cd21 * sin_rho
@@ -228,6 +219,23 @@ class FitsData:
             del h['CD2_1']
             del h['CD2_2']
             print(f'WCS rotation was found (CROTA2 = {crota2:f} deg).')
+        # spatial center
+        if center is None or self.wcsrot:
+            cx, cy = 0, 0
+        else:
+            c0 = xy2coord([h['CRVAL1'], h['CRVAL2']])
+            if 'RADESYS' in h:
+                radesys = h['RADESYS']
+                c0 = f'{radesys}  {c0}'
+            cx, cy = coord2xy(center, c0)
+        # rest frequency
+        if restfreq is None:
+            if 'RESTFRQ' in h:
+                restfreq = h['RESTFRQ']
+            if 'RESTFREQ' in h:
+                restfreq = h['RESTFREQ']
+        self.x, self.y, self.v = None, None, None
+        self.dx, self.dy, self.dv = None, None, None
 
         def get_list(i: int, crval=False) -> np.ndarray:
             s = np.arange(h[f'NAXIS{i:d}'])

{plotastrodata-1.4.3 → plotastrodata-1.4.4}/plotastrodata.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: plotastrodata
-Version: 1.4.3
+Version: 1.4.4
 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