plotastrodata 1.6.2__tar.gz → 1.6.3.post1__tar.gz

{plotastrodata-1.6.2 → plotastrodata-1.6.3.post1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plotastrodata
-Version: 1.6.2
+Version: 1.6.3.post1
 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
@@ -9,6 +9,7 @@ License: GNU General Public License Version 3
 Keywords: astronomy,FITS,plot
 Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.10
+Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: astropy
 Requires-Dist: corner
@@ -28,6 +29,8 @@ Dynamic: license-file
 
 # plotastrodata
 Python package to make figures from radio astronomical data by astropy and matplotlib.
+The API, examples, and gallery are available in [readthedocs](https://plotastrodata.readthedocs.io/en/latest/).
+The PDF manual is available [here](https://github.com/yusukeaso-astron/plotastrodata/blob/main/plotastrodata_manual.pdf).
 
 
 ## Demo and Usage
@@ -58,7 +61,6 @@ Or directly in your script,
 import  sys
 sys.path.append( "/YOUR_PATH_TO/plotastrodata" )
 ```
-The Sphinx html document is available from docs/_build/index.html or [readthedocs](https://plotastrodata.readthedocs.io/en/latest/).
  
 ## Features
  

{plotastrodata-1.6.2 → plotastrodata-1.6.3.post1}/README.md

@@ -1,5 +1,7 @@
 # plotastrodata
 Python package to make figures from radio astronomical data by astropy and matplotlib.
+The API, examples, and gallery are available in [readthedocs](https://plotastrodata.readthedocs.io/en/latest/).
+The PDF manual is available [here](https://github.com/yusukeaso-astron/plotastrodata/blob/main/plotastrodata_manual.pdf).
 
 
 ## Demo and Usage
@@ -30,7 +32,6 @@ Or directly in your script,
 import  sys
 sys.path.append( "/YOUR_PATH_TO/plotastrodata" )
 ```
-The Sphinx html document is available from docs/_build/index.html or [readthedocs](https://plotastrodata.readthedocs.io/en/latest/).
  
 ## Features
  

{plotastrodata-1.6.2 → plotastrodata-1.6.3.post1}/plotastrodata/__init__.py

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

{plotastrodata-1.6.2 → plotastrodata-1.6.3.post1}/plotastrodata/analysis_utils.py

@@ -346,8 +346,6 @@ class AstroData():
         if (center := self.center) is not None:
             xy = popt[1:3] / 3600
             newcenter = xy2coord(xy, coordorg=center)
-            if len(c := center.split()) == 3:
-                newcenter = f'{c[0]} {newcenter}'
         else:
             newcenter = None
         return {'popt': popt, 'pcov': pcov,

{plotastrodata-1.6.2 → plotastrodata-1.6.3.post1}/plotastrodata/coord_utils.py

@@ -3,41 +3,11 @@ from astropy.coordinates import SkyCoord, FK5, FK4
 from astropy import units
 
 
-def _getframe(coord: str, s: str = '') -> tuple:
-    """Internal function to pick up the frame name from the coordinates.
-
-    Args:
-        coord (str): something like "J2000 01h23m45.6s 01d23m45.6s"
-        s (str, optional): To distinguish coord and coordorg. Defaults to ''.
-
-    Returns:
-        tuple: updated coord and frame. frame is FK5(equinox='J2000), FK4(equinox='B1950'), or 'icrs'.
-    """
-    if len(c := coord.split()) == 3:
-        coord = f'{c[1]} {c[2]}'
-        if 'J2000' in c[0]:
-            frame = FK5(equinox='J2000')
-        elif 'FK5' in c[0]:
-            frame = FK5(equinox='J2000')
-        elif 'B1950' in c[0]:
-            frame = FK4(equinox='B1950')
-        elif 'FK4' in c[0]:
-            frame = FK4(equinox='B1950')
-        elif 'ICRS' in c[0]:
-            frame = 'icrs'
-        else:
-            print(f'Unknown equinox found in coord{s}. ICRS is used')
-            frame = 'icrs'
-    else:
-        frame = None
-    return coord, frame
-
-
 def _updateframe(frame: str) -> str:
     """Internal function to str frame to astropy frame.
 
     Args:
-        frame (str): _description_
+        frame (str): This should be one of 'J2000', 'B1950', 'FK5', 'FK4', and 'ICRS'.
 
     Returns:
         str: frame as is, FK5(equinox='J2000'), FK4(equinox='B1950'), or 'icrs'.
@@ -48,11 +18,41 @@ def _updateframe(frame: str) -> str:
         a = FK5(equinox='J2000')
     elif 'B1950' in frame or 'FK4' in frame:
         a = FK4(equinox='B1950')
+    elif type(frame) is str:
+        print(f'Unknown frame ({frame}) was found. Use ICRS instead.')
+        a = 'icrs'
     else:
         a = frame
     return a
 
 
+def _getframe(coord: str) -> tuple:
+    """Internal function to pick up the frame name from the coordinates. When coord is a list, frame and framename are picked up from the first element.
+
+    Args:
+        coord (str): something like "J2000 01h23m45.6s 01d23m45.6s" or a list of them.
+
+    Returns:
+        tuple: updated coord and frame. frame is FK5(equinox='J2000), FK4(equinox='B1950'), or 'icrs'.
+    """
+    def getframe_single(s: str) -> tuple:
+        c = s.split()
+        hasframe = len(c) == 3
+        hmsdms = f'{c[1]} {c[2]}' if hasframe else s
+        frame = _updateframe(c[0]) if hasframe else None
+        framename = c[0] if hasframe else None
+        return hmsdms, frame, framename
+
+    if type(coord) is str:
+        return getframe_single(coord)
+    else:
+        outlist = [getframe_single(c) for c in coord]
+        hmsdms = [a[0] for a in outlist]
+        frame = outlist[0][1]
+        framename = outlist[0][2]
+        return hmsdms, frame, framename
+
+
 def coord2xy(coords: str | list, coordorg: str = '00h00m00s 00d00m00s',
              frame: str | None = None, frameorg: str | None = None,
              ) -> np.ndarray:
@@ -67,23 +67,18 @@ def coord2xy(coords: str | list, coordorg: str = '00h00m00s 00d00m00s',
     Returns:
         np.ndarray: [(array of) alphas, (array of) deltas] in degree. The shape of alphas and deltas is the input shape. With a single input, the output is [alpha0, delta0].
     """
-    coordorg, frameorg_c = _getframe(coordorg, 'org')
-    frameorg = frameorg_c if frameorg is None else _updateframe(frameorg)
-    if type(coords) is list:
-        for i in range(len(coords)):
-            coords[i], frame_c = _getframe(coords[i])
-    else:
-        coords, frame_c = _getframe(coords)
-    frame = frame_c if frame is None else _updateframe(frame)
-    if frame is None and frameorg is not None:
+    coordorg, frameorg_in, _ = _getframe(coordorg)
+    frameorg = frameorg_in if frameorg is None else _updateframe(frameorg)
+    coords, frame_in, _ = _getframe(coords)
+    frame = frame_in if frame is None else _updateframe(frame)
+    if frame is None:
         frame = frameorg
-    if frame is not None and frameorg is None:
+    elif frameorg is None:
         frameorg = frame
-    if frame is None and frameorg is None:
-        frame = frameorg = 'icrs'
-    clist = SkyCoord(coords, frame=frame)
-    c0 = SkyCoord(coordorg, frame=frameorg)
-    c0 = c0.transform_to(frame=frame)
+    c0 = SkyCoord(coordorg, frame=frameorg)  # frame=None means ICRS.
+    if frame is not None:
+        c0 = c0.transform_to(frame=frame)
+    clist = SkyCoord(coords, frame=frame)  # frame=None means ICRS.
     xy = c0.spherical_offsets_to(clist)
     return np.array([xy[0].degree, xy[1].degree])
 
@@ -102,15 +97,18 @@ def xy2coord(xy: list, coordorg: str = '00h00m00s 00d00m00s',
     Returns:
         str: something like '01h23m45.6s 01d23m45.6s'. With multiple inputs, the output has the input shape.
     """
-    coordorg, frameorg_c = _getframe(coordorg, 'org')
-    frameorg = frameorg_c if frameorg is None else _updateframe(frameorg)
-    if frameorg is None:
-        frameorg = 'icrs'
+    coordorg, frameorg_in, framenameorg = _getframe(coordorg)
+    frameorg = frameorg_in if frameorg is None else _updateframe(frameorg)
+    framename = framenameorg if frame is None else frame
     frame = frameorg if frame is None else _updateframe(frame)
-    c0 = SkyCoord(coordorg, frame=frameorg)
+    c0 = SkyCoord(coordorg, frame=frameorg)  # frame=None means ICRS.
     coords = c0.spherical_offsets_by(*xy * units.degree)
-    coords = coords.transform_to(frame=frame)
-    return coords.to_string('hmsdms')
+    if frame is not None:
+        coords = coords.transform_to(frame=frame)
+    s = coords.to_string('hmsdms')
+    if framename is not None:
+        s = f'{framename} {s}'
+    return s
 
 
 def rel2abs(xrel: float, yrel: float,

{plotastrodata-1.6.2 → plotastrodata-1.6.3.post1}/plotastrodata.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plotastrodata
-Version: 1.6.2
+Version: 1.6.3.post1
 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
@@ -9,6 +9,7 @@ License: GNU General Public License Version 3
 Keywords: astronomy,FITS,plot
 Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.10
+Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: astropy
 Requires-Dist: corner
@@ -28,6 +29,8 @@ Dynamic: license-file
 
 # plotastrodata
 Python package to make figures from radio astronomical data by astropy and matplotlib.
+The API, examples, and gallery are available in [readthedocs](https://plotastrodata.readthedocs.io/en/latest/).
+The PDF manual is available [here](https://github.com/yusukeaso-astron/plotastrodata/blob/main/plotastrodata_manual.pdf).
 
 
 ## Demo and Usage
@@ -58,7 +61,6 @@ Or directly in your script,
 import  sys
 sys.path.append( "/YOUR_PATH_TO/plotastrodata" )
 ```
-The Sphinx html document is available from docs/_build/index.html or [readthedocs](https://plotastrodata.readthedocs.io/en/latest/).
  
 ## Features
  

{plotastrodata-1.6.2 → plotastrodata-1.6.3.post1}/setup.cfg

@@ -4,6 +4,7 @@ author = yusukeaso-astron
 version = attr: plotastrodata.__version__
 description = plotastrodata is a tool for astronomers to create figures from FITS files and perform fundamental data analyses with ease.
 long_description = file: README.md
+long_description_content_type = text/markdown
 keywords = astronomy, FITS, plot
 license = GNU General Public License Version 3
 url = https://github.com/yusukeaso-astron/plotastrodata
@@ -11,9 +12,8 @@ download_url = https://github.com/yusukeaso-astron/plotastrodata
 classifiers = Programming Language :: Python :: 3
 
 [options]
-packages = plotastrodata
+packages = find:
 zip_safe = False
-include_packge_data = True
 python_requires = >=3.10
 install_requires = 
 	astropy