Last active
August 29, 2015 14:08
-
-
Save sargas/654a6dc7f7b3d57a6464 to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| commit fd0775d4e448fa377163ebd23168211281f7836b | |
| Author: Joseph Jon Booker <[email protected]> | |
| Date: Thu Oct 30 14:08:07 2014 -0400 | |
| Remove dead code | |
| Got rid of a function by using astropy.extern.six | |
| Removed a fix_header function that appears superfluous | |
| diff --git a/pyregion/region_numbers.py b/pyregion/region_numbers.py | |
| index 25d421a..a8cb622 100644 | |
| --- a/pyregion/region_numbers.py | |
| +++ b/pyregion/region_numbers.py | |
| @@ -13,18 +13,9 @@ def _unsigned_simple_number(): | |
| return fnumber # .setParseAction(lambda s,l,t: (float(t[0]), t[0])) | |
| # return fnumber.leaveWhitespace().setParseAction(lambda s,l,t: [ float(t[0])]) | |
| -# simple_number = _simple_number() | |
| - | |
| usn = _unsigned_simple_number() | |
| -def getSign(s, l, tok): | |
| - if not tok: return (1, "") | |
| - if tok[0] == "-": | |
| - return -1, "-" | |
| - else: | |
| - return 1, "+" | |
| - | |
| def get_default(v): | |
| def _f(s, l, tok): | |
| @@ -34,7 +25,6 @@ def get_default(v): | |
| return _f | |
| optional_sign = Optional(Literal("+") | Literal("-")).setParseAction(get_default("")) | |
| -# optional_sign = Optional(Literal("+") | Literal("-")) #.setParseAction(getSign) | |
| class SimpleNumber(object): | |
| @@ -80,10 +70,6 @@ def _unsigned_integer(): | |
| simple_integer = _unsigned_integer() | |
| -def get_degree(s, l, tok): | |
| - pass | |
| - | |
| - | |
| class Sixty(object): | |
| def __init__(self, sn, d, m, s): | |
| self.v = sn * (d +(m + s/60.)/60.) | |
| diff --git a/pyregion/tests/test_get_mask.py b/pyregion/tests/test_get_mask.py | |
| index a4ced35..779d9c1 100644 | |
| --- a/pyregion/tests/test_get_mask.py | |
| +++ b/pyregion/tests/test_get_mask.py | |
| @@ -5,7 +5,6 @@ from astropy.io.fits import Header | |
| import numpy as np | |
| -from ..wcs_helper import fix_lon | |
| from .. import open as pyregion_open | |
| from .. import get_mask | |
| diff --git a/pyregion/wcs_helper.py b/pyregion/wcs_helper.py | |
| index 9132547..86a6b26 100644 | |
| --- a/pyregion/wcs_helper.py | |
| +++ b/pyregion/wcs_helper.py | |
| @@ -6,16 +6,7 @@ from astropy.io.fits import Header | |
| from .kapteyn_celestial import skymatrix, longlat2xyz, dotrans, xyz2longlat | |
| from . import kapteyn_celestial | |
| - | |
| -if sys.version < '3': | |
| - def as_str(x): | |
| - return x | |
| -else: | |
| - def as_str(x): | |
| - if hasattr(x, "decode"): | |
| - return x.decode() | |
| - else: | |
| - return x | |
| +from astropy.extern import six | |
| _pattern_ra = re.compile(r"^RA") | |
| _pattern_dec = re.compile(r"^DEC") | |
| @@ -43,29 +34,12 @@ UnknownWcs = "unknown wcs" | |
| image_like_coordformats = ["image", "physical", "detector", "logical"] | |
| -def is_equal_coord_sys(src, dest): | |
| - return (src.lower() == dest.lower()) | |
| - | |
| - | |
| -def is_string_like(obj): | |
| - 'Return True if *obj* looks like a string' | |
| - import sys | |
| - if sys.version_info >= (3, 0): | |
| - if isinstance(obj, str): return True | |
| - else: | |
| - if isinstance(obj, (str, unicode)): return True | |
| - try: obj + '' | |
| - except: return False | |
| - return True | |
| - | |
| - | |
| class sky2sky(object): | |
| def __init__(self, src, dest): | |
| - | |
| - if is_string_like(src): | |
| + if isinstance(src, six.string_types): | |
| src = coord_system[src.lower()] | |
| - if is_string_like(dest): | |
| + if isinstance(dest, six.string_types): | |
| dest = coord_system[dest.lower()] | |
| self.src = src | |
| @@ -111,39 +85,6 @@ def coord_system_guess(ctype1_name, ctype2_name, equinox): | |
| return None | |
| -def fix_header(header): | |
| - "return a new fixed header" | |
| - | |
| - if hasattr(header, "cards"): | |
| - old_cards = header.cards | |
| - else: | |
| - old_cards = header.ascardlist() | |
| - | |
| - new_cards = [] | |
| - | |
| - from operator import attrgetter | |
| - if old_cards and hasattr(old_cards[0], "keyword"): | |
| - get_key = attrgetter("keyword") | |
| - else: | |
| - get_key = attrgetter("key") | |
| - | |
| - for c in old_cards: | |
| - key = get_key(c) | |
| - | |
| - # ignore comments and history | |
| - if key in ["COMMENT", "HISTORY"]: | |
| - continue | |
| - | |
| - # use "deg" | |
| - if key.startswith("CUNIT") and c.value.lower().startswith("deg"): | |
| - c = type(c)(key, "deg") | |
| - | |
| - new_cards.append(c) | |
| - | |
| - h = type(header)(new_cards) | |
| - return h | |
| - | |
| - | |
| def fix_lon(lon, lon_ref): | |
| lon_ = lon - lon_ref | |
| lon2 = lon_ - 360*np.floor_divide(lon_, 360.) | |
| @@ -220,10 +161,6 @@ class _ProjectionSubInterface: | |
| proj_sub = ProjectionPywcsSub(self, axis_nums_to_keep, ref_pixel) | |
| return proj_sub | |
| - def sub(self, axes): | |
| - axis_nums_to_keep = [i-1 for i in axes] | |
| - return self.substitute(axis_nums_to_keep, [0] * self.naxis) | |
| - | |
| class ProjectionPywcsNd(_ProjectionSubInterface, ProjectionBase): | |
| """ | |
| @@ -235,9 +172,7 @@ class ProjectionPywcsNd(_ProjectionSubInterface, ProjectionBase): | |
| """ | |
| if isinstance(header, Header): | |
| - header = fix_header(header) | |
| self._pywcs = WCS(header=header) | |
| - | |
| elif isinstance(header, WCS): | |
| self._pywcs = header | |
| else: | |
| @@ -247,7 +182,7 @@ class ProjectionPywcsNd(_ProjectionSubInterface, ProjectionBase): | |
| ProjectionBase.__init__(self) | |
| def _get_ctypes(self): | |
| - return tuple(as_str(s) for s in self._pywcs.wcs.ctype) | |
| + return tuple(self._pywcs.wcs.ctype) | |
| ctypes = property(_get_ctypes) | |
| @@ -320,7 +255,6 @@ class ProjectionPywcsSub(_ProjectionSubInterface, ProjectionBase): | |
| equinox = property(_get_equinox) | |
| def _get_naxis(self): | |
| - # return self.proj.naxis - self._nsub | |
| return self._nsub | |
| naxis = property(_get_naxis) | |
| @@ -364,183 +298,18 @@ class ProjectionPywcsSub(_ProjectionSubInterface, ProjectionBase): | |
| xyz2 = self.proj.toworld(np.asarray(xyz)) | |
| xyz2r = [xyz2[i] for i in self._axis_nums_to_keep] | |
| - # fixme | |
| - # xyz2r[0] = self._fix_lon(xyz2r[0]) | |
| - | |
| return xyz2r | |
| -class ProjectionPywcs(ProjectionBase): | |
| - """ | |
| - A wrapper for WCS | |
| - """ | |
| - def __init__(self, header): | |
| - if isinstance(header, Header): | |
| - self._pywcs = WCS(header=header) | |
| - else: | |
| - self._pywcs = header | |
| - ProjectionBase.__init__(self) | |
| - | |
| - def _get_ctypes(self): | |
| - return tuple(as_str(s) for s in self._pywcs.wcs.ctype) | |
| - | |
| - ctypes = property(_get_ctypes) | |
| - | |
| - def _get_equinox(self): | |
| - return self._pywcs.wcs.equinox | |
| - | |
| - equinox = property(_get_equinox) | |
| - | |
| - def topixel(self, xy): | |
| - """ 1, 1 base """ | |
| - xy2 = self._pywcs.wcs_world2pix(np.asarray(xy).T, 1) | |
| - return xy2.T[:2] | |
| - | |
| - def toworld(self, xy): | |
| - """ 1, 1 base """ | |
| - xy2 = self._pywcs.wcs_pix2world(np.asarray(xy).T, 1) | |
| - return xy2.T[:2] | |
| - | |
| - def sub(self, axes): | |
| - wcs = self._pywcs.sub(axes=axes) | |
| - return ProjectionPywcs(wcs) | |
| - | |
| - | |
| -class ProjectionSimple(ProjectionBase): | |
| - """ | |
| - A wrapper for WCS | |
| - """ | |
| - def __init__(self, header): | |
| - ProjectionBase.__init__(self) | |
| - self._pywcs = WCS(header=header) | |
| - self._simple_init(header) | |
| - | |
| - def _get_ctypes(self): | |
| - return tuple(as_str(s) for s in self._pywcs.wcs.ctype) | |
| - | |
| - ctypes = property(_get_ctypes) | |
| - | |
| - def _get_equinox(self): | |
| - return self._pywcs.wcs.equinox | |
| - | |
| - equinox = property(_get_equinox) | |
| - | |
| - def _get_naxis(self): | |
| - return self._pywcs.wcs.naxis | |
| - | |
| - naxis = property(_get_naxis) | |
| - | |
| - def _simple_init(self, header): | |
| - self.crpix1 = header["CRPIX1"] | |
| - self.crval1 = header["CRVAL1"] | |
| - self.cdelt1 = header["CDELT1"] | |
| - | |
| - self.crpix2 = header["CRPIX2"] | |
| - self.crval2 = header["CRVAL2"] | |
| - self.cdelt2 = header["CDELT2"] | |
| - | |
| - self.cos_phi = np.cos(self.crval2/180.*np.pi) | |
| - | |
| - def _simple_to_pixel(self, lon, lat): | |
| - lon, lat = np.asarray(lon), np.asarray(lat) | |
| - | |
| - lon = self._fix_lon(lon) | |
| - | |
| - x = (lon - self.crval1)/self.cdelt1*self.cos_phi + self.crpix1 | |
| - y = (lat - self.crval2)/self.cdelt2 + self.crpix2 | |
| - | |
| - return x, y | |
| - | |
| - def _simple_to_world(self, x, y): | |
| - x, y = np.asarray(x), np.asarray(y) | |
| - lon = (x - self.crpix1)*self.cdelt1/self.cos_phi + self.crval1 | |
| - lat = (y - self.crpix2)*self.cdelt2 + self.crval2 | |
| - | |
| - lon = self._fix_lon(lon) | |
| - | |
| - return lon, lat | |
| - | |
| - def topixel(self, xy): | |
| - """ 1, 1 base """ | |
| - lon, lat = xy[0], xy[1] | |
| - x, y = self._simple_to_pixel(lon, lat) | |
| - return np.array([x, y]) | |
| - | |
| - def toworld(self, xy): | |
| - """ 1, 1 base """ | |
| - x, y = xy[0], xy[1] | |
| - lon, lat = self._simple_to_world(x, y) | |
| - return np.array([lon, lat]) | |
| - | |
| - def substitute(self, axis_nums, values): | |
| - return self | |
| - | |
| - def sub(self, axis_nums): | |
| - return self | |
| - | |
| - # def sub(self, axes): | |
| - # wcs = self._pywcs.sub(axes=axes) | |
| - # return ProjectionPywcs(wcs) | |
| - | |
| - | |
| -ProjectionDefault = ProjectionPywcsNd | |
| - | |
| - | |
| def get_kapteyn_projection(header): | |
| if isinstance(header, ProjectionBase): | |
| projection = header | |
| else: | |
| projection = ProjectionPywcsNd(header) | |
| - # projection = projection.sub(axes=[1,2]) | |
| return projection | |
| -def estimate_cdelt_trans(transSky2Pix, x0, y0): | |
| - | |
| - transPix2Sky = transSky2Pix.inverted() | |
| - | |
| - lon0, lat0 = transPix2Sky.transform_point((x0, y0)) | |
| - | |
| - lon1, lat1 = transPix2Sky.transform_point((x0+1, y0)) | |
| - dlon = (lon1-lon0)*np.cos(lat0/180.*np.pi) | |
| - dlat = (lat1 - lat0) | |
| - cd1 = (dlon**2 + dlat**2)**.5 | |
| - | |
| - lon2, lat2 = transPix2Sky.transform_point((x0, y0+1)) | |
| - dlon = (lon2-lon0)*np.cos(lat0/180.*np.pi) | |
| - dlat = (lat2-lat0) | |
| - cd2 = (dlon**2 + dlat**2)**.5 | |
| - | |
| - return (cd1*cd2)**.5 | |
| - | |
| - | |
| -def estimate_angle_trans(transSky2Pix, x0, y0): | |
| - """ | |
| - return a tuple of two angles (in degree) of increasing direction | |
| - of 1st and 2nd coordinates. | |
| - | |
| - note that x, y = wcs_proj.topixel(sky_to_sky((l1, l2))) | |
| - | |
| - """ | |
| - | |
| - cdelt = estimate_cdelt_trans(transSky2Pix, x0, y0) | |
| - | |
| - transPix2Sky = transSky2Pix.inverted() | |
| - | |
| - lon0, lat0 = transPix2Sky.transform_point((x0, y0)) | |
| - | |
| - x1, y1 = transSky2Pix.transform_point((lon0 + cdelt*np.cos(lat0/180.*np.pi), | |
| - lat0)) | |
| - | |
| - x2, y2 = transSky2Pix.transform_point((lon0, lat0+cdelt)) | |
| - | |
| - a1 = np.arctan2(y1-y0, x1-x0)/np.pi*180. | |
| - a2 = np.arctan2(y2-y0, x2-x0)/np.pi*180. | |
| - | |
| - return a1, a2 | |
| - | |
| - | |
| def estimate_cdelt(wcs_proj, x0, y0): | |
| lon0, lat0 = wcs_proj.toworld(([x0], [y0])) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment