wcs 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d05d7ad45c2129e7f4c6e8b032072ac4d5849f7a
-  data.tar.gz: 34df92539c4c3f9aba2e36e4549f7b828ca9a33f
+  metadata.gz: 89d7dbd8514f7a4f6fd22f306752695a0720b02b
+  data.tar.gz: 2da1e5bf5bb64587115113b4c75bfe4f8411f3e9
 SHA512:
-  metadata.gz: 5b22d2b13f0aea26587f9f1c95126a63581e06aa8f8b8c1c710d56df3868dac53370de273f3ddeae7a251b1034dd11b26ab6a1e0962fb12bea251052e000d572
-  data.tar.gz: 69d5f6852d84c48044a69a9cdd569ebc7b914c01e62fb740103e25825e633b8e082c73c45128980f9b1d408d27ea086136c4501d7d1b5ae0fbcb93df0921b81d
+  metadata.gz: 381d726a63269a6da7cf657fbfcd57366a124e7803b24b74ce0a90806c358f56a8637a71fc74508be64f96eac0929013ed42d87e51e3abea1cc78eb9b7f1d497
+  data.tar.gz: d6a39cec4ae74a70f0db97cc78e9db3124fd5a937e91c756d490aecf7fb35ff432555dc157f379d6e26f4e07d906374dfdae59f2d69dc4b65024179177908299

data/README.md

@@ -1,8 +1,10 @@
 # Ruby/WCS
 
