Changeset 652

Timestamp:

09/29/08 13:31:05 (2 months ago)

Author:

mdroe

Message:

Minor code/documentation cleanup.

Files:

• trunk/pywcs/doc/docstrings.py (modified) (1 diff)
• trunk/pywcs/pywcs/__init__.py (modified) (1 diff)
• trunk/pywcs/pywcs/pywcs.py (modified) (7 diffs)
• trunk/pywcs/setup.py (modified) (3 diffs)
• trunk/pywcs/src/pywcs.c (modified) (1 diff)
• trunk/pywcs/src/sip_wrap.c (modified) (3 diffs)

trunk/pywcs/doc/docstrings.py

@@ -890 +890 @@
-"""
-
-pywcs = """
-Pywcs provides transformations following the SIP conventions, Paper IV
-table lookup distortion, and the core WCS functionality provided by
-wcslib.  Each of these transformations can be used independently or
-together in a standard pipeline.
-
-The basic workflow is as follows:
-
-    1. C{import pywcs}
-
-    2. Call the C{pywcs.WCS} constructor with a PyFITS header object.
-
-    3. Optionally, if the FITS file uses any deprecated or
-       non-standard features, you may need to call one of the C{fix}
-       methods on the object.
-
-    4. Use one of the following transformation methods:
-
-       - all_pix2sky: Perform all three transformations from pixel to
-         sky coords.
-
-       - wcs_pix2sky: Perform just the core WCS transformation from
-         pixel to sky coords.
-
-       - wcs_sky2pix: Perform just the core WCS transformation from
-         sky to pixel coords.
-
-       - sip_pix2foc: Convert from pixel to focal plane coords using
-         the SIP polynomial coefficients.
-
-       - sip_foc2pix: Convert from focal plane to pixel coords using
-         the SIP polynomial coefficients.
-
-       - p4_pix2foc: Convert from pixel to focal plane coords using
-         the table lookup distortion method described in Paper IV.
-"""
-
-radesys = """
-The equatorial or ecliptic coordinate system type, C{RADESYSa}.

trunk/pywcs/pywcs/__init__.py

@@ -42 +42 @@
-
-from pywcs import *
+import pywcs
-import _pywcs
-
-_
+

trunk/pywcs/pywcs/pywcs.py

@@ -1 @@
-
-
+
+
+
-# Redistribution and use in source and binary forms, with or without
-
-
-
-
-
+
+
+
+
+
+
+
-#     2. Redistributions in binary form must reproduce the above
-#       copyright notice, this list of conditions and the following
- provided
-
-
+
+provided 
+
-#     3. The name of AURA and its representatives may not be used to
-#       endorse or promote products derived from this software without
-#       specific prior written permission.
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-__docformat__ = "epytext"
@@ -40 +79 @@
-DistortionLookupTable = _pywcs.DistortionLookupTable
-Sip = _pywcs.Sip
+Wcsprm = _pywcs._Wcsprm
-
-# A wrapper around the C WCS type
-class WCS(WCSBase):
+    """
+    WCS objects correct for SIP and Paper IV table-lookup distortions
+    and transform pixel to/from sky coordinates, based on the WCS
+    keywords and data in a FITS file.
+    """
+
-    def __init__(self, header=None, fobj=None, key=' ', relax=False, naxis=2):
-        """
-        WCS(header=None, fobj=None, key=' ', relax=False, naxis=2)
-
-        WCS objects correct for SIP and Paper IV table-lookup
-        distortions and transform pixel to/from sky coordinates, based
-        on the WCS keywords and data in a FITS file.
-
-        @param header: A PyFITS header object.  If header is not
@@ -86 +128 @@
-        """
-        if naxis != 2:
-;
+
-        self.naxis = naxis
-
-        if header is None:
-
+
+
-            # Set some reasonable defaults.
-            wcsprm.crpix = numpy.zeros((self.naxis,), numpy.double)
@@ -114 +157 @@
-        """
-        if dist == 'CPDIS':
-
+ 
-        else:
-            d_kw = 'DQ'
@@ -125 +168 @@
-                if dis == 'lookup':
-                    assert isinstance(fobj, pyfits.NP_pyfits.HDUList), \
-    
+
-                    dp = d_kw+str(i)
-                    d_extver = header[dp+'.EXTVER']
@@ -133 +176 @@
-                    d_crval = (d_header['CRVAL1'], d_header['CRVAL2'])
-                    d_cdelt = (d_header['CDELT1'], d_header['CDELT2'])
-
+
+
-                    tables[i] = d_lookup
-                else:
@@ -335 +379 @@
-        if self.wcs is None:
-            raise ValueError("No basic WCS settings were created.")
-
+
+
-    wcs_sky2pix_fits.__doc__ = """
-        wcs_sky2pix_fits(*args) -> pixel

trunk/pywcs/setup.py

@@ -32 +32 @@
-except ImportError:
-    print "WARNING: PyFITS must be installed to use pywcs."
-
+
+
-
-######################################################################
@@ -111 +112 @@
-fd.write("""/* This file is autogenerated by setup.py.  To edit its contents
-   edit doc/docstrings.py
-
+
+
+
-for key in keys:
-    if key.startswith('__'):
@@ -158 +161 @@
-                  undef_macros=undef_macros
-                  )
-
+  
-      )

trunk/pywcs/src/pywcs.c

@@ -562 +562 @@
-  PyObject* m;
-
-doc_pywcs
+NULL
-
-  if (m == NULL)

trunk/pywcs/src/sip_wrap.c

@@ -97 +97 @@
-  }
-
-
+
+
-  if (crpix == NULL) {
-    result = -1;
@@ -314 +315 @@
-PySip_get_bp_order(PySip* self, void* closure) {
-  return get_int("bp_order", self->x.bp_order);
+}
+
+static PyObject*
+PySip_get_crpix(PySip* self, void* closure) {
+  Py_ssize_t naxis = 2;
+
+  return get_double_array("crpix", self->x.crpix, 1, &naxis, (PyObject*)self);
-}
-
@@ -325 +333 @@
-  {"bp", (getter)PySip_get_bp, NULL, (char *)doc_bp},
-  {"bp_order", (getter)PySip_get_bp_order, NULL, (char *)doc_bp_order},
+  {"crpix", (getter)PySip_get_crpix, NULL, (char *)doc_crpix},
-  {NULL}
-};