-[WCSTools](http://tdc-www.harvard.edu/wcstools/) wrapper for Ruby.
+Ruby wrapper of [WCSTools](http://tdc-www.harvard.edu/wcstools/) using SWIG.
 Provides calculation and conversion of sky positions in astronomical coordinates.
 
+This is **NOT** [WCSLIB](http://www.atnf.csiro.au/people/mcalabre/WCS/wcslib/) wrapper.
+
 * [GitHub](https://github.com/masa16/ruby-wcs)
 * [RubyGems](https://rubygems.org/gems/wcs)
 * [Class Documentation](http://rubydoc.info/gems/wcs/frames/)
@@ -35,30 +37,37 @@ Provides calculation and conversion of sky positions in astronomical coordinates
 ## Usage
 
     require 'wcs'
-    naxis1  = 100  # Number of pixels along x-axis
-    naxis2  = 100  # Number of pixels along y-axis
-    ctype1  = "RA--TAN" #  FITS WCS projection for axis 1
-    ctype2  = "DEC-TAN" #  FITS WCS projection for axis 2
-    crpix1  = 0    # Reference pixel coordinates
-    crpix2  = 0    # Reference pixel coordinates
-    crval1  = 0    # Coordinate at reference pixel in degrees
-    crval2  = 0    # Coordinate at reference pixel in degrees
-    cd      = nil  # Rotation matrix, used if not NULL
-    cdelt1  = 0.1  # scale in degrees/pixel, if cd is NULL
-    cdelt2  = 0.1  # scale in degrees/pixel, if cd is NULL
-    crota   = 0    # Rotation angle in degrees, if cd is NULL
-    equinox = 2000 # Equinox of coordinates, 1950 and 2000 supported
-    epoch   = 2000 # Epoch of coordinates, for FK4/FK5 conversion
+
+    ra = 0
+    dec = 0
+    l,b = Wcs.wcscon(Wcs::J2000,Wcs::GALACTIC,0,0,ra,dec,2000)
+    #=> [96.33726964987589, -60.188551749437046]
+
+    naxis1  = 100       # Number of pixels along x-axis
+    naxis2  = 100       # Number of pixels along y-axis
+    ctype1  = "RA--TAN" # FITS WCS projection for axis 1
+    ctype2  = "DEC-TAN" # FITS WCS projection for axis 2
+    crpix1  = 0         # Reference pixel coordinates
+    crpix2  = 0         # Reference pixel coordinates
+    crval1  = 0         # Coordinate at reference pixel in degrees
+    crval2  = 0         # Coordinate at reference pixel in degrees
+    cd      = nil       # Rotation matrix, used if not NULL
+    cdelt1  = 0.1       # scale in degrees/pixel, if cd is NULL
+    cdelt2  = 0.1       # scale in degrees/pixel, if cd is NULL
+    crota   = 0         # Rotation angle in degrees, if cd is NULL
+    equinox = 2000      # Equinox of coordinates, 1950 and 2000 supported
+    epoch   = 2000      # Epoch of coordinates, for FK4/FK5 conversion
 
     wcs = Wcs::WorldCoor.new(naxis1,naxis2,ctype1,ctype2,
       crpix1,crpix2,crval1,crval2,cd,cdelt1,cdelt2,
       crota,equinox,epoch)
-    xpix,ypix = wcs.wcs2pix(0.5,0.5)
-    xpos,ypos = wcs.pix2wcs(50,50)
 
-    ra = 0
-    dec = 0
-    l,b = Wcs.wcscon(Wcs::J2000,Wcs::GALACTIC,0,0,ra,dec,2000)
+    xpix,ypix,offscl = wcs.wcs2pix(0.5,0.5)
+    #=> [5.000126927791313, 5.000317324553201, 0]
+
+    xpos,ypos = wcs.pix2wcs(12,34)
+    #=> [1.1998245865308625, 3.395274673610471]
+
 
 ## Platforms tested
 

data/ext/extconf.rb

@@ -7,6 +7,6 @@ require "mkmf"
 
 dir_config("wcs")
 exit unless have_header("wcs/wcs.h")
-exit unless have_library("wcs")
+exit unless have_library("wcs","wcscon")
 $objs = ["wcs_wrap.o"]
 create_makefile("wcs")

data/ext/wcs.i

@@ -415,10 +415,10 @@ typedef int BOOLEAN;
 //        char **header,  /* Pointer to start of FITS header */
 //        char *cwcs);    /* Keyword suffix character for output WCS */
 
-    void savewcscoor(   /* Save output coordinate system */
-        char *wcscoor); /* coordinate system (J2000, B1950, galactic) */
-
-    char *getwcscoor(void); /* Return output coordinate system */
+//    void savewcscoor(   /* Save output coordinate system */
+//        char *wcscoor); /* coordinate system (J2000, B1950, galactic) */
+//
+//    char *getwcscoor(void); /* Return output coordinate system */
 
 
     /* Coordinate conversion subroutines in wcscon.c */

data/lib/wcs/libdoc.rb

@@ -122,11 +122,11 @@ class WorldCoor
 
   # Return image center and size in RA and Dec
   #
-  # @return [[cra,cdec,ora,odec]]
+  # @return [[cra,cdec,hwra,hwdec]]
   #  * cra:   Right ascension of image center (deg)
   #  * cdec:  Declination of image center (deg)
-  #  * dra:   Half-width in right ascension (deg)
-  #  * ddec:  Half-width in declination (deg)
+  #  * hwra:   Half-width in right ascension (deg)
+  #  * hwdec:  Half-width in declination (deg)
   def wcssize
     # This function is defined in C
   end
@@ -165,6 +165,7 @@ class WorldCoor
   # @param [Float] cdelt1  degrees/pixel in first axis (or both axes)
   # @param [Float] cdelt2  degrees/pixel in second axis if nonzero
   # @param [Array] pc  Rotation matrix, ignored if NULL
+  # @return [nil]
   def wcspcset(cdelt1,cdelt2,pc)
     # This function is defined in C
   end
@@ -303,7 +304,7 @@ class WorldCoor
   # Set third dimension for cube projections
   #
   # @param [Integer] izpix  Set coordinate in third dimension (face)
-  # @return [Integer]
+  # @return [Integer] saved izpix
   def wcszin(izpix)
     # This function is defined in C
   end
@@ -317,24 +318,24 @@ class WorldCoor
   end
 
 
-  # Save output coordinate system
-  #
-  # @param [String] wcscoor  coordinate system (J2000, B1950, galactic)
-  # @return [nil]
-  def savewcscoor(wcscoor)
-    # This function is defined in C
-  end
-
-  # Return output coordinate system
-  # @return [String]
-  def getwcscoor
-  end
+#  # Save output coordinate system
+#  #
+#  # @param [String] wcscoor  coordinate system (J2000, B1950, galactic)
+#  # @return [nil]
+#  def savewcscoor(wcscoor)
+#    # This function is defined in C
+#  end
+#
+#  # Return output coordinate system
+#  # @return [String]
+#  def getwcscoor
+#  end
 
   # Convert from coordinate system sys1 to coordinate system sys2, converting
   # proper motions, too, and adding them if an epoch is specified
   #
-  # @param [Integer] sys1  Input coordinate system (J2000, B1950, ECLIPTIC, GALACTIC
-  # @param [Integer] sys2  Output coordinate system (J2000, B1950, ECLIPTIC, G ALACTIC
+  # @param [Integer] sys1  Input coordinate system (J2000, B1950, ECLIPTIC, GALACTIC)
+  # @param [Integer] sys2  Output coordinate system (J2000, B1950, ECLIPTIC, GALACTIC)
   # @param [Float] eq1  Input equinox (default of sys1 if 0.0)
   # @param [Float] eq2  Output equinox (default of sys2 if 0.0)
   # @param [Float] ep1  Input Besselian epoch in years
@@ -359,8 +360,8 @@ class WorldCoor
   # Convert from coordinate system sys1 to coordinate system sys2, converting
   # proper motions, too, and adding them if an epoch is specified
   #
-  # @param [Integer] sys1   Input coordinate system (J2000, B1950, ECLIPTIC, GALACTIC
-  # @param [Integer] sys2   Output coordinate system (J2000, B1950, ECLIPTIC, GALACTIC
+  # @param [Integer] sys1   Input coordinate system (J2000, B1950, ECLIPTIC, GALACTIC)
+  # @param [Integer] sys2   Output coordinate system (J2000, B1950, ECLIPTIC, GALACTIC)
   # @param [Float] eq1    Input equinox (default of sys1 if 0.0)
   # @param [Float] eq2    Output equinox (default of sys2 if 0.0)
   # @param [Float] ep1    Input Besselian epoch in years (for proper motion)
@@ -379,8 +380,8 @@ class WorldCoor
 
   # Convert between coordinate systems and equinoxes
   #
-  # @param [Integer] sys1  Input coordinate system (J2000, B1950, ECLIPTIC, GALACTIC
-  # @param [Integer] sys2  Output coordinate system (J2000, B1950, ECLIPTIC, G ALACTIC
+  # @param [Integer] sys1  Input coordinate system (J2000, B1950, ECLIPTIC, GALACTIC)
+  # @param [Integer] sys2  Output coordinate system (J2000, B1950, ECLIPTIC, GALACTIC)
   # @param [Float] eq1  Input equinox (default of sys1 if 0.0)
   # @param [Float] eq2  Output equinox (default of sys2 if 0.0)
   # @param [Float] dtheta  Longitude or right ascension in degrees

data/lib/wcs/version.rb

@@ -1,3 +1,3 @@
 module Wcs
-  VERSION="0.1.1"
+  VERSION="0.1.2"
 end

data/spec/wcs_spec.rb

@@ -406,20 +406,20 @@ describe "Wcs" do
   end
 
 
-  # Save output coordinate system
-  #
-  # @param [String] wcscoor  coordinate system (J2000, B1950, galactic)
-  # @return [String]
-  wcscoor = 'J2000'
-  describe Wcs.savewcscoor(wcscoor) do
-    it{should == ''}
-  end
-
-  # Return output coordinate system
-  # @return [String]
-  describe Wcs.getwcscoor do
-    it{should == 'J2000'}
-  end
+#  # Save output coordinate system
+#  #
+#  # @param [String] wcscoor  coordinate system (J2000, B1950, galactic)
+#  # @return [String]
+#  wcscoor = 'J2000'
+#  describe Wcs.savewcscoor(wcscoor) do
+#    it{should == ''}
+#  end
+#
+#  # Return output coordinate system
+#  # @return [String]
+#  describe Wcs.getwcscoor do
+#    it{should == 'J2000'}
+#  end
 
   # Convert from coordinate system sys1 to coordinate system sys2, converting
   # proper motions, too, and adding them if an epoch is specified

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wcs
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Masahiro TANAKA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-23 00:00:00.000000000 Z
+date: 2013-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler