From 5a332c5a21c4f8613cc2c5e407bf6e46f4827818 Mon Sep 17 00:00:00 2001 From: William Joye Date: Thu, 3 Jan 2019 17:29:16 -0500 Subject: hot fix --- ds9/doc/ref/command.html | 1189 +++++++----------- ds9/doc/ref/samp.html | 1469 ++++++++-------------- ds9/doc/ref/xpa.html | 1674 +++++++++---------------- ds9/doc/release/r8.0.html | 6 + ds9/library/ds9.tcl | 2 +- ds9/macos/SAOImageDS9.app/Contents/Info.plist | 6 +- ds9/make.include | 2 + ds9/parsers/pslex.fcl | 3 + ds9/parsers/psparser.tac | 6 + ds9/parsers/scalesendparser.tac | 2 +- ds9/parsers/tileparser.tac | 2 +- ds9/parsers/viewparser.tac | 2 +- ds9/win/ds9.rc | 2 +- make.include | 2 +- 14 files changed, 1617 insertions(+), 2750 deletions(-) diff --git a/ds9/doc/ref/command.html b/ds9/doc/ref/command.html index 2b84c66..c26bac8 100644 --- a/ds9/doc/ref/command.html +++ b/ds9/doc/ref/command.html @@ -14,15 +14,12 @@ align="middle"> Command Line Options

DS9 will process each command line option, one at a time, as - the - last step in the initialization process. Therefore, it is - possible - to use command line options as a little script. For example, the - following command line option is used:

+ the last step in the initialization process. Therefore, it is + possible to use command line options as a little script. For + example, the following command line option is used:

$ds9 -tile foo.fits -cmap Heat -zscale bar.fits -cmap I8

First DS9 is put in tile mode, then foo.fits is - loaded. - Then the colormap for foo.fits is changed to Heat + loaded. Then the colormap for foo.fits is changed to Heat and the scale changed to zscale. Next, bar.fits is loaded and the colormap for bar.fits is changed to I8.

@@ -159,11 +156,9 @@ Syntax:
-2mass []
       [<object>]
-        [name - <object>|clear]
+        [name <object>|clear]
       [<ra> <dec>] # - in - wcs fk5
+ in wcs fk5
       [size <width> <height> degrees|arcmin|arcsec]
       [save yes|no]
@@ -176,10 +171,8 @@ $ds9 -2mass
$ds9 -2mass m31
 $ds9 -2mass name m31
- - $ds9 -2mass name clear
- $ds9 -2mass - 00:42:44.404 +41:16:08.78
+ $ds9 -2mass name clear
+ $ds9 -2mass 00:42:44.404 +41:16:08.78
$ds9 -2mass size 60 60 arcmin
$ds9 -2mass save yes
$ds9 -2mass frame current
@@ -197,21 +190,16 @@     [el <el>]
    [scale <scale>]
    [method mip|aip]
-     [background - none|azimuth|elevation]
-     - [border yes|no]
+     [background none|azimuth|elevation]
+     [border yes|no]
    [border color]
-     - [highlite yes|no]
+     [highlite yes|no]
    [highlite color]
- -     [compass yes|no]
+     [compass yes|no]
    [compass color]
    [match]
    [lock [yes|no]]
-     - [open|close]
+     [open|close]
  
Example:
$ds9 -3d # create new 3D frame
@@ -221,13 +209,11 @@ $ds9 -3d scale 10
$ds9 -3d method mip
$ds9 -3d background azimuth
- $ds9 -3d border - yes
+ $ds9 -3d border yes
$ds9 -3d border color red
 $ds9 -3d highlite yes
$ds9 -3d highlite color red
- $ds9 -3d compass - yes
+ $ds9 -3d compass yes
$ds9 -3d compass color red
$ds9 -3d match
$ds9 -3d lock yes
@@ -253,8 +239,7 @@

analysis

Control external analysis tasks. Tasks are numbered as they are loaded, starting with 0. Can also be used to display a message - and - display text in the text dialog window.

+ and display text in the text dialog window.

Syntax:
-analysis [<task number>]
          @@ -265,20 +250,17 @@ <filename>]
          [clear]
          - [clear][load - <filename>]
+ [clear][load <filename>]
          [message ok|okcancel|yesno <message>]
          [entry <message>]
-           - [text]
+           [text]
  
Example:
$ds9 -analysis 0 # invoke first analysis task
$ds9 -analysis task 0
- $ds9 -analysis task - foobar
+ $ds9 -analysis task foobar
 $ds9 -analysis task {foo bar}
$ds9 -analysis my.ans
$ds9 -analysis load my.ans
@@ -296,8 +278,7 @@  
Example:
$ds9 -array foo.arr[dim=512,bitpix=-32,endian=little]
- $cat foo.arr | ds9 -array - -[dim=512,bitpix=-32,endian=little]
+ $cat foo.arr | ds9 -array -[dim=512,bitpix=-32,endian=little]

asinh

Select ASINH scale function for the current frame.

@@ -334,10 +315,8 @@      [factor <value> [<value>]]
     [depth <value>]
     [filter <string>]
- -      [filter clear]
- -      [function average|sum]
+      [filter clear]
+      [function average|sum]
     [in]
     [out]
     [to fit]
@@ -387,8 +366,7 @@ <value>]
       [in]
       [out]
- -        [to fit]
+        [to fit]
       [match]
       [lock [yes|no]]
       [open|close]
@@ -396,15 +374,12 @@ Example:
 $ds9 -block 4
$ds9 -block 4 2
- - $ds9 -block to 4
+ $ds9 -block to 4
$ds9 -block to 4 2
- $ds9 - -block in
- $ds9 - -block out
- $ds9 - -block to fit
+ $ds9 -block in
+ $ds9 -block + out
+ $ds9 -block to fit
$ds9 -block match
$ds9 -block lock yes
$ds9 -block open
@@ -421,20 +396,16 @@

catalog
cat

Support for catalogs. The first three commands will create a - new - catalog search. All other commands operated on the last search - created, unless indicated otherwise.

+ new catalog search. All other commands operated on the last + search created, unless indicated otherwise.

Syntax:
 -catalog [new]
        [ned|simbad|denis|skybot]
- -         +         [aavso|ac|ascss|cmc|gaia|gsc1|gsc2|gsc3|nomad|ppmx|sao|sdss5|sdss6|sdss7|sdss8|sdss9|tycho]
-         - [ua2|ub1|ucac2|ucac2sup|ucac3|ucac4|urat1]
- -         [2mass|iras]
+         [ua2|ub1|ucac2|ucac2sup|ucac3|ucac4|urat1]
+         [2mass|iras]
        [csc|xmm|rosat]
        [first|nvss]
        @@ -447,31 +418,26 @@         [import sb|tsv <filename>]

-         - [<ref>] [<ra> <dec> - <coordsys>]
-       -   [<ref>] [allcols]
- -         [<ref>] - [allrows]
+         [<ref>] + [<ra> <dec> <coordsys>]
+         [<ref>] [allcols]
+         + [<ref>] [allrows]
        [<ref>] [cancel]
-         - [<ref>] [clear]
-         - [<ref>] [close]
-         - [<ref>] [crosshair]
+         [<ref>] + [clear]
+         [<ref>] [close]
+         [<ref>] + [crosshair]
        [<ref>] [dec <col>]
        [<ref>] [edit yes|no]
        [<ref>] [export sb|tsv <filename>]
- -         [<ref>] - [filter <string>]
+         + [<ref>] [filter <string>]
        [<ref>] [filter load <filename>]
        [<ref>] @@ -480,28 +446,25 @@ <code>]
        [<ref>] [match <ref> <ref>]
- -         +         + [<ref>] [match]
- -         [<ref>] +         [<ref>] [match + error <value> degrees|arcmin|arcsec]
-         - [<ref>] [match function 1and2|1not2|2not1]
- -         - [<ref>] [match return 1and2|1only|2only]
-         - [<ref>] [match unique yes|no]
+         [<ref>] + [match function 1and2|1not2|2not1]
+         [<ref>] + [match return 1and2|1only|2only]
+         [<ref>] + [match unique yes|no]
        [<ref>] [maxrows <number>]
        [<ref>] [name <object>]
- -         [<ref>] - [panto - yes|no]
+         + [<ref>] [panto yes|no]
        [<ref>] [plot <xcol> <ycol> <xerrcol> <yerrcol>]
        [<ref>] [print]
@@ -513,57 +476,47 @@ <col>]
        [<ref>] [regions]
-         [<ref>] - [retrieve]
-         - [<ref>] [samp]
+         [<ref>] [retrieve]
+         [<ref>] + [samp]
        [<ref>] [samp broadcast]
        [<ref>] [samp - send - <application>]
- -         [<ref>] [save - <filename>]
+ send <application>]
+         + [<ref>] [save <filename>]
        [<ref>] - [server - cds|adac|cadc|cambridge|sao|ukirt|iucaa|bejing|saao]
+ [server cds|adac|cadc|cambridge|sao|ukirt|iucaa|bejing|saao]
        [<ref>] [show yes|no]
        [<ref>] [radius <value> degrees|arcmin|arcsec]
        [<ref>] [sky <skyframe>]
-     -     [<ref>] [skyformat - <skyformat>]
-     -     [<ref>] [sort <col> - incr|decr]
+         [<ref>] + [skyformat <skyformat>]
+         [<ref>] + [sort <col> incr|decr]
        [<ref>] [symbol [#] condition|shape|color|text|font|fontsize|fontweight|fontslant <value>]
-         - [<ref>] [symbol [#] text|size|size2|units|angle - <value>]
+         [<ref>] + [symbol [#] text|size|size2|units|angle <value>]
        [<ref>] - [symbol - shape circle|ellipse|box|text|point]
-         - [<ref>] [symbol shape - circle point|box point|diamond - point|cross point|x point|arrow - point|boxcircle - point]
+ [symbol shape circle|ellipse|box|text|point]
+         [<ref>] + [symbol shape circle + point|box point|diamond point|cross + point|x point|arrow point|boxcircle point]
         [<ref>] [symbol add| [#] remove]
        [<ref>] [symbol save|load <filename>]
        [<ref>] [system <coordsys>]
-      -    [<ref>] [update]
+         [<ref>] + [update]
        [<ref>] [x <col>]
        [<ref>] [y @@ -571,8 +524,7 @@
Example:
 $ds9 -catalog new
- $ds9 -catalog - 2mass
+ $ds9 -catalog 2mass
$ds9 -catalog cds 2mass
$ds9 -catalog cds "I/252"

@@ -580,76 +532,58 @@ $ds9 -catalog import tsv foo.tsv

 $ds9 -catalog 202.48 47.21 fk5
- $ds9 - -catalog allrows
+ $ds9 -catalog allrows
$ds9 -catalog allcols
$ds9 -catalog cancel
- - $ds9 -catalog clear
+ $ds9 -catalog clear
 $ds9 -catalog close
- - $ds9 -catalog crosshair
- $ds9 -catalog dec - DEC
+ $ds9 -catalog crosshair
+ $ds9 -catalog dec DEC
 $ds9 -catalog edit yes
- $ds9 -catalog - export tsv bar.tsv
- $ds9 -catalog filter - '\$Jmag>15'
+ $ds9 -catalog export tsv bar.tsv
+ $ds9 -catalog filter '\$Jmag>15'
$ds9 -catalog filter load foo.flt
$ds9 -catalog header
- $ds9 -catalog location - 500
+ $ds9 -catalog location 500
$ds9 -catalog match error 2 arcsec
$ds9 -catalog match function 1and2
$ds9 -catalog match unique no
$ds9 -catalog match return 1only
- $ds9 -catalog match # - last two catalogs loaded
- $ds9 -catalog match 2mass - csc
+ $ds9 -catalog match # last two catalogs loaded
+ $ds9 -catalog match 2mass csc
 $ds9 -catalog maxrows 2000
- $ds9 - -catalog name m51
+ $ds9 -catalog name m51
$ds9 -catalog panto no
- $ds9 -catalog plot - '\$Jmag' '\$Hmag' '\$e_Jmag' '\$e_Hmag'
- - $ds9 -catalog print
+ $ds9 -catalog plot '\$Jmag' '\$Hmag' + '\$e_Jmag' '\$e_Hmag'
+ $ds9 -catalog print
$ds9 -catalog psky fk5
$ds9 -catalog psystem wcs
$ds9 -catalog ra RA
$ds9 -catalog regions
- $ds9 -catalog - retrieve
+ $ds9 -catalog retrieve
$ds9 -catalog samp broadcast
$ds9 -catalog samp send aladin
$ds9 -catalog save foo.xml
- $ds9 -catalog server - sao
+ $ds9 -catalog server sao
 $ds9 -catalog show yes
$ds9 -catalog radius 1 degrees
$ds9 -catalog symbol condition '\$Jmag>15'
$ds9 -catalog symbol 2 shape "boxcircle point"
$ds9 -catalog symbol color red
$ds9 -catalog symbol font times
- $ds9 -catalog symbol - fontsize 14
- $ds9 -catalog symbol fontweight - bold
+ $ds9 -catalog symbol fontsize 14
+ $ds9 -catalog symbol fontweight bold
 $ds9 -catalog symbol fontslant italic
- - $ds9 -catalog symbol add
+ $ds9 -catalog symbol add
$ds9 -catalog symbol 2 remove
$ds9 -catalog symbol load foo.sym
$ds9 -catalog symbol save bar.sym
$ds9 -catalog sky fk5
$ds9 -catalog skyformat degrees
- $ds9 -catalog sort - "Jmag" incr
+ $ds9 -catalog sort "Jmag" incr
 $ds9 -catalog system wcs
- - $ds9 -catalog update
+ $ds9 -catalog update
 $ds9 -catalog x RA
$ds9 -catalog y DEC

cd

@@ -663,17 +597,15 @@

cmap

Controls the colormap for the current frame. The colormap name is not case sensitive. A valid contrast value is  from 0 to - 10 - and bias value from 0 to 1.

+ 10 and bias value from 0 to 1.

Syntax:
-cmap [<colormap>]
      [load <filename>]
      [save <filename>]
      [invert yes|no]
-       [<contrast> - <bias>]
-       [tag - [load|save] <filename>]
+       [<contrast> <bias>]
+       [tag [load|save] + <filename>]
      [tag delete]
      [open|close]
 
@@ -705,14 +637,13 @@           [fontsize <value>]
          - [fontweight - normal|bold]
+ [fontweight normal|bold]
          [fontslant roman|italic]
          [size]
          [ticks]
- -           +           + [match]
          [lock [yes|no]]
@@ -749,15 +680,13 @@          [load <filename>]
         [save - <filename> - [<coordsys> <skyframe>]]
+ <filename> [<coordsys> <skyframe>]]
         [convert]
         [load levels <filename>]
         [save levels <filename>]
- -          [copy]
+          [copy]
         [paste [<coordsys> <color> <width> yes|no]]
         [color @@ -770,21 +699,18 @@          [method block|smooth]
         [nlevels <number - of - levels>]
+ of levels>]
         [scale linear|log|pow|squared|sqrt|asinh|sinh|histequ]
         [log exp <value>]
         [mode minmax|<value>|zscale|zmax]
-          [scope - global|local]
+          [scope global|local]
         [limits <min> <max>]
         [levels - <value - value value...>]
+ <value value value...>]
         [open|close]
 
Example:
@@ -793,19 +719,14 @@ $ds9 -contour generate
$ds9 -contour clear
$ds9 -contour load ds9.ctr
- $ds9 -contour save - ds9.ctr
- $ds9 -contour save ds9.ctr wcs - fk5
+ $ds9 -contour save ds9.ctr
+ $ds9 -contour save ds9.ctr wcs fk5
 $ds9 -contour convert
$ds9 -contour load levels ds9.ctr
- $ds9 -contour - save levels ds9.lev
+ $ds9 -contour save levels ds9.lev
 $ds9 -contour copy
- - $ds9 -contour paste
- $ds9 -contour - paste wcs red 2 no
+ $ds9 -contour paste
+ $ds9 -contour paste wcs red 2 no
 $ds9 -contour color yellow
$ds9 -contour width 2
$ds9 -contour dash yes
@@ -826,10 +747,8 @@ Syntax:
-crop [<x> <y> <width> <height> [<coordsys>][<skyframe>][degrees|arcmin|arcsec]
- -       [match <coordsys>]
-       [lock - <coordsys>|none]
+       [match <coordsys>]
+       [lock <coordsys>|none]
      [reset]
      [3d zmin zmax <coordsys>]
      [open|close]
@@ -854,6 +773,7 @@ [<skyframe>]]
           [match + <coordsys>]
           [lock <coordsys>|none]
@@ -874,13 +794,11 @@       [<slice> [<coordsys>][<axis>]]
      [interval <numeric>]
- -       [match <coordsys>]
+       [match <coordsys>]
      [lock <coordsys>|none]
      [order 123|132|213|231|312|321]
      [axes lock [yes|no]]
- -       [open|close]
+       [open|close]
 
Example:
$ds9 -cube
@@ -914,8 +832,7 @@         [name <object>|clear]
        [<ra> - <dec>] - # in wcs fk5
+ <dec>] # in wcs fk5
        [size <width> <height> degrees|arcmin|arcsec]
        [save yes|no]
@@ -927,11 +844,9 @@ Example:
$ds9 -dsssao
$ds9 -dsssao m31
- $ds9 -dsssao name - m31
+ $ds9 -dsssao name m31
 $ds9 -dsssao name clear
- - $ds9 -dsssao 00:42:44.404 +41:16:08.78
+ $ds9 -dsssao 00:42:44.404 +41:16:08.78
$ds9 -dsssao size 60 60 arcmin
$ds9 -dsssao save yes
$ds9 -dsssao frame current
@@ -947,8 +862,7 @@         [name <object>|clear]
        [<ra> - <dec>] - # in wcs fk5
+ <dec>] # in wcs fk5
        [size <width> <height> degrees|arcmin|arcsec]
        [save yes|no]
@@ -962,11 +876,9 @@ Example:
$ds9 -dsseso
$ds9 -dsseso m31
- $ds9 -dsseso name - m31
+ $ds9 -dsseso name m31
 $ds9 -dsseso name clear
- - $ds9 -dsseso 00:42:44.404 +41:16:08.78
+ $ds9 -dsseso 00:42:44.404 +41:16:08.78
$ds9 -dsseso size 60 60 arcmin
$ds9 -dsseso save yes
$ds9 -dsseso frame current
@@ -982,8 +894,7 @@           [name <object>|clear]
          - [<ra> - <dec>] # in wcs fk5
+ [<ra> <dec>] # in wcs fk5
          [size <width> <height> degrees|arcmin|arcsec]
          [save @@ -1003,10 +914,8 @@ Example:
$ds9 -dssstsci
$ds9 -dssstsci m31
- $ds9 -dssstsci name - m31
- $ds9 -dssstsci name - clear
+ $ds9 -dssstsci name m31
+ $ds9 -dssstsci name clear
 $ds9 -dssstsci 00:42:44.404 +41:16:08.78
$ds9 -dssstsci size 60 60 arcmin
$ds9 -dssstsci save yes
@@ -1016,18 +925,15 @@ $ds9 -dssstsci open
$ds9 -dssstsci close

envi

-

Load an ENVI header and file. Optional parameter: array - endian.
+

Load an ENVI header and file. Optional parameter: array endian.

Syntax:
-envi <header> [<filename>]
 
Example:
- $ds9 -envi - foo.hdr
- - $ds9 -envi foo.hdr - foo.bsq
+ $ds9 -envi foo.hdr
+ $ds9 + -envi foo.hdr foo.bsq

exit
quit

@@ -1044,42 +950,31 @@

Export loaded image data of current frame in specified image format, at native resolution, using current colormap and contrast/bias settings. NOTE: not scaling, rotation, or - translation - is applied. If no format specified, the file name extension is - used - to determine the output format. Optional parameters: jpeg - quality - (1-100) and tiff compression method.
+ translation is applied. If no format specified, the file name + extension is used to determine the output format. Optional + parameters: jpeg quality (1-100) and tiff compression method.

Syntax:
- -export [array|nrrd|envi|gif|tiff|jpeg|png] - <filename>
- -export array - <filename> [big|little|native]
- - -export nrrd <filename> - [big|little|native]
- -export envi <header> [<filename>] - [big|little|native]
- -export - <filename>.jpeg [1-100]
- -export - <filename>.tiff + -export [array|nrrd|envi|gif|tiff|jpeg|png] <filename>
+ -export array <filename> [big|little|native]
+ -export nrrd <filename> [big|little|native]
+ -export envi <header> [<filename>] [big|little|native] +
+ -export <filename>.jpeg [1-100]
+ -export <filename>.tiff [none|jpeg|packbits|deflate]
 
Example:
$ds9 -export array foo.arr little
$ds9 -export nrrd foo.nrrd little
$ds9 -export envi foo.hdr little
- $ds9 -export envi - foo.hdr foo.bsq little
+ $ds9 -export envi foo.hdr foo.bsq little
 $ds9 -export tiff foo.tiff jpeg
$ds9 -export jpeg foo.jpeg 75
$ds9 -export png foo.png

fifo

Set the name of the IRAF input and output fifos. The default is - /dev/imt1. These fifos are used by IRAF to communicate with - DS9.

+ /dev/imt1. These fifos are used by IRAF to communicate with DS9.

Syntax:
-fifo name
 
@@ -1108,12 +1003,10 @@

frame

Controls frame functions. Frames may be created, deleted, - reset, - and centered. While return the current frame number. If you goto - a - frame that does not exists, it will be created. If the frame is - hidden, it will be shown. The 'frameno' option is available for - backward compatibility.

+ reset, and centered. While return the current frame number. If + you goto a frame that does not exists, it will be created. If + the frame is hidden, it will be shown. The 'frameno' option is + available for backward compatibility.

Syntax:
-frame [center [#|all]]
       [clear [#|all]]
@@ -1171,8 +1064,7 @@

geometry

Define the initial window geometry. This includes all of the - ds9 - window, not just the image space. see X(1).

+ ds9 window, not just the image space. see X(1).

Syntax:
-geometry value
 
@@ -1200,21 +1092,17 @@       [grid width <value>]
      [grid dash yes|no]
      [grid gap1 <value>]
- -       [grid gap2 +       [grid gap2 <value>]
- -       [grid gap3 - <value>]
-       [axes - yes|no]
+       [grid + gap3 <value>]
+       [axes yes|no]
      [axes color <color>]
      [axes width <value>]
      [axes dash yes|no]
-       [axes type - interior|exterior]
-       - [axes origin lll|llu|lul|luu|ull|ulu|uul|uuu]
+       [axes type interior|exterior]
+       [axes origin + lll|llu|lul|luu|ull|ulu|uul|uuu]
      [format1 <format>]
      [format2 <format>]
      [tickmarks yes|no]
@@ -1228,22 +1116,17 @@       [numerics yes|no]
      [numerics font times|helvetica|courier]
-       [numerics fontsize - <value>]
-       [numerics fontweight - normal|bold]
-       [numerics fontslant - roman|italic]
+       [numerics fontsize <value>]
+       [numerics fontweight normal|bold]
+       [numerics fontslant roman|italic]
      [numerics color <color>]
-       [numerics gap1 - <value>]
-       - [numerics gap2 <value>]
- -       [numerics gap3 - <value>]
-       - [numerics type interior|exterior]
+       [numerics gap1 <value>]
+       [numerics gap2 + <value>]
+       [numerics + gap3 <value>]
+       [numerics type + interior|exterior]
      [numerics vertical yes|no]
      [title yes|no]
      [title text <text>]
@@ -1257,15 +1140,11 @@       [title color <color>]
      [labels yes|no]
      [labels text1 <text>]
- -       [labels text2 +       [labels text2 <text>]
-       [labels def1 - yes|no]
-       [labels - def2 yes|no]
-       [labels gap1 - <value>]
+       [labels def1 yes|no]
+       [labels def2 yes|no]
+       [labels gap1 <value>]
      [labels gap2 <value>]
      [labels font times|helvetica|courier]
@@ -1290,11 +1169,9 @@ $ds9 -grid grid width 2
$ds9 -grid grid dash yes
$ds9 -grid grid gap1 10
- $ds9 -grid grid gap2 - 10
+ $ds9 -grid grid gap2 10
 $ds9 -grid grid gap3 10
- - $ds9 -grid axes yes
+ $ds9 -grid axes yes
$ds9 -grid axes color red
$ds9 -grid axes width 2
$ds9 -grid axes dash yes
@@ -1317,10 +1194,8 @@ $ds9 -grid numerics fontslant italic
$ds9 -grid numerics color red
$ds9 -grid numerics gap1 10
- $ds9 -grid numerics - gap2 10
- $ds9 -grid numerics gap3 - 10
+ $ds9 -grid numerics gap2 10
+ $ds9 -grid numerics gap3 10
 $ds9 -grid numerics type exterior
$ds9 -grid numerics vertical yes
$ds9 -grid title yes
@@ -1334,12 +1209,10 @@ $ds9 -grid title color red
$ds9 -grid labels yes
$ds9 -grid labels text1 {Hello World}
- $ds9 -grid - labels text2 {Hello World}
+ $ds9 -grid labels text2 {Hello World}
 $ds9 -grid labels def1 yes
$ds9 -grid labels def2 yes
- $ds9 -grid labels gap1 - 10
+ $ds9 -grid labels gap1 10
 $ds9 -grid labels gap2 10
$ds9 -grid labels font courier
$ds9 -grid labels fontsize 12
@@ -1370,8 +1243,7 @@

height

Set the height of the image display window. Use the geometry command to set the - overall - width and height of the ds9 window.

+ overall width and height of the ds9 window.

Syntax:
-height [<value>]
 
@@ -1391,8 +1263,7 @@ Example:
$ds9 -help # Display brief help message and exit.
$ds9 --help # Display command line options within help facility
- $ds9 -? # Display command line options within help - facility.
+ $ds9 -? # Display command line options within help facility.

histequ

Select histogram equalization scale function for the current @@ -1454,37 +1325,30 @@

lock

Lock all other frames to the current frame.

Syntax:
- -lock [frame - <coordsys>|none]
+ -lock [frame <coordsys>|none]
      [crosshair <coordsys>|none]
-     -   [crop <coordsys>|none]
-       [slice - <coordsys>|none]
+       [crop <coordsys>|none]
+       [slice <coordsys>|none]
      [bin [yes|no]]
      [axes [yes|no]]
      [scale [yes|no]]
      [scalelimits [yes|no]]
      [colorbar [yes|no]]
      [block [yes|no]]
- -       [smooth [yes|no]]
+       [smooth [yes|no]]
      [3d [yes|no]]
- -
+
Example:
$ds9 -lock frame wcs
- $ds9 -lock crosshair - wcs
+ $ds9 -lock crosshair wcs
 $ds9 -lock crop wcs
$ds9 -lock slice wcs
$ds9 -lock bin yes
$ds9 -lock axes yes
 $ds9 -lock scale yes
$ds9 -lock scalelimits yes
- $ds9 -lock colorbar - yes
+ $ds9 -lock colorbar yes
$ds9 -lock block yes
$ds9 -lock smooth yes
$ds9 -lock 3d yes
@@ -1545,15 +1409,12 @@

match

Match all other frames to the current frame.

Syntax:
- -match [frame - <coordsys>]
+ -match [frame <coordsys>]
       [crosshair <coordsys>]
- -        [crop - <coordsys>]
-        [slice +        [crop <coordsys>]
+        [slice <coordsys>]
       [bin]
       [axes]
       [scale]
@@ -1561,13 +1422,11 @@        [colorbar]
       [block]
       [smooth]
- -        [3d]
+        [3d]
 
Example:
 $ds9 -match frame wcs
- $ds9 - -match crosshair wcs
+ $ds9 -match crosshair wcs
 $ds9 -match crop wcs
$ds9 -match slice wcs
$ds9 -match bin
@@ -1577,8 +1436,7 @@ $ds9 -match colorbar
$ds9 -match block
 $ds9 -match smooth
- $ds9 - -match 3d
+ $ds9 -match 3d
 
 mecube

Load FITS multiple extension file as data cube.
@@ -1588,8 +1446,7 @@  
Example:
$ds9 -mecube foo.fits
- $cat foo.fits | ds9 - -mecube -
+ $cat foo.fits | ds9 -mecube -

minmax

This is how DS9 determines  the min and max data values from the data. SCAN will scan all data.

@@ -1619,10 +1476,8 @@  
Example:
$ds9 -mosaic foo.fits
- $ds9 -mosaic wcs - foo.fits
- $cat foo.fits | ds9 - -mosaic -
+ $ds9 -mosaic wcs foo.fits
+ $cat foo.fits | ds9 -mosaic -
$cat foo.fits | ds9 -mosaic wcs -

mosaicimage

@@ -1632,22 +1487,20 @@  
Example:
$ds9 -mosaicimage foo.fits
- $ds9 -mosaicimage wcs - foo.fits
- $cat foo.fits | ds9 - -mosaicimage
+ $ds9 -mosaicimage wcs foo.fits
+ $cat foo.fits | ds9 -mosaicimage
$cat foo.fits | ds9 -mosaiimage wcs

movie
savempeg

-

Create mpeg1 movie from snap shots of the DS9 window. A - slice movie cycles though all slices of a cube. A - frame movie cycles through all active frames. A - 3d movie cycles through specified viewing angles. The - default is frame. Optional parameters for 3d: - number of frames, azimuth from/to, elevation from/to, slice - from/to, oscillate/repeat times.
+

Create mpeg1 movie from snap shots of the DS9 window. A slice + movie cycles though all slices of a cube. A frame + movie cycles through all active frames. A 3d movie + cycles through specified viewing angles. The default is frame. + Optional parameters for 3d: number of frames, azimuth + from/to, elevation from/to, slice from/to, oscillate/repeat + times.

Syntax:
-movie [slice|frame|3d] <filename>
@@ -1657,8 +1510,7 @@  
Example:
$ds9 -movie slice ds9.mpg
- $ds9 -movie 3d ds9.mpg number 10 azfrom -60 azto 60 oscillate - 1
+ $ds9 -movie 3d ds9.mpg number 10 azfrom -60 azto 60 oscillate 1

msg

Specify a directory of translation tables to be loaded.

Syntax:
@@ -1674,23 +1526,24 @@  
Example:
$ds9 -multiframe foo.fits
- $cat foo.fits | ds9 - -multiframe -
+ $cat foo.fits | ds9 -multiframe -

nameserver

Support Name Server functions. Coordinates are in fk5.

Syntax:
-nameserver [<object>]
            [name <object>]
-             [server - ned-sao|ned-cds|simbad-sao|simbad-cds|vizier-sao|vizier-cds]
+             [server ned-sao|ned-cds|simbad-sao|simbad-cds|vizier-sao|vizier-cds]
            [skyformat degrees|sexagesimal]
-            +             + [pan]
-            +             + [crosshair]
-            +             + [open|close]
 
Example:
@@ -1729,8 +1582,7 @@       [<ra> <dec>] # in wcs fk5
      [size <width> - <height> - degrees|arcmin|arcsec]
+ <height> degrees|arcmin|arcsec]
      [save yes|no]
      [frame new|current]
      [update frame|crosshair]
@@ -1740,10 +1592,8 @@ $ds9 -nvss
$ds9 -nvss m31
 $ds9 -nvss name m31
- - $ds9 -nvss name clear
- $ds9 -nvss - 00:42:44.404 +41:16:08.78
+ $ds9 -nvss name clear
+ $ds9 -nvss 00:42:44.404 +41:16:08.78
$ds9 -nvss size 60 60 arcmin
$ds9 -nvss save yes
$ds9 -nvss frame current
@@ -1768,8 +1618,7 @@ Syntax:
-pagesetup [orient portrait|landscape]
           - [scale - <numberic>]
+ [scale <numberic>]
           [size letter|legal|tabloid|poster|a4]
 
@@ -1781,11 +1630,10 @@

Controls the current image cursor location for the current frame.

Syntax:
- -pan [<x> <h> <coordsys> - [<skyframe>]] # relative
+ -pan [<x> <h> <coordsys> [<skyframe>]] # + relative
     [to <x> <h> - <coordsys> - [<skyframe>]] # absolute
+ <coordsys> [<skyframe>]] # absolute
     [open|close]
 
Example:
@@ -1800,7 +1648,8 @@

Display/Hide the pixel table.

Syntax:
-pixeltable []
-            +             + [yes|open]
            [no|close]
@@ -1815,10 +1664,8 @@

Display and configure data plots. All plot commands take an optional second command, the plot name. If no plot name is specified, the last plot created is assumed. Plot data is - assumed - to be a pair of coordinates, with optional error values. The - follow - are valid data descriptions:

+ assumed to be a pair of coordinates, with optional error values. + The follow are valid data descriptions:

xy        x and y coordinates
xyex      x,y coordinates with x errors
xyey      x,y coordinates with y errors
@@ -1827,258 +1674,178 @@

To create a new plot, use the plot new command.

Syntax:
- # create new empty plot - window
- -plot - [line|bar|scatter]
+ # create new empty plot window
+ -plot [line|bar|scatter]
- # existing - plot
+ # existing plot
 -plot [[<plotname>] load <filename> xy|xyex|xyey|xyexey]
- -       [[<plotname>] save +       [[<plotname>] save <filename>]
-       - [[<plotname>] clear]
-    -    [[<plotname>] duplicate - [#]]
-       - [[<plotname>] stats yes|no]
- -       [[<plotname>] list - yes|no]
-       - [[<plotname>] loadconfig +       [[<plotname>] clear]
+       [[<plotname>] + duplicate [#]]
+       [[<plotname>] + stats yes|no]
+       [[<plotname>] + list yes|no]
+       [[<plotname>] + loadconfig <filename>]
+       [[<plotname>] saveconfig <filename>]
-       - [[<plotname>] saveconfig <filename>]
- -       [[<plotname>] pagesetup orient - portrait|landscape]
-       - [[<plotname>] pagesetup size +       [[<plotname>] pagesetup + orient portrait|landscape]
+       [[<plotname>] pagesetup size letter|legal|tabloid|poster|a4]
-     -   [[<plotname>] print]
-   -     [[<plotname>] print destination - printer|file]
-       - [[<plotname>] print command +       [[<plotname>] print]
+       [[<plotname>] print + destination printer|file]
+       [[<plotname>] print command <command>]
-       - [[<plotname>] print filename +       [[<plotname>] print filename <filename>]
-       - [[<plotname>] print color rgb|gray]
- -       [[<plotname>] +       [[<plotname>] print color + rgb|gray]
+       [[<plotname>] close]
-       - [[<plotname>] mode pointer|zoom]
- -
+       [[<plotname>] mode + pointer|zoom]
+
# configure graph
- -plot - [[<plotname>] axis x|y grid yes|no]
- -       [[[<plotname>] axis x|y log + -plot [[<plotname>] axis x|y grid yes|no]
+       [[[<plotname>] axis x|y + log yes|no]
+       [[<plotname>] axis x|y + flip yes|no]
+       [[<plotname>] axis x|y auto yes|no]
-       - [[<plotname>] axis x|y flip yes|no]
- -       [[<plotname>] axis x|y auto - yes|no]
-       - [[<plotname>] axis x|y min <value>]
- -       [[<plotname>] axis x|y max +       [[<plotname>] axis x|y min <value>]
-       - [[<plotname>] axis x|y format - <string>]
-       - [[<plotname>] legend yes|no]
- -       [[<plotname>] legend position - right|left|top|bottom]
-       - [[<plotname>] font title|labels|numbers font - times|helvetica|courier]
-       - [[<plotname>] font title|labels|numbers +       [[<plotname>] axis x|y max + <value>]
+       [[<plotname>] axis x|y + format <string>]
+       [[<plotname>] + legend yes|no]
+       [[<plotname>] legend + position right|left|top|bottom]
+       [[<plotname>] font + title|labels|numbers font times|helvetica|courier]
+       [[<plotname>] font title|labels|numbers size <value>]
-       - [[<plotname>] font title|labels|numbers +       [[<plotname>] font title|labels|numbers weight normal|bold]
-       - [[<plotname>] font title|labels|numbers +       [[<plotname>] font title|labels|numbers slant roman|italic]
-       - [[<plotname>] title <string>]
- -       [[<plotname>] title x|y +       [[<plotname>] title + <string>]
+       [[<plotname>] title x|y <string>]
-       - [[<plotname>] barmode - normal|stacked|aligned|overlap]
+       [[<plotname>] + barmode normal|stacked|aligned|overlap]
- - # configure current dataset
- -plot - [[<plotname>] show yes|no]
-   -     [[<plotname>] shape - circle|square|diamond|plus|splus|scross|triangle|arrow]
-       - [[<plotname>] shape fill yes|no]
- -       [[<plotname>] + # configure current dataset
+ -plot [[<plotname>] show yes|no]
+       [[<plotname>] + shape circle|square|diamond|plus|splus|scross|triangle|arrow]
+       [[<plotname>] + shape fill yes|no]
+       [[<plotname>] + shape color <value>]
- -       [[<plotname>] +       [[<plotname>] + smooth step|linear|cubic|quadratic|catrom]
- -       [[<plotname>] +       [[<plotname>] + color <value>]
- -       [[<plotname>] +       [[<plotname>] + width <value>]
- -       [[<plotname>] +       [[<plotname>] + dash yes|no]
- -       [[<plotname>] +       [[<plotname>] + error yes|no]
- -       [[<plotname>] +       [[<plotname>] + error color <value>]
- -       [[<plotname>] color - <value>]
- -       [[<plotname>] +       [[<plotname>] + color <value>]
+       [[<plotname>] + error width <value>]
- -       [[<plotname>] +       [[<plotname>] + name <string>]
- # select - current dataset
- -plot [[<plotname>] - select <value>]
- -  
+ # select current dataset
+ -plot [[<plotname>] select <value>]
+  
 Example:
- # - create new empty plot window
- $ds9 -plot - bar
+ # create new empty plot window
+ $ds9 -plot bar
- # existing - plot
+ # existing plot
 $ds9 -plot load xy.dat
- - $ds9 -plot save foo.dat
- $ds9 -plot - clear
- $ds9 -plot duplicate - 1
+ $ds9 -plot save foo.dat
+ $ds9 -plot clear
+ $ds9 -plot duplicate 1
 $ds9 -plot stats yes
- - $ds9 -plot list yes
- $ds9 -plot loadconfig - foo.plt
- $ds9 -plot saveconfig - foo.plt
- $ds9 -plot pagesetup orient - portrait
- $ds9 -plot pagesetup size - letter
+ $ds9 -plot list yes
+ $ds9 -plot loadconfig foo.plt
+ $ds9 -plot saveconfig foo.plt
+ $ds9 -plot pagesetup orient portrait
+ $ds9 -plot pagesetup size letter
 $ds9 -plot print
- - $ds9 -plot print destination file
- $ds9 - -plot print command lp
- $ds9 -plot print - filename foo.ps
- $ds9 -plot print color - rgb
+ $ds9 -plot print destination file
+ $ds9 -plot print command lp
+ $ds9 -plot print filename foo.ps
+ $ds9 -plot print color rgb
 $ds9 -plot close
- - $ds9 -plot mode pointer
+ $ds9 -plot mode pointer
- # - configure plot
- $ds9 -plot axis x grid - yes
- $ds9 -plot axis x log - yes
- $ds9 -plot axis x flip - yes
- $ds9 -plot axis x auto - no
+ # configure plot
+ $ds9 -plot axis x grid yes
+ $ds9 -plot axis x log yes
+ $ds9 -plot axis x flip yes
+ $ds9 -plot axis x auto no
 $ds9 -plot axis x min 1
- - $ds9 -plot axis x max 100
- $ds9 -plot axis - x format '%f'
+ $ds9 -plot axis x max 100
+ $ds9 -plot axis x format '%f'
- $ds9 -plot legend - yes
- $ds9 -plot legend position - left
+ $ds9 -plot legend yes
+ $ds9 -plot legend position left
- $ds9 -plot font numbers - font times
- $ds9 -plot font numbers size - 12
- $ds9 -plot font numbers weight - bold
- $ds9 -plot font numbers slant - italic
+ $ds9 -plot font numbers font times
+ $ds9 -plot font numbers size 12
+ $ds9 -plot font numbers weight bold
+ $ds9 -plot font numbers slant italic
- $ds9 -plot title 'This - is a Title'
- $ds9 -plot title x 'X - Axis'
- $ds9 -plot title y 'Y - Axis'
- $ds9 -plot title legend 'This is the - Legend'
+ $ds9 -plot title 'This is a Title'
+ $ds9 -plot title x 'X Axis'
+ $ds9 -plot title y 'Y Axis'
+ $ds9 -plot title legend 'This is the Legend'
- $ds9 -plot barmode - aligned
+ $ds9 -plot barmode aligned
- # configure current - dataset
+ # configure current dataset
 $ds9 -plot show yes
- - $ds9 -plot shape circle
- $ds9 -plot shape - fill no
- $ds9 -plot shape color - cyan
+ $ds9 -plot shape circle
+ $ds9 -plot shape fill no
+ $ds9 -plot shape color cyan
 $ds9 -plot smooth step
- - $ds9 -plot color red
- $ds9 -plot width - 2
+ $ds9 -plot color red
+ $ds9 -plot width 2
 $ds9 -plot dash yes
- - $ds9 -plot error yes
- $ds9 -plot error - color red
- $ds9 -plot error width - 2
+ $ds9 -plot error yes
+ $ds9 -plot error color red
+ $ds9 -plot error width 2
 $ds9 -plot name 'My Data'
- -
+
# select current dataset
- - $ds9 -plot select 2 + $ds9 -plot select 2

png

Load PNG image into current frame.

@@ -2087,13 +1854,11 @@  
Example:
$ds9 png foo.png
- $cat foo.png | - ds9 -png -
+ $cat foo.png | ds9 -png -

port

Set the IRAF port number, used by IRAF to communicate with DS9. - The default is 5137, the standard IRAF port used by - ximtool.

+ The default is 5137, the standard IRAF port used by ximtool.

Syntax:
-port number
 
@@ -2121,10 +1886,8 @@

Set region and coordinate output format precision.

Syntax:
-precision <linear> <degree> - <hms> - <dms> - <arcmin> - <arcsec>
+ <hms> <dms> + <arcmin> <arcsec>

 Example:
$ds9 -precision 8 10 4 3 5 3
@@ -2153,19 +1916,16 @@ href="file:///Users/joye/saods9/ds9/doc/ref/command.html#print">print for further details.

print

-

Controls printing. Use print option to set printing - options.
+

Controls printing. Use print option to set printing options.

Syntax:
-print [destination printer|file]
       [command <command>]
-        [filename - <filename>]
-        - [color rgb|cmyk|gray]
-        [level 1|2]
-        [resolution - 53|72|75|150|300|600]
+        [filename <filename>]
+        [color + rgb|cmyk|gray]
+        [level 1|2|3]
+        [resolution 72|screen|96|144|150|225|300|600|1200]
 
Example:
$ds9 -print
@@ -2174,7 +1934,7 @@ $ds9 -print filename foo.ps
$ds9 -print color cmyk
$ds9 -print level 2
- $ds9 -print resolution 75 + $ds9 -print resolution 96

raise

Raise in the window stacking order.

Syntax:
@@ -2200,15 +1960,13 @@          [centroid auto yes|no]
         [centroid - radius - <value>|iteration <value>]
+ radius <value>|iteration <value>]
         [getinfo]
         [move front]
         [move back]
         [select all]
         [select none]
-          [select - invert]
+          [select invert]
         [delete all]
         [delete select]
         [format @@ -2226,8 +1984,8 @@ <color>
         [width <width>]
-     -      [fixed|edit|rotate|delete yes|no]
+          + [fixed|edit|rotate|delete yes|no]
         [include|exclude|source|background]
         [command @@ -2241,19 +1999,15 @@ <skyframe>]
         [savetemplate <filename>]
-     -      [group new]
- -          [group +          [group new]
+          [group <tag> new]
         [group - <tag> - update]
-          - [group <tag> select]
-     -      [group <tag> color - <color>]
+ <tag> update]
+          [group + <tag> select]
+          [group + <tag> color <color>]
         [group <tag> copy]
         [group <tag> @@ -2261,11 +2015,9 @@          [group <tag> cut]
         [group <tag> - font - <font>]
+ font <font>]
         [group <tag> - move - <int> <int>]
+ move <int> <int>]
         [group <tag> movefront]
         [group <tag> @@ -2317,8 +2069,7 @@ $ds9 -regions width 3
 $ds9 -regions edit yes
$ds9 -regions include
- $ds9 -regions command "circle - 100 100 20 # color=red"
+ $ds9 -regions command "circle 100 100 20 # color=red"
$ds9 -regions composite
$ds9 -regions dissolve
$ds9 -regions template foo.tpl
@@ -2376,8 +2127,7 @@ $ds9 -rgb channel red # set current channel to red
$ds9 -rgb view blue no # turn off blue channel
$ds9 -rgb system wcs # set rgb coordinate system
- $ds9 - -rgb lock wcs yes
+ $ds9 -rgb lock wcs yes
$ds9 -rgb lock crop yes
$ds9 -rgb lock slice yes
$ds9 -rgb lock bin yes
@@ -2397,8 +2147,7 @@ <filename>[[xdim=<x>,ydim=<y>|dim=<dim>],[zdim=3],bitpix=<b>,skip=<s>,endian=[little|big]]
 
Example:
- $ds9 -rgbarray - foo.arr[dim=512,zdim=3,bitpix=-32,endian=little]
+ $ds9 -rgbarray foo.arr[dim=512,zdim=3,bitpix=-32,endian=little]
$cat foo.arr | ds9 -rgbarray -[dim=512,zdim=3,bitpix=-32,endian=little]

rgbcube

@@ -2409,8 +2158,7 @@  
Example:
$ds9 -rgbcube foo.fits
- $cat foo.fits | ds9 - -rgbcube -
+ $cat foo.fits | ds9 -rgbcube -

rgbimage

Load FITS rgbimage into rgb frame.

@@ -2419,8 +2167,7 @@  
Example:
$ds9 -rgbimage foo.fits
- $cat foo.fits | ds9 - -rgbimage -
+ $cat foo.fits | ds9 -rgbimage -

rotate

Controls the rotation angle (in degrees) of the current frame.<

@@ -2446,8 +2193,7 @@ Example:
$ds9 -samp yes
$ds9 -samp connect
- $ds9 - -samp broadcast image
+ $ds9 -samp broadcast image
$ds9 -samp send image aladin

save

@@ -2455,6 +2201,7 @@ Syntax:
-save [fits|rgbimage|rgbcube|mecube|mosaic|mosaicimage] <filename> + [image|table|slice]
 
Example:
@@ -2463,8 +2210,7 @@ $ds9 -save fits foo.fits table
$ds9 -save fits foo.fits slice
$ds9 -save rgbimage foo.fits
- $ds9 -save rgbcube - foo.fits
+ $ds9 -save rgbcube foo.fits
$ds9 -save mecube foo.fits
$ds9 -save mosaic foo.fits
$ds9 -save mosaicimage foo.fits
@@ -2475,8 +2221,7 @@ parameters: jpeg quality (1-100) and tiff compression method.

Syntax:
- -saveimage [fits|eps|gif|tiff|jpeg|png] - <filename>
+ -saveimage [fits|eps|gif|tiff|jpeg|png] <filename>
-saveimage <filename>.jpeg [1-100]
-saveimage <filename>.tiff [none|jpeg|packbits|deflate]
 
@@ -2526,11 +2271,10 @@      [fits [key|shmid] <id> [<filename>]]
     [mosaicimage - [iraf|wcs|wcsa...wcsz|wfpc2] - [key|shmid] <id> [<filename>]]
+ [iraf|wcs|wcsa...wcsz|wfpc2] [key|shmid] <id> + [<filename>]]
     [mosaic [iraf|wcs|wcsa...wcsz] - [key|shmid] - <id> [<filename>]]
+ [key|shmid] <id> [<filename>]]
     [rgbcube [key|shmid] <id> [<filename>]]
     [rgbimage [key|shmid] <id> @@ -2560,69 +2304,51 @@

Support for VO Simple Image Access protocol. The first command will create a new search. All other commands operated on the - last - search created, unless indicated otherwise.

+ last search created, unless indicated otherwise.

Syntax:
- -sia - [2mass|akari|astrowise|cadc|cxc|mast|sdss|skyview|tgssadr]
+ -sia [2mass|akari|astrowise|cadc|cxc|mast|sdss|skyview|tgssadr]

      [<ref>] [cancel]
-      [<ref>] - [clear]
-      [<ref>] - [close]
+      [<ref>] [clear]
+      [<ref>] [close]
     [<ref>] [coordinate <ra> <dec> <coordsys>]
- -      [<ref>] +      [<ref>] [crosshair]
     [<ref>] [export sb|tsv <filename>]
-      [<ref>] - [name <object>]
-      - [<ref>] [print]
+      [<ref>] [name <object>]
+      [<ref>] [print]
     [<ref>] [retrieve]
- -      [<ref>] [save +      [<ref>] [save <filename>]
     [<ref>] [radius <value> degrees|arcmin|arcsec]
-      [<ref>] [sky - <skyframe>]
-      - [<ref>] [skyformat <skyformat>]
- -      [<ref>] [system +      [<ref>] [sky <skyframe>]
+      [<ref>] [skyformat + <skyformat>]
+      [<ref>] [system <coordsys>]
- -      [<ref>] +      [<ref>] [update]

Example:
 $ds9 -sia 2mass
- $ds9 -sia - cancel
+ $ds9 -sia cancel
 $ds9 -sia clear
- $ds9 -sia - close
+ $ds9 -sia close
 $ds9 -sia coordinate 202.48 47.21 fk5
- - $ds9 -sia crosshair
- $ds9 -sia export tsv - bar.tsv
+ $ds9 -sia crosshair
+ $ds9 -sia export tsv bar.tsv
 $ds9 -sia name m51
- $ds9 -sia - print
+ $ds9 -sia print
$ds9 -sia retrieve
 $ds9 -sia save foo.xml
- - $ds9 -sia radius 1 degrees
+ $ds9 -sia radius 1 degrees
$ds9 -sia sky fk5
$ds9 -sia skyformat degrees
- $ds9 -sia system - wcs
+ $ds9 -sia system wcs
 $ds9 -sia update

 single @@ -2657,10 +2383,8 @@ Example:
$ds9 -skyview
$ds9 -skyview m31
- $ds9 -skyview name - m31
- $ds9 -skyview name - clear
+ $ds9 -skyview name m31
+ $ds9 -skyview name clear
 $ds9 -skyview 00:42:44.404 +41:16:08.78
$ds9 -skyview size 60 60 arcmin
$ds9 -skyview pixels 600 600
@@ -2700,52 +2424,46 @@ Boxcar width = 2*radius+1
Tophat diameter = 2*radius+1
Gaussian diameter = 2*radius+1, mean =0
- Elliptical Gaussian diameter = 2*radius+1, mean - =0
+ Elliptical Gaussian diameter = 2*radius+1, mean =0

Syntax:
-smooth []
        [yes|no]
        [function boxcar|tophat|gaussian|elliptic]
- -         [radius +         [radius <value>]
- -         +         [radiusminor <value>]
- -         +         + [sigma <value>]
- -         +         + [sigmaminor <value>]
- -         +         [angle + <value>]
         [match]
        [lock [yes|no]]
- -         [open|close]
+         + [open|close]
 
Example:
$ds9 -smooth
$ds9 -smooth yes
$ds9 -smooth function tophat
- $ds9 -smooth radius - 4
+ $ds9 -smooth radius 4
 $ds9 -smooth radiusminor 4
- - $ds9 -smooth sigma - 2.0
+ $ds9 -smooth sigma 2.0
 $ds9 -smooth + sigmaminor 2.0
- - $ds9 -smooth angle - 45
+ $ds9 + -smooth angle 45
 $ds9 -smooth match
$ds9 -smooth lock yes
@@ -2799,10 +2517,8 @@ -tiff <filename>
 
Example:
- $ds9 -tiff - foo.tiff
- $cat - foo.fits | ds9 -tiff -
+ $ds9 -tiff foo.tiff
+ $cat foo.fits | ds9 -tiff -

tile

Controls the tile display mode.

@@ -2860,9 +2576,8 @@ form, the first argument is the number of the fits HDU (starting with 1) and the remaining args are a bounding box in IMAGE coordinates. By default, the screen is updated the next - available - idle cycle. However, you may force an immediate update by - specifying the NOW option.

+ available idle cycle. However, you may force an immediate update + by specifying the NOW option.

Syntax:
-update []
        [# x1 y1 x2 y2]
@@ -2908,8 +2623,7 @@       [units yes|no]
      [image|physical|wcs|wcsa...wcsz yes|no]
-       [frame - yes|no]
+       [frame yes|no]
       [red yes|no]
      [green yes|no]
      [blue yes|no]
@@ -2947,11 +2661,9 @@ Syntax:
-vla []
       [<object>]
-        [name - <object>|clear]
+        [name <object>|clear]
       [<ra> <dec>] # - in - wcs fk5
+ in wcs fk5
       [size <width> <height> degrees|arcmin|arcsec]
       [save yes|no]
@@ -2964,10 +2676,8 @@ $ds9 -vla
$ds9 -vla m31
 $ds9 -vla name m31
- - $ds9 -vla name clear
- $ds9 -vla - 00:42:44.404 +41:16:08.78
+ $ds9 -vla name clear
+ $ds9 -vla 00:42:44.404 +41:16:08.78
$ds9 -vla size 60 60 arcmin
$ds9 -vla save yes
$ds9 -vla frame current
@@ -2984,8 +2694,7 @@       [<ra> <dec>] # in wcs fk5
      [size <width> - <height> - degrees|arcmin|arcsec]
+ <height> degrees|arcmin|arcsec]
      [save yes|no]
      [frame new|current]
      [update frame|crosshair]
@@ -2995,10 +2704,8 @@ $ds9 -vlss
$ds9 -vlss m31
 $ds9 -vlss name m31
- - $ds9 -vlss name clear
- $ds9 -vlss - 00:42:44.404 +41:16:08.78
+ $ds9 -vlss name clear
+ $ds9 -vlss 00:42:44.404 +41:16:08.78
$ds9 -vlss size 60 60 arcmin
$ds9 -vlss save yes
$ds9 -vlss frame current
@@ -3031,14 +2738,11 @@

wcs

Controls the World Coordinate System for the current frame. If the wcs system, skyframe, or skyformat is modified, the info - panel, - compass, grid, and alignment will be modified accordingly. Also, - a - new WCS specification can be loaded and used by the current - image - regardless of the WCS that was contained in the image file. - Please - see WCS for more information.

+ panel, compass, grid, and alignment will be modified + accordingly. Also, a new WCS specification can be loaded and + used by the current image regardless of the WCS that was + contained in the image file. Please see WCS + for more information.

Syntax:
-wcs [[system] wcs|wcsa...wcsz]
     [[sky] fk4|fk5|icrs|galactic|ecliptic]
@@ -3053,11 +2757,9 @@ $ds9 -wcs wcs
$ds9 -wcs system wcs
 $ds9 -wcs fk5
- $ds9 - -wcs sky fk5
+ $ds9 -wcs sky fk5
 $ds9 -wcs sexagesimal
- $ds9 - -wcs skyformat sexagesimal
+ $ds9 -wcs skyformat sexagesimal
$ds9 -wcs align yes
$ds9 -wcs reset
$ds9 -wcs reset 3
@@ -3091,8 +2793,7 @@

width

Set the width of the image display window. Use the geometry command to set the - overall - width and height of the ds9 window.

+ overall width and height of the ds9 window.

Syntax:
-width [<value>]
 
diff --git a/ds9/doc/ref/samp.html b/ds9/doc/ref/samp.html index 234796d..198c67f 100644 --- a/ds9/doc/ref/samp.html +++ b/ds9/doc/ref/samp.html @@ -15,13 +15,13 @@

SAMP is a messaging protocol that enables astronomy software tools to interoperate and communicate. Broadly speaking, SAMP is - an - abstract framework for loosely-coupled, asynchronous, RPC-like - and/or event-based communication, based on a central service - providing multi-directional publish/subscribe message brokering. - The message semantics are extensible and use structured but - weakly-typed data. For more information on SAMP, please click - here.

+ an abstract framework for loosely-coupled, asynchronous, + RPC-like and/or event-based communication, based on a central + service providing multi-directional publish/subscribe message + brokering. The message semantics are extensible and use + structured but weakly-typed data. For more information on SAMP, + please click here.

The samp implementation for DS9 is based on the XPA model with 2 private calls:

ds9.get
@@ -163,8 +163,7 @@       [<ra> <dec>] # in wcs fk5
      [size <width> - <height> - degrees|arcmin|arcsec]
+ <height> degrees|arcmin|arcsec]
      [save yes|no]
      [frame new|current]
      [update frame|crosshair]
@@ -183,10 +182,8 @@ 2mass
2mass m31
 2mass name m31
- - 2mass name clear
- 2mass 00:42:44.404 - +41:16:08.78
+ 2mass name clear
+ 2mass 00:42:44.404 +41:16:08.78
2mass size 60 60 arcmin
2mass save yes
2mass frame current
@@ -205,19 +202,15 @@    [scale <scale>]
   [method mip|aip]
   [background none|azimuth|elevation]
- -    [border yes|no]
+    [border yes|no]
   [border color <color>]
-    - [highlite yes|no]
+    [highlite yes|no]
   [hightlite color <color>]
- -    [compass yes|no]
+    [compass yes|no]
   [compass color <color>]
   [match]
   [lock [yes|no]]
-    - [open|close]
+    [open|close]
 
Example:
string value = ds9.get(string cmd)
@@ -235,8 +228,7 @@ 3d compass color
3d lock
 ds9.set(string cmd)
- 3d # create new - 3D frame
+ 3d # create new 3D frame
3d view 45 30
3d az 45
3d el 30
@@ -270,17 +262,14 @@       [yes|no]
 
Example:
- string value = ds9.get(string - cmd)
+ string value = ds9.get(string cmd)
 align
 ds9.set(string cmd)
- - align yes
+ align yes

analysis

Control external analysis tasks. Tasks are numbered as they are loaded, starting with 0. Can also be used to display a message - and - display text in the text dialog window.

+ and display text in the text dialog window.

Syntax:
analysis [<task number>]
         @@ -296,8 +285,7 @@ ok|okcancel|yesno <message>]
         [entry <message>]
-          - [text]
+          [text]
  
Example:
string value = ds9.get(string cmd)
@@ -316,8 +304,7 @@ analysis clear load my.ans
analysis message {This is a message}
analysis text {this is text}
- ds9.set(string - cmd, string url)
+ ds9.set(string cmd, string url)
analysis load
analysis text
 @@ -331,16 +318,12 @@  
Example:
 string url = ds9.get(string cmd)
- - array
+ array
array little
- ds9.set(string command, string - url)
+ ds9.set(string command, string url)
 array foo.arr[dim=512,bitpix=-32,endian=little]
- array new - foo.arr[dim=512,bitpix=-32,endian=little]
- array mask - foo.arr[dim=512,bitpix=-32,endian=little]
+ array new foo.arr[dim=512,bitpix=-32,endian=little]
+ array mask foo.arr[dim=512,bitpix=-32,endian=little]

bg
background

@@ -352,8 +335,7 @@ string url = ds9.get(string cmd)
bg
 ds9.set(string cmd)
- bg - red
+ bg red
 bg red

backup

Create a backup save set.

@@ -362,13 +344,11 @@  
Example:
 ds9.set(string cmd)
- backup - ds9.bck
+ backup ds9.bck

bin

Controls binning factor, binning buffer size, and  binning function for binning FITS bin tables. The access point blocking - is - provided for backward compatibility.

+ is provided for backward compatibility.

Syntax:
bin [about <x> <y>]
    [about center]
@@ -378,10 +358,8 @@     [factor <value> [<vector>]]
    [depth <value>]
    [filter <string>]
- -     [filter clear]
- -     [function average|sum]
+     [filter clear]
+     [function average|sum]
    [in]
    [out]
    [to fit]
@@ -448,58 +426,43 @@ <value>]
      [in]
      [out]
- -       [to fit]
+       [to fit]
      [match]
      [lock [yes|no]]
      [open|close]
 
Example:
- string value = ds9.get(string - cmd)
+ string value = ds9.get(string cmd)
 block
block lock
 ds9.set(string cmd)
- - block 4
- block - 4 2
+ block 4
+ block 4 2
 block to 4
- - block to 4 2
- - block in
- - block out
- - block to fit
- - block match
- - block lock yes
- - block open
- - block close
+ block to 4 2
+ block in
+ block out
+ block to fit
+ block match
+ block lock yes
+ block open
+ block close

catalog
cat

Support for catalogs. The first three commands will create a - new - catalog search. All other commands operated on the last search - created, unless indicated otherwise.

+ new catalog search. All other commands operated on the last + search created, unless indicated otherwise.

Syntax:
 catalog [new]
        [ned|simbad|denis|skybot]
- -         +         [aavso|ac|ascss|cmc|gaia|gsc1|gsc2|gsc3|nomad|ppmx|sao|sdss5|sdss6|sdss7|sdss8|sdss9|tycho]
-         - [ua2|ub1|ucac2|ucac2sup|ucac3|ucac4|urat1]
- -         [2mass|iras]
+         [ua2|ub1|ucac2|ucac2sup|ucac3|ucac4|urat1]
+         + [2mass|iras]
        [csc|xmm|rosat]
        [first|nvss]
        @@ -512,31 +475,26 @@         [import sb|tsv <filename>]

-         - [<ref>] [<ra> <dec> - <coordsys>]
-       -   [<ref>] [allcols]
- -         [<ref>] - [allrows]
+         [<ref>] + [<ra> <dec> <coordsys>]
+         [<ref>] [allcols]
+         + [<ref>] [allrows]
        [<ref>] [cancel]
-         - [<ref>] [clear]
-         - [<ref>] [close]
-         - [<ref>] [crosshair]
+         [<ref>] + [clear]
+         [<ref>] [close]
+         [<ref>] + [crosshair]
        [<ref>] [dec <col>]
        [<ref>] [edit yes|no]
        [<ref>] [export sb|tsv <filename>]
- -         [<ref>] - [filter <string>]
+         + [<ref>] [filter <string>]
        [<ref>] [filter load <filename>]
        [<ref>] @@ -545,28 +503,25 @@ <code>]
        [<ref>] [match]
- -         +         + [<ref>] [match <ref> <ref>]
- -         [<ref>] +         [<ref>] [match + error <value> degrees|arcmin|arcsec]
-         - [<ref>] [match function 1and2|1not2|2not1]
- -         - [<ref>] [match return 1and2|1only|2only]
-         - [<ref>] [match unique yes|no]
+         [<ref>] + [match function 1and2|1not2|2not1]
+         [<ref>] + [match return 1and2|1only|2only]
+         [<ref>] + [match unique yes|no]
        [<ref>] [maxrows <number>]
        [<ref>] [name <object>]
- -         [<ref>] - [panto - yes|no]
+         + [<ref>] [panto yes|no]
        [<ref>] [plot <xcol> <ycol> <xerrcol> <yerrcol>]
        [<ref>] [print]
@@ -576,58 +531,48 @@ <coordsys>]
        [<ref>] [ra <col>]
-         [<ref>] - [regions]
+         [<ref>] [regions]
        [<ref>] [retrieve]
        [<ref>] [samp]
        [<ref>] [samp broadcast]
        [<ref>] [samp - send - <application>]
- -         [<ref>] [save - <filename>]
+ send <application>]
+         + [<ref>] [save <filename>]
        [<ref>] - [server - cds|adac|cadc|cambridge|sao|ukirt|iucaa|bejing|saao]
+ [server cds|adac|cadc|cambridge|sao|ukirt|iucaa|bejing|saao]
        [<ref>] [show yes|no]
        [<ref>] [radius <value> degrees|arcmin|arcsec]
        [<ref>] [sky <skyframe>]
-     -     [<ref>] [skyformat - <skyformat>]
-     -     [<ref>] [sort <col> - incr|decr]
+         [<ref>] + [skyformat <skyformat>]
+         [<ref>] + [sort <col> incr|decr]
        [<ref>] [symbol [#] condition|shape|color|text|font|fontsize|fontweight|fontslant <value>]
-         - [<ref>] [symbol [#] text|size|size2|units|angle - <value>]
-     -     [<ref>] [symbol shape - circle|ellipse|box|text|point]
-         - [<ref>] [symbol shape - circle point|box point|diamond - point|cross point|x point|arrow - point|boxcircle - point]
-         - [<ref>] [symbol add| [#] remove]
+         [<ref>] + [symbol [#] text|size|size2|units|angle <value>]
+         [<ref>] + [symbol shape circle|ellipse|box|text|point]
+         [<ref>] + [symbol shape circle + point|box point|diamond point|cross + point|x point|arrow point|boxcircle point]
+         [<ref>] + [symbol add| [#] remove]
        [<ref>] [symbol save|load <filename>]
        [<ref>] [system <coordsys>]
-      -    [<ref>] [update]
+         [<ref>] + [update]
        [<ref>] [x <col>]
        [<ref>] [y @@ -640,8 +585,7 @@
ds9.set(string cmd)
 catalog new
- catalog - 2mass
+ catalog 2mass
catalog cds 2mass
catalog cds {I/252}

@@ -651,19 +595,14 @@ catalog allrows
catalog allcols
 catalog cancel
- catalog - clear
+ catalog clear
 catalog close
- catalog coordinate - 202.48 47.21 fk5
+ catalog coordinate 202.48 47.21 fk5
 catalog crosshair
- - catalog dec DEC
+ catalog dec DEC
 catalog edit yes
- - catalog export tsv bar.tsv
- catalog filter - {$Jmag>10}
+ catalog export tsv bar.tsv
+ catalog filter {$Jmag>10}
catalog filter load foo.flt
catalog header
 catalog location 500
@@ -671,49 +610,41 @@ catalog match function 1and2
catalog match unique no
catalog match return 1only
- catalog match # last two - catalogs loaded
+ catalog match # last two catalogs loaded
 catalog match 2mass csc
- - catalog maxrows 2000
+ catalog maxrows 2000
 catalog name m51
catalog panto no
- catalog plot {$Jmag} {$Hmag} - {$e_Jmag} {$e_Hmag}
+ catalog plot {$Jmag} {$Hmag} {$e_Jmag} + {$e_Hmag}
 catalog print
catalog psky fk5
catalog psystem wcs
catalog ra RA
catalog regions
 catalog retrieve
- - catalog samp broadcast
+ catalog samp broadcast
catalog samp send aladin
catalog save foo.xml
 catalog server sao
- - catalog show yes
+ catalog show yes
catalog radius 1 degrees
catalog symbol condition {$Jmag>15}
catalog symbol 2 shape {boxcircle point}
catalog symbol color red
catalog symbol font times
- catalog symbol fontsize - 14
+ catalog symbol fontsize 14
 catalog symbol fontweight bold
- catalog - symbol fontslant italic
+ catalog symbol fontslant italic
 catalog symbol add
catalog symbol 2 remove
catalog symbol load foo.sym
catalog symbol save bar.sym
catalog sky fk5
catalog skyformat degrees
- catalog sort {Jmag} - incr
+ catalog sort {Jmag} incr
 catalog system wcs
- catalog - update
+ catalog update
 catalog x RA
catalog y DEC

cd

@@ -730,8 +661,7 @@

cmap

Controls the colormap for the current frame. The colormap name is not case sensitive. A valid contrast value is  from 0 to - 10 - and bias value from 0 to 1.

+ 10 and bias value from 0 to 1.

Syntax:
cmap [<colormap>]
     [file]
@@ -739,8 +669,8 @@      [save <filename>]
     [invert yes|no]
     [<constrast> <bias>]
- -      [tag [load|save] <filename>]
+      [tag [load|save] + <filename>]
     [tag delete]
     [open|close]
 
@@ -785,8 +715,7 @@ roman|italic]
         [size]
         [ticks]
-          - [match]
+          [match]
         [lock [yes|no]]
 
@@ -838,18 +767,13 @@         [save <filename> [<coordsys> <skyframe>]]
        [convert]
- -         [load levels - <filename>]
- -         [save - levels - <filename>]
- -         [copy]
+         [load + levels <filename>]
+         + [save levels <filename>]
+         [copy]
        [paste - [<coordsys> - <color> <width> yes|no]]
+ [<coordsys> <color> <width> yes|no]]
        [color <color>]
        [width <width>]
        [dash yes|no]
@@ -867,8 +791,7 @@         [limits <min> <max>]
        [levels <value - value - value...>]
+ value value...>]
        [open|close]
 
Example:
@@ -894,20 +817,14 @@ contour clear
contour generate
contour load ds9.ctr
- contour save - ds9.con
- contour save ds9.con wcs - fk5
+ contour save ds9.con
+ contour save ds9.con wcs fk5
 contour convert
- contour load - levels ds9.ctr
- contour save levels - ds9.lev
+ contour load levels ds9.ctr
+ contour save levels ds9.lev
 contour copy
- contour - paste
- contour paste wcs red 2 - no
+ contour paste
+ contour paste wcs red 2 no
 contour color yellow
contour width 2
contour dash yes
@@ -928,10 +845,8 @@ Syntax:
crop [<x> <y> <width> <height> [<coordsys>][<skyframe>][degrees|arcmin|arcsec]
- -       [match <coordsys>]
-       [lock - <coordsys>|none]
+       [match <coordsys>]
+       [lock <coordsys>|none]
      [reset]
      [3d zmin zmax <coordsys>]
@@ -939,10 +854,8 @@  
Example:
string value = ds9.get(string cmd)
- crop # get crop in - physical coords
- crop wcs galactic sexagesimal - arcsec
+ crop # get crop in physical coords
+ crop wcs galactic sexagesimal arcsec
crop lock
 ds9.set(string cmd)
crop 40 30 10 20 # set crop in physical coords
@@ -962,9 +875,8 @@ Syntax:
crosshair [<x> <y> <coordsys> [<skyframe>]]
- -           [match - <coordsys>]
+           + [match <coordsys>]
          [lock <coordsys>|none]
 
@@ -989,8 +901,7 @@      [<slice> [<coordsys>][<axis>]]
     [interval <numeric>]
- -      [match <coordsys>]
+      [match <coordsys>]
     [lock <coordsys>|none]
     [order 123|132|213|231|312|321]
     [axes lock [yes|no]]
@@ -1029,10 +940,8 @@

data

Return an array of data values given a lower left corner and a width and height in specified coordinate system. The last - argument - of yes indicates to strip the coordinates from the output and - just - list the data values. The default is yes.
+ argument of yes indicates to strip the coordinates from the + output and just list the data values. The default is yes.

Syntax:
data [<coordsys> [<skyframe>] <x> <y> @@ -1044,8 +953,7 @@ data physical 899 1039 6 6 no
data fk5 202.47091 47.196811 0.00016516669 0.00016516669 no
data wcs fk5 13:29:53.018 +47:11:48.52 0.00016516669 - 0.00016516669 - no
+ 0.00016516669 no

dsssao
dss
@@ -1054,11 +962,9 @@ Syntax:
dsssao []
       [<object>]
-        [name - <object>|clear]
+        [name <object>|clear]
       [<ra> <dec>] # - in - wcs fk5
+ in wcs fk5
       [size <width> <height> degrees|arcmin|arcsec]
       [save yes|no]
@@ -1077,10 +983,8 @@ dsssao
dsssao m31
 dsssao name m31
- - dsssao name clear
- dsssao 00:42:44.404 - +41:16:08.78
+ dsssao name clear
+ dsssao 00:42:44.404 +41:16:08.78
dsssao size 60 60 arcmin
dsssao save yes
dsssao frame current
@@ -1093,11 +997,9 @@ Syntax:
dsseso []
       [<object>]
-        [name - <object>|clear]
+        [name <object>|clear]
       [<ra> <dec>] # - in - wcs fk5
+ in wcs fk5
       [size <width> <height> degrees|arcmin|arcsec]
       [save yes|no]
@@ -1119,10 +1021,8 @@ dsseso
dsseso m31
 dsseso name m31
- - dsseso name clear
- dsseso 00:42:44.404 - +41:16:08.78
+ dsseso name clear
+ dsseso 00:42:44.404 +41:16:08.78
dsseso size 60 60 arcmin
dsseso save yes
dsseso frame current
@@ -1166,10 +1066,8 @@ dssstsci
dssstsci m31
 dssstsci name m31
- - dssstsci name clear
- dssstsci 00:42:44.404 - +41:16:08.78
+ dssstsci name clear
+ dssstsci 00:42:44.404 +41:16:08.78
dssstsci size 60 60 arcmin
dssstsci save yes
dssstsci frame current
@@ -1178,8 +1076,7 @@ dssstsci open
dssstsci close

envi

-

Load an ENVI header and file. Optional parameter: array - endian.
+

Load an ENVI header and file. Optional parameter: array endian.

Syntax:
envi [new] <header> [<filename>]
@@ -1206,31 +1103,21 @@ format. Optional parameters: array endian, nrrd endian, jpeg quality (1-100) and tiff compression method.

Syntax:
- export - [array|nrrd|envi|gif|tiff|jpeg|png] + export [array|nrrd|envi|gif|tiff|jpeg|png] <filename>
- export array - <filename> - [big|little|native]
- export nrrd - <filename> [big|little|native]
- export envi <header> [<filename>] - [big|little|native]
- export jpeg - <filename> [1-100]
- export tiff - <filename> - [none|jpeg|packbits|deflate]
+ export array <filename> [big|little|native]
+ export nrrd <filename> [big|little|native]
+ export envi <header> [<filename>] [big|little|native]
+ export jpeg <filename> [1-100]
+ export tiff <filename> [none|jpeg|packbits|deflate]
 
Example:
 ds9.set (string cmd)
- export - array foo.arr little
+ export array foo.arr little
export nrrd foo.nrrd little
export envi foo.hdr little
export envi foo.hdr foo.bsq little
- - export tiff foo.tiff jpeg
+ export tiff foo.tiff jpeg
export jpeg foo.jpeg 75
export png foo.png

file

@@ -1247,10 +1134,8 @@ loaded image.

Syntax:
- fits [new|mask|slice] - [<filename>]
-      - [width|height|depth|bitpix|type]
+ fits [new|mask|slice] [<filename>]
+      [width|height|depth|bitpix|type]
     [size [wcs|wcsa...wcsz] [fk4|fk5|icrs|galactic|ecliptic] [degrees|arcmin|arcsecs]]
     [header [<ext>] [keyword @@ -1276,8 +1161,7 @@ fits table
fits slice
ds9.set(string cmd, string url)
- fits - foo.fits
+ fits foo.fits
fits new foo.fits
fits bar.fits[bin=detx,dety]
fits slice foo.fits
@@ -1289,10 +1173,8 @@ fits mask

Syntax:

- fits [new|mask|slice] - [<filename>]
-      - [width|height|depth|bitpix]
+ fits [new|mask|slice] [<filename>]
+      [width|height|depth|bitpix]
     [size [wcs|wcsa...wcsz] [fk4|fk5|icrs|galactic|ecliptic] [degrees|arcmin|arcsecs]]
     [header [<ext>] [keyword @@ -1315,10 +1197,8 @@ fits
fits image
 fits table
- - fits slice
- ds9.set(string cmd, string - url)
+ fits slice
+ ds9.set(string cmd, string url)
fits foo.fits
fits new foo.fits
fits bar.fits[bin=detx,dety]
@@ -1327,12 +1207,10 @@
frame

Controls frame functions. Frames may be created, deleted, - reset, - and centered. While return the current frame number. If you goto - a - frame that does not exists, it will be created. If the frame is - hidden, it will be shown. The 'frameno' option is available for - backward compatibility.

+ reset, and centered. While return the current frame number. If + you goto a frame that does not exists, it will be created. If + the frame is hidden, it will be shown. The 'frameno' option is + available for backward compatibility.

Syntax:
frame [center [#|all]]
      [clear [#|all]]
@@ -1360,15 +1238,13 @@       [has fits [ |bin|cube|mosaic]]
      [has marker [highlite|paste|select|undo]]
-       [has system - <coordsys>]
- -       [has wcs +       [has system <coordsys>]
+       [has wcs [<wcssys>]]
-       [has wcs - celestial [<wcssys>]]
-       - [has wcs linear [<wcssys>]]
+       [has wcs celestial + [<wcssys>]]
+       [has wcs linear + [<wcssys>]]
 
Example:
string value = ds9.get(string cmd)
@@ -1431,14 +1307,12 @@ gif [new|slice] [<filename>]
 
Example:
- string value = ds9.get(string - cmd)
+ string value = ds9.get(string cmd)
 gif
ds9.set(string cmd)
 gif foo.gif
gif new foo.gif
- gif slice - foo.gif
+ gif slice foo.gif
 gif
gif new
 gif slice @@ -1457,21 +1331,17 @@       [grid width <value>]
      [grid dash yes|no]
      [grid gap1 <value>]
- -       [grid gap2 +       [grid gap2 <value>]
- -       [grid gap3 - <value>]
-       [axes - yes|no]
+       [grid + gap3 <value>]
+       [axes yes|no]
      [axes color <color>]
      [axes width <value>]
      [axes dash yes|no]
-       [axes type - interior|exterior]
-       - [axes origin lll|llu|lul|luu|ull|ulu|uul|uuu]
+       [axes type interior|exterior]
+       [axes origin + lll|llu|lul|luu|ull|ulu|uul|uuu]
      [format1 <format>]
      [format2 <format>]
      [tickmarks yes|no]
@@ -1485,22 +1355,17 @@       [numerics yes|no]
      [numerics font times|helvetica|courier]
-       [numerics fontsize - <value>]
-       [numerics fontweight - normal|bold]
-       [numerics fontslant - roman|italic]
+       [numerics fontsize <value>]
+       [numerics fontweight normal|bold]
+       [numerics fontslant roman|italic]
      [numerics color <color>]
-       [numerics gap1 - <value>]
-       - [numerics gap2 <value>]
- -       [numerics gap3 - <value>]
-       - [numerics type interior|exterior]
+       [numerics gap1 <value>]
+       [numerics gap2 + <value>]
+       [numerics + gap3 <value>]
+       [numerics type + interior|exterior]
      [numerics vertical yes|no]
      [title yes|no]
      [title text <text>]
@@ -1514,17 +1379,13 @@       [title color <color>]
      [labels yes|no]
      [labels text1 <text>]
- -       [labels text2 +       [labels text2 <text>]
-       [labels def1 - yes|no]
+       [labels def1 yes|no]
      [labels def2 yes|no]
- -       [labels gap1 +       [labels gap1 <value>]
-       [labels gap2 - <value>]
+       [labels gap2 <value>]
      [labels font times|helvetica|courier]
      [labels fontsize <value>]
@@ -1549,8 +1410,7 @@ grid grid dash
grid grid gap1
 grid grid gap2
- - grid grid gap3
+ grid grid gap3
 grid axes
grid axes color
grid axes width
@@ -1574,11 +1434,9 @@ grid numerics fontslant
grid numerics color
grid numerics gap1
- grid numerics - gap2
+ grid numerics gap2
 grid numerics gap3
- - grid numerics type
+ grid numerics type
grid numerics vertical
grid title
grid title text
@@ -1592,12 +1450,10 @@ grid labels
grid labels text1
 grid labels text2
- grid - labels def1
+ grid labels def1
grid labels def2
 grid labels gap1
- grid - labels gap2
+ grid labels gap2
grid labels font
grid labels fontsize
grid labels fontweight
@@ -1616,8 +1472,7 @@ grid grid dash yes
grid grid gap1 10
 grid grid gap2 10
- - grid grid gap3 10
+ grid grid gap3 10
 grid axes yes
grid axes color red
grid axes width 2
@@ -1641,11 +1496,9 @@ grid numerics fontslant italic
grid numerics color red
grid numerics gap1 10
- grid numerics gap2 - 10
+ grid numerics gap2 10
 grid numerics gap3 10
- - grid numerics type exterior
+ grid numerics type exterior
grid numerics vertical yes
grid title yes
grid title text {Hello World}
@@ -1658,13 +1511,11 @@ grid title color red
grid labels yes
grid labels text1 {Hello World}
- grid labels text2 - {Hello World}
+ grid labels text2 {Hello World}
 grid labels def1 yes
grid labels def2 yes
 grid labels gap1 10
- - grid labels gap2 10
+ grid labels gap2 10
grid labels font courier
grid labels fontsize 12
grid labels fontweight bold
@@ -1717,41 +1568,36 @@ iconify yes

iexam

Interactive examine function. A blinking cursor will indicate - to - the user to click on a point on an image. The specified - information - will be returned at that time. The default event is + to the user to click on a point on an image. The specified + information will be returned at that time. The default event is button. In the last form, the following macros will be expanded if present: $width, $height, $depth, $bitpix, $filename, $regions, $filename[$regions], $env, $pan, $value, - $x, - $y, $z. See See Analysis + Macros for more information.

Syntax:
iexam []
-       - [[]|button|key|any] coordinate <coordsys> - [<skyframe>] +       [[]|button|key|any] + coordinate <coordsys> [<skyframe>] [<skyformat>]
      [[]|button|key|any] data [width][height]
-       - [[]|button|key|any] <macro string>]
+       [[]|button|key|any] + <macro string>]
 
Example:
string value = ds9.get(string cmd)
 iexam
- - iexam coordinate image
+ iexam coordinate image
iexam key coordinate image # return coordinate and key event
iexam coordinate wcs fk5 degrees
iexam coordinate wcs galactic sexagesimal
iexam coordinate fk5
iexam data # return data value
iexam key data # return data value and key event
- iexam data 3 3 # return all data in 3x3 box about selected - point
+ iexam data 3 3 # return all data in 3x3 box about selected point
iexam {'Click at $x,$y in file $filename'}

iis

Set/Get IIS Filename. Optional mosaic number maybe supplied.

@@ -1766,34 +1612,29 @@ iis filename foo.fits
iis filename bar.fits 4

jpeg

-

Load JPEG image into current frame. Optional parameters: - jpeg quality (1-100)

+

Load JPEG image into current frame. Optional parameters: jpeg + quality (1-100)

Syntax:
jpeg [new|slice] [<filename>] [1-100]
 
Example:
- string value = ds9.get(string - cmd)
+ string value = ds9.get(string cmd)
 jpeg
jpeg 100
 ds9.set(string cmd)
- - jpeg foo.jpeg
+ jpeg foo.jpeg
jpeg new foo.jpeg
- jpeg slice - foo.jpeg
+ jpeg slice foo.jpeg
 jpeg
jpeg new
 jpeg slice

lock

Lock all other frames to the current frame.

Syntax:
- lock [frame - <coordsys>|none]
+ lock [frame <coordsys>|none]
     [crosshair <coordsys>|none]
- -      [crop <coordsys>|none]
+      [crop <coordsys>|none]
     [slice <coordsys>|none]
     [bin [yes|no]]
     [axes [yes|no]]
@@ -1801,16 +1642,12 @@      [scalelimits [yes|no]]
     [colorbar [yes|no]]
     [block [yes|no]]
- -      [smooth [yes|no]]
- -      [3d [yes|no]]
- -  
+      [smooth [yes|no]]
+      [3d [yes|no]]
+  
Example:
 string value = ds9.get(string cmd)
- - lock frame
+ lock frame
lock crosshair
 lock crop
lock slice
@@ -1822,13 +1659,10 @@ lock block
lock smooth
 lock 3d
- - ds9.set(string cmd)
- lock frame - wcs
+ ds9.set(string cmd)
+ lock frame wcs
 lock crosshair wcs
- lock crop - wcs
+ lock crop wcs
lock slice wcs
lock bin yes
lock axes yes
@@ -1897,17 +1731,12 @@

match

Match all other frames to the current frame.

Syntax:
- match [frame - <coordsys>]
+ match [frame <coordsys>]
      [crosshair <coordsys>]
- -       [crop <coordsys>]
- -       [slice - <coordsys>]
-       - [bin]
+       [crop <coordsys>]
+       [slice <coordsys>]
+       [bin]
      [axes]
      [scale]
      [scalelimits]
@@ -1919,8 +1748,7 @@ Example:
ds9.set(string cmd)
 match frame wcs
- match - crosshair wcs
+ match crosshair wcs
 match crop wcs
match slice wcs
match bin
@@ -1940,11 +1768,9 @@  
Example:
string value = ds9.get(string cmd)
- - mecube
+ mecube
 ds9.set(string cmd)
- - mecube foo.fits
+ mecube foo.fits
mecube new foo.fits
 mecube
mecube new @@ -1983,16 +1809,13 @@ mosaic [wcs|wcsa...wcsz|iraf] [new|mask] [<filename>]
 
Example:
- string value = ds9.get(string - cmd)
+ string value = ds9.get(string cmd)
 mosaic
- ds9.set(string - cmd)
+ ds9.set(string cmd)
 mosaic foo.fits
mosaic wcs foo.fits
mosaic wcs new foo.fits
- mosaic wcs mask - foo.fits
+ mosaic wcs mask foo.fits
 mosaic
mosaic wcs
mosaic wcs new
@@ -2005,40 +1828,36 @@ [<filename>]
 
Example:
- string value = ds9.get(string - cmd)
+ string value = ds9.get(string cmd)
 mosaicimage
- ds9.set(string - cmd)
+ ds9.set(string cmd)
 mosaicimage foo.fits
mosaicimage wcs foo.fits
mosaicimage wcs new foo.fits
- mosaicimage wcs mask - foo.fits
+ mosaicimage wcs mask foo.fits
 mosaicimage
mosaicimage wcs
mosaicimage wcs new
 mosaicimage wcs mask

movie

-

Create mpeg1 movie from snap shots of the DS9 window. A - slice movie cycles though all slices of a cube. A - frame movie cycles through all active frames. A - 3d movie cycles through specified viewing angles. The - default is frame. Optional parameters for 3d: - number of frames, azimuth from/to, elevation from/to, slice - from/to, oscillate/repeat times.

+

Create mpeg1 movie from snap shots of the DS9 window. A slice + movie cycles though all slices of a cube. A frame + movie cycles through all active frames. A 3d movie + cycles through specified viewing angles. The default is frame. + Optional parameters for 3d: number of frames, azimuth + from/to, elevation from/to, slice from/to, oscillate/repeat + times.

Syntax:
movie [slice|frame|3d] <filename>
- - movie 3d <filename> + movie 3d <filename> [number|azfrom|azto|elfrom|elto|slfrom|slto|oscillate|repeat <#>]
 
Example:
ds9.set(string cmd)
movie slice ds9.mpg
- movie 3d ds9.mpg number 10 azfrom - -60 azto 60 oscillate 1
+ movie 3d ds9.mpg number 10 azfrom -60 azto 60 oscillate + 1

multiframe

Load FITS multiple extension file as multiple images.

@@ -2047,19 +1866,16 @@  
Example:
 ds9.set(string cmd)
- multiframe - foo.fits
+ multiframe foo.fits
 multiframe

nameserver

Support Name Server functions. Coordinates are in fk5.

Syntax:
nameserver [<object>]
           - [name - <object>]
+ [name <object>]
           - [server - ned-sao|ned-cds|simbad-sao|simbad-cds|vizier-sao|vizier-cds]
+ [server ned-sao|ned-cds|simbad-sao|simbad-cds|vizier-sao|vizier-cds]
           [skyformat degrees|sexagesimal]
           @@ -2103,17 +1919,13 @@ nrrd [new|mask] [<filename>]
 
Example:
- string value = ds9.get(string - cmd)
+ string value = ds9.get(string cmd)
 nrrd
nrrd big
- ds9.set(string - cmd, string url)
- nrrd - foo.nrrd
+ ds9.set(string cmd, string url)
+ nrrd foo.nrrd
nrrd new foo.nrrd
- nrrd mask - foo.nrrd
+ nrrd mask foo.nrrd
 nrrd
nrrd new
nrrd mask
@@ -2142,10 +1954,8 @@ nvss
nvss m31
 nvss name m31
- - nvss name clear
- nvss 00:42:44.404 - +41:16:08.78
+ nvss name clear
+ nvss 00:42:44.404 +41:16:08.78
nvss size 60 60 arcmin
nvss save yes
nvss frame current
@@ -2231,10 +2041,8 @@

Display and configure data plots. All plot commands take an optional second command, the plot name. If no plot name is specified, the last plot created is assumed. Plot data is - assumed - to be a pair of coordinates, with optional error values. The - follow - are valid data descriptions:

+ assumed to be a pair of coordinates, with optional error values. + The follow are valid data descriptions:

xy        x and y coordinates
xyex      x,y coordinates with x errors
xyey      x,y coordinates with y errors
@@ -2243,394 +2051,251 @@

To create a new plot, use the plot new command.

Syntax:
- # create new empty plot - window
+ # create new empty plot window
 plot []
- -      [line|bar|scatter]
- -      [new]
- -      [new - line|bar|scatter]
-      - [new name <plotname>]
- -      [new name <plotname> +      [line|bar|scatter]
+      [new]
+      [new line|bar|scatter]
+      [new name <plotname>]
+      [new name <plotname> line|bar|scatter]
- # - load data into existing plot from stdin
- - plot [[<plotname>] data - xy|xyex|xyey|xyexey]
+ # load data into existing plot from stdin
+ plot [[<plotname>] data xy|xyex|xyey|xyexey]
- # existing - plot
+ # existing plot
 plot [[<plotname>] load <filename> xy|xyex|xyey|xyexey]
- -      [[<plotname>] save - <filename>]
-      - [[<plotname>] clear]
- -      [[<plotname>] - duplicate - [#]]
-      - [[<plotname>] stats yes|no]
- -      [[<plotname>] list - yes|no]
-      - [[<plotname>] loadconfig +      [[<plotname>] save <filename>]
-      - [[<plotname>] saveconfig <filename>]
- -      [[<plotname>] pagesetup orient - portrait|landscape]
-      - [[<plotname>] pagesetup size - letter|legal|tabloid|poster|a4]
- -      [[<plotname>] - print]
-      - [[<plotname>] print destination - printer|file]
-      - [[<plotname>] print command - <command>]
-      - [[<plotname>] print filename +      [[<plotname>] clear]
+      [[<plotname>] + duplicate [#]]
+      [[<plotname>] + stats yes|no]
+      [[<plotname>] + list yes|no]
+      [[<plotname>] + loadconfig <filename>]
+      [[<plotname>] saveconfig <filename>]
-      - [[<plotname>] print color rgb|gray]
- -      [[<plotname>] +      [[<plotname>] pagesetup + orient portrait|landscape]
+      [[<plotname>] pagesetup + size letter|legal|tabloid|poster|a4]
+      [[<plotname>] print]
+      [[<plotname>] print + destination printer|file]
+      [[<plotname>] print + command <command>]
+      [[<plotname>] print + filename <filename>]
+      [[<plotname>] print + color rgb|gray]
+      [[<plotname>] close]
-      - [[<plotname>] mode pointer|zoom]
- -
+      [[<plotname>] + mode pointer|zoom]
+
# configure graph
- plot - [[<plotname>] axis x|y grid yes|no]
- -      [[<plotname>] axis x|y log - yes|no]
-      - [[<plotname>] axis x|y flip yes|no]
- -      [[<plotname>] axis x|y auto + plot [[<plotname>] axis x|y grid yes|no]
+      [[<plotname>] axis x|y + log yes|no]
+      [[<plotname>] axis x|y + flip yes|no]
+      [[<plotname>] axis x|y auto yes|no]
-      - [[<plotname>] axis x|y min <value>]
- -      [[<plotname>] axis x|y max +      [[<plotname>] axis x|y min + <value>]
+      [[<plotname>] axis x|y max <value>]
-      - [[<plotname>] axis x|y format +      [[<plotname>] axis x|y format <string>]
-      - [[<plotname>] legend yes|no]
- -      [[<plotname>] legend position - right|left|top|bottom]
-      - [[<plotname>] font title|labels|numbers font - times|helvetica|courier]
-      - [[<plotname>] font title|labels|numbers +      [[<plotname>] + legend yes|no]
+      [[<plotname>] legend + position right|left|top|bottom]
+      [[<plotname>] font + title|labels|numbers font times|helvetica|courier]
+      [[<plotname>] font title|labels|numbers size <value>]
-      - [[<plotname>] font title|labels|numbers +      [[<plotname>] font title|labels|numbers weight normal|bold]
-      - [[<plotname>] font title|labels|numbers +      [[<plotname>] font title|labels|numbers slant roman|italic]
-      - [[<plotname>] title <string>]
- -      [[<plotname>] title x|y +      [[<plotname>] title + <string>]
+      [[<plotname>] title x|y <string>]
-      - [[<plotname>] barmode - normal|stacked|aligned|overlap]
+      [[<plotname>] + barmode normal|stacked|aligned|overlap]
- - # configure current dataset
- plot - [[<plotname>] show yes|no]
-   -    [[<plotname>] shape + # configure current dataset
+ plot [[<plotname>] show yes|no]
+      [[<plotname>] shape circle|square|diamond|plus|splus|scross|triangle|arrow]
      [[<plotname>] shape fill yes|no]
- -      [[<plotname>] shape - color <value>]
- -      [[<plotname>] smooth - step|linear|cubic|quadratic|catrom]
- -      [[<plotname>] color - <value>]
-      - [[<plotname>] width <value>]
- -      [[<plotname>] dash - yes|no]
-      - [[<plotname>] error yes|no]
- -      [[<plotname>] error +      [[<plotname>] + shape color <value>]
+      [[<plotname>] + smooth step|linear|cubic|quadratic|catrom]
+      [[<plotname>] color <value>]
-      - [[<plotname>] color <value>]
- -      [[<plotname>] error +      [[<plotname>] width <value>]
- -      [[<plotname>] name - <string>]
+      [[<plotname>] + dash yes|no]
+      [[<plotname>] + error yes|no]
+      [[<plotname>] + error color <value>]
+      [[<plotname>] color + <value>]
+      [[<plotname>] + error width <value>]
+      [[<plotname>] + name <string>]
- # select - current dataset
- plot [[<plotname>] - select <value>]
+ # select current dataset
+ plot [[<plotname>] select <value>]
  
Example:
- # return all - plotnames
- string value = ds9.get(string - cmd)
+ # return all plotnames
+ string value = ds9.get(string cmd)
 plot
- - # create new empty plot window
- - ds9.set(string cmd)
- - plot
+ # create new empty plot window
+ ds9.set(string cmd)
+ plot
 plot bar
- plot - new
+ plot new
 plot new bar
- plot - new name foo
- plot new name foo - bar
+ plot new name foo
+ plot new name foo bar
- # load additional dataset - into an existing plot
- ds9.set(string cmd, - string url)
- plot data xy # plot additional - data
- plot foo data xy # plot additional - data
+ # load additional dataset into an existing plot
+ ds9.set(string cmd, string url)
+ plot data xy # plot additional data
+ plot foo data xy # plot additional data
- string value = - ds9.get(string cmd)
- plot - stats
+ string value = ds9.get(string cmd)
+ plot stats
 plot list
- - ds9.set(string cmd)
- plot load foo.dat - xy
+ ds9.set(string cmd)
+ plot load foo.dat xy
 plot save foo.dat
- - plot clear
- plot duplicate - 1
+ plot clear
+ plot duplicate 1
 plot stats yes
- plot - list yes
- plot loadconfig - foo.plt
- plot saveconfig - foo.plt
- plot pagesetup orient - portrait
- plot pagesetup size - letter
+ plot list yes
+ plot loadconfig foo.plt
+ plot saveconfig foo.plt
+ plot pagesetup orient portrait
+ plot pagesetup size letter
 plot print
- plot - print destination file
- plot print command - lp
- plot print filename - foo.ps
+ plot print destination file
+ plot print command lp
+ plot print filename foo.ps
 plot print color rgb
- - plot close
+ plot close
- string value = - ds9.get(string cmd)
- plot - mode
+ string value = ds9.get(string cmd)
+ plot mode
 ds9.set(string cmd)
- - plot mode pointer
+ plot mode pointer
- # - configure plot
- string value = ds9.get(string - cmd)
+ # configure plot
+ string value = ds9.get(string cmd)
 plot axis x grid
- - plot axis x log
- plot axis x - flip
+ plot axis x log
+ plot axis x flip
 plot axis x auto
- - plot axis x min
- plot axis x - max
+ plot axis x min
+ plot axis x max
 plot axis x format
- - plot legend
- plot legend - position
- plot font numbers - font
+ plot legend
+ plot legend position
+ plot font numbers font
 plot font numbers size
- - plot font numbers weight
- plot font - numbers slant
+ plot font numbers weight
+ plot font numbers slant
 plot title
- - plot title x
- plot - barmode
+ plot title x
+ plot barmode
 ds9.set(string cmd)
- - plot axis x grid yes
- plot axis x log - yes
+ plot axis x grid yes
+ plot axis x log yes
 plot axis x flip yes
- - plot axis x auto no
- plot axis x min - 0
+ plot axis x auto no
+ plot axis x min 0
 plot axis x max 100
- - plot axis x format "%f"
+ plot axis x format "%f"
- - string value = ds9.get(string cmd)
- plot - legend
+ string value = ds9.get(string cmd)
+ plot legend
 plot legend position
- - ds9.set(string cmd)
- plot legend - yes
- plot legend position - left
+ ds9.set(string cmd)
+ plot legend yes
+ plot legend position left
- string value = - ds9.get(string cmd)
- plot font numbers - font
+ string value = ds9.get(string cmd)
+ plot font numbers font
 plot font numbers size
- - plot font numbers weight
- plot font - numbers slant
- ds9.set(string - cmd)
- plot font numbers font - times
- plot font numbers size - 12
- plot font numbers weight - bold
- plot font numbers slant - italic
+ plot font numbers weight
+ plot font numbers slant
+ ds9.set(string cmd)
+ plot font numbers font times
+ plot font numbers size 12
+ plot font numbers weight bold
+ plot font numbers slant italic
- string value = - ds9.get(string cmd)
- plot - title
+ string value = ds9.get(string cmd)
+ plot title
 plot title xaxis
- - plot title yaxis
- ds9.set(string - cmd)
- plot title "This is a - Title"
- plot title x "X - Axis"
+ plot title yaxis
+ ds9.set(string cmd)
+ plot title "This is a Title"
+ plot title x "X Axis"
 plot title y "Y Axis"
- - plot title legend "This is the Legend"
- -
- string value = ds9.get(string - cmd)
+ plot title legend "This is the Legend"
+
+ string value = ds9.get(string cmd)
 plot barmode
- - ds9.set(string cmd)
- plot barmode - aligned
+ ds9.set(string cmd)
+ plot barmode aligned
- # configure current - dataset
- string value = ds9.get(string - cmd)
+ # configure current dataset
+ string value = ds9.get(string cmd)
 plot show
- plot - shape
+ plot shape
 plot shape fill
- - plot shape color
- plot - smooth
+ plot shape color
+ plot smooth
 plot color
- plot - width
+ plot width
 plot dash
- plot - error
+ plot error
 plot error color
- - plot error width
- plot - name
+ plot error width
+ plot name
 ds9.set(string cmd)
- - plot show yes
- plot shape - circle
+ plot show yes
+ plot shape circle
 plot shape fill no
- - plot shape color cyan
- plot smooth - step
+ plot shape color cyan
+ plot smooth step
 plot color red
- - plot width 2
- plot dash - yes
+ plot width 2
+ plot dash yes
 plot error yes
- plot - error color red
- plot error width - 2
+ plot error color red
+ plot error width 2
 plot name "My Data"
- -
+
# select current dataset
- - string value = ds9.get(string cmd)
- plot - select
+ string value = ds9.get(string cmd)
+ plot select
 ds9.set(string cmd)
plot select 2

@@ -2641,14 +2306,12 @@ png [new|slice] [<filename>]
 
Example:
- string value = ds9.get(string - cmd)
+ string value = ds9.get(string cmd)
 png
ds9.set(string cmd)
 png foo.png
png new foo.png
- png slice - foo.png
+ png slice foo.png
 png
png new
 png slice
@@ -2656,10 +2319,8 @@

Set region and coordinate output format precision.

Syntax:
precision <linear> <degree> - <hms> - <dms> - <arcmin> - <arcsec>
+ <hms> <dms> + <arcmin> <arcsec>

 Example:
string value = ds9.get(string cmd)
@@ -2704,9 +2365,8 @@       [command <command>]
      [filename <filename>]
      [color rgb|cmyk|gray]
-       [level 1|2]
-       [resolution - 53|72|75|150|300|600]
+       [level 1|2|3]
+       [resolution 72|screen|96|144|150|225|300|600|1200]
 
Example:
string value = ds9.get(string cmd)
@@ -2723,7 +2383,7 @@ print filename foo.ps
print color cmyk
print level 2
- print resolution 75 + print resolution 96

raise

Raise in the window stacking order.

Syntax:
@@ -2767,12 +2427,10 @@         [skyformat degrees|sexagesimal]
        [strip yes|no]
-         [shape - <shape>]
+         [shape <shape>]
        [color &ltcolor>]
-         [width - <width>]
+         [width <width>]
         [fixed|edit|rotate|delete yes|no]
        @@ -2784,8 +2442,7 @@         [template <filename>]
        [template <filename> - at - <ra> <dec> <coordsys> <skyframe>]
+ at <ra> <dec> <coordsys> <skyframe>]
        [savetemplate <filename>]
        [groups]
@@ -2794,13 +2451,11 @@ new]
        [group <tag> update]
-         [group <tag> - select]
+         [group <tag> select]
        [group <tag> color <color>]
        [group <tag> copy]
-         [group <tag> - delete]
+         [group <tag> delete]
        [group <tag> cut]
        [group <tag> font <font>]
@@ -2811,8 +2466,7 @@         [group <tag> moveback]
        [group <tag> - property - <property> yes|no]
+ property <property> yes|no]
        [copy]
        [cut]
        [paste @@ -2968,8 +2622,7 @@ rgb channel red # set current channel to red
rgb view blue no # turn off blue channel
rgb system wcs # set rgb coordinate system
- rgb lock - wcs yes
+ rgb lock wcs yes
rgb lock crop yes
rgb lock slice yes
rgb lock bin yes
@@ -2989,16 +2642,13 @@ [[xdim=<x>,ydim=<y>|dim=<dim>],[zdim=3],bitpix=<b>,skip=<s>,endian=[little|big]]
 
Example:
- string value = ds9.get(string - cmd)
+ string value = ds9.get(string cmd)
 rgbarray
rgbarray little
- ds9.set(string - cmd)
+ ds9.set(string cmd)
 rgbarray foo.arr[dim=512,zdim=3,bitpix=-32,endian=little]
- rgbarray new - foo.arr[dim=512,zdim=3,bitpix=-32,endian=little]
+ rgbarray new foo.arr[dim=512,zdim=3,bitpix=-32,endian=little]

rgbcube

Load FITS rgbcube into rgb frame.

@@ -3006,12 +2656,10 @@ rgbcube [new] [<filename>]
 
Example:
- string value = ds9.get(string - cmd)
+ string value = ds9.get(string cmd)
 rgbcube
 ds9.set(string cmd)
- - rgbcube foo.fits
+ rgbcube foo.fits
rgbcube new foo.fits
 rgbcube
rgbcube new
@@ -3022,18 +2670,15 @@ rgbimage [new] [<filename>]
 
Example:
- string value = ds9.get(string - cmd)
+ string value = ds9.get(string cmd)
 rgbimage
- ds9.set(string - cmd)
+ ds9.set(string cmd)
 rgbimage foo.fits
rgbimage new foo.fits
 rgbimage
rgbimage new

rotate

-

Controls the rotation angle (in degrees) of the current - frame.

+

Controls the rotation angle (in degrees) of the current frame.

Syntax:
rotate [<value>]
       [to <value>]
@@ -3057,11 +2702,9 @@  
Example:
 ds9.set(string cmd)
- samp - no
+ samp no
 samp disconnect
- samp broadcast - image
+ samp broadcast image
samp send image aladin

save

@@ -3072,14 +2715,12 @@  
Example:
 ds9.set(string cmd)
- save - foo.fits
+ save foo.fits
save fits foo.fits image
save fits foo.fits table
save fits foo.fits slice
save rgbimage foo.fits
- save rgbcube - foo.fits
+ save rgbcube foo.fits
save mecube foo.fits
save mosaic foo.fits
save mosaicimage foo.fits
@@ -3090,8 +2731,7 @@ parameters: jpeg quality (1-100) and tiff compression method.

Syntax:
- saveimage [fits|eps|gif|tiff|jpeg|png] - <filename>
+ saveimage [fits|eps|gif|tiff|jpeg|png] <filename>
saveimage <filename>.jpeg [1-100]
saveimage <filename>.tiff [none|jpeg|packbits|deflate]
 
@@ -3186,47 +2826,38 @@

Support for VO Simple Image Access protocol. The first command will create a new search. All other commands operated on the - last - search created, unless indicated otherwise.

+ last search created, unless indicated otherwise.

Syntax:
- sia - [2mass|akari|astrowise|cadc|cxc|mast|sdss|skyview|tgssadr]
+ sia [2mass|akari|astrowise|cadc|cxc|mast|sdss|skyview|tgssadr]

         [<ref>] [cancel]
-     -     [<ref>] [clear]
-    -      [<ref>] [close]
+         [<ref>] + [clear]
+         [<ref>] [close]
        [<ref>] - [coordinate - <ra> <dec> <coordsys>]
- -         - [<ref>] [crosshair]
+ [coordinate <ra> <dec> <coordsys>]
+         [<ref>] + [crosshair]
        [<ref>] [export sb|tsv <filename>]
-    -      [<ref>] [name <object>]
- -         [<ref>] [print]
+         [<ref>] [name + <object>]
+         [<ref>] [print]
        [<ref>] [retrieve]
- -         [<ref>] [save - <filename>]
+         + [<ref>] [save <filename>]
        [<ref>] [radius <value> degrees|arcmin|arcsec]
        [<ref>] [sky <skyframe>]
-     -     [<ref>] [skyformat - <skyformat>]
-     -     [<ref>] [system - <coordsys>]
-      -    [<ref>] [update]
+         [<ref>] + [skyformat <skyformat>]
+         [<ref>] + [system <coordsys>]
+         [<ref>] + [update]
 
Example:
string value = ds9.get(string cmd)
@@ -3269,8 +2900,7 @@         [name <object>|clear]
        [<ra> - <dec>] - # in wcs fk5
+ <dec>] # in wcs fk5
        [size <width> <height> degrees|arcmin|arcsec]
        [pixels <width> @@ -3295,10 +2925,8 @@ skyview
skyview m31
 skyview name m31
- - skyview name clear
- skyview 00:42:44.404 - +41:16:08.78
+ skyview name clear
+ skyview 00:42:44.404 +41:16:08.78
skyview size 60 60 arcmin
skyview pixels 600 600
skyview save yes
@@ -3331,25 +2959,22 @@        [yes|no]
       [function boxcar|tophat|gaussian]
- -        [radius +        [radius <value>]
- -        [radiusminor - <value>]
- -        - [sigma - <value>]
- -        +        + [radiusminor <value>]
+        + + [sigma <value>]
+        + [sigmaminor <value>]
- -        +        [angle + <value>]
- -        [match]
+        + [match]
       [lock [yes|no]]
       [open|close]
 
@@ -3358,8 +2983,7 @@ smooth
smooth function
 smooth radius
- - smooth radiusminor
+ smooth radiusminor
smooth sigma
smooth sigmaminor
smooth angle
@@ -3368,19 +2992,14 @@ smooth
smooth yes
smooth function tophat
- smooth radius - 4
- smooth radiusminor - 4
- - smooth sigma - 2.0
- - smooth sigmaminor - 2.0
- - smooth angle - 45
+ smooth radius 4
+ smooth radiusminor 4
+ smooth + sigma 2.0
+ smooth + sigmaminor 2.0
+ smooth + angle 45
 smooth open
smooth close
@@ -3405,8 +3024,7 @@  
Example:
 ds9.set(string cmd)
- tcl {puts - {Hello, World}}
+ tcl {puts {Hello, World}}

threads

Set number of process threads for functions which are @@ -3416,24 +3034,20 @@  
Example:
string value = ds9.get(string cmd)
- - threads
+ threads
ds9.set(string cmd)
 threads 8

tiff

-

Load TIFF image into current frame. Optional parameters: - tiff compression method.

+

Load TIFF image into current frame. Optional parameters: tiff + compression method.

Syntax:
- tiff [new|slice] [<filename>] - [none|jpeg|packbits|deflate]
+ tiff [new|slice] [<filename>] [none|jpeg|packbits|deflate]
 
Example:
- string value = ds9.get(string - cmd)
+ string value = ds9.get(string cmd)
 tiff
tiff jpeg
- ds9.set(string - cmd)
+ ds9.set(string cmd)
 tiff foo.tiff
tiff new foo.tiff
tiff slice foo.tiff
@@ -3478,9 +3092,8 @@ form, the first argument is the number of the fits HDU (starting with 1) and the remaining args are a bounding box in IMAGE coordinates. By default, the screen is updated the next - available - idle cycle. However, you may force an immediate update by - specifying the NOW option.

+ available idle cycle. However, you may force an immediate update + by specifying the NOW option.

Syntax:
update []
       [# x1 y1 x2 y2]
@@ -3500,8 +3113,7 @@  
Example:
 ds9.set(string cmd)
- url - http://foo.bar.edu/foo.fits + url http://foo.bar.edu/foo.fits

version

Returns the current version of DS9.

Syntax:
@@ -3532,8 +3144,7 @@       [units yes|no]
      [image|physical|wcs|wcsa...wcsz yes|no]
-       [frame - yes|no]
+       [frame yes|no]
       [red yes|no]
      [green yes|no]
      [blue yes|no]
@@ -3575,8 +3186,7 @@ view units yes
view wcsa yes
 view frame yes
- view red - yes
+ view red yes
view green yes
view blue yes

vla

@@ -3588,8 +3198,7 @@       [<ra> <dec>] # in wcs fk5
      [size <width> - <height> - degrees|arcmin|arcsec]
+ <height> degrees|arcmin|arcsec]
      [save yes|no]
      [frame new|current]
      [update frame|crosshair]
@@ -3608,8 +3217,7 @@ vla
vla m31
 vla name m31
- vla - name clear
+ vla name clear
 vla 00:42:44.404 +41:16:08.78
vla size 60 60 arcmin
vla save yes
@@ -3644,10 +3252,8 @@ vlss
vlss m31
 vlss name m31
- - vlss name clear
- vlss 00:42:44.404 - +41:16:08.78
+ vlss name clear
+ vlss 00:42:44.404 +41:16:08.78
vlss size 60 60 arcmin
vlss save yes
vlss frame current
@@ -3688,16 +3294,12 @@

wcs

Controls the World Coordinate System for the current frame. If the wcs system, skyframe, or skyformat is modified, the info - panel, - compass, grid, and alignment will be modified accordingly. Also, - using this access point, a new WCS specification can be loaded - and - used by the current image regardless of the WCS that was - contained - in the image file. WCS specification can be sent to DS9 as an - ASCII - file . Please see WCS for more - information.

+ panel, compass, grid, and alignment will be modified + accordingly. Also, using this access point, a new WCS + specification can be loaded and used by the current image + regardless of the WCS that was contained in the image file. WCS + specification can be sent to DS9 as an ASCII file . Please see WCS for more information.

Syntax:
wcs [[system] wcs|wcsa...wcsz]
    [[sky] fk4|fk5|icrs|galactic|ecliptic]
@@ -3719,11 +3321,9 @@ wcs wcs
wcs system wcs
 wcs fk5
- wcs sky - fk5
+ wcs sky fk5
 wcs sexagesimal
- wcs skyformat - sexagesimal
+ wcs skyformat sexagesimal
wcs align yes
wcs reset
wcs reset 3
@@ -3743,8 +3343,7 @@ web []
    [<url>]
    [new <webname> <url>]
- -     [<webname>] [click +     [<webname>] [click back|forward|stop|reload|#]
    [<webname>] [clear]
    [<webname>] [close]
diff --git a/ds9/doc/ref/xpa.html b/ds9/doc/ref/xpa.html index 44335ff..21d3ba7 100644 --- a/ds9/doc/ref/xpa.html +++ b/ds9/doc/ref/xpa.html @@ -14,18 +14,14 @@ align="middle"> XPA Access Points

The XPA - messaging - system provides seamless communication between DS9 and other - Unix - programs, including X programs, Perl, S-Lang, and Tcl/Tk. It also provides an easy way for users to - communicate - with DS9 by executing XPA client commands in the shell or by - utilizing such commands in scripts. Because XPA works both at - the - programming level and the shell level, it is a powerful tool for - unifying any analysis environment.

+ communicate with DS9 by executing XPA client commands in the + shell or by utilizing such commands in scripts. Because XPA + works both at the programming level and the shell level, it is a + powerful tool for unifying any analysis environment.

2mass
3d
about
@@ -136,16 +132,13 @@       [<ra> <dec>] # in wcs fk5
      [size <width> - <height> - degrees|arcmin|arcsec]
+ <height> degrees|arcmin|arcsec]
      [save yes|no]
      [frame new|current]
      [update frame|crosshair]
      [survey j|h|k]
- -       [open|close]
- -  
+       [open|close]
+  
Example:
$xpaget ds9 2mass name
$xpaget ds9 2mass coord
@@ -155,19 +148,15 @@ $xpaget ds9 2mass survey
$xpaset -p ds9 2mass
 $xpaset -p ds9 2mass m31
- - $xpaset -p ds9 2mass name m31
- - $xpaset -p ds9 2mass name clear
- $xpaset - -p ds9 2mass 00:42:44.404 +41:16:08.78
+ $xpaset -p ds9 2mass name m31
+ $xpaset -p ds9 2mass name clear
+ $xpaset -p ds9 2mass 00:42:44.404 +41:16:08.78
$xpaset -p ds9 2mass size 60 60 arcmin
$xpaset -p ds9 2mass save yes
$xpaset -p ds9 2mass frame current
$xpaset -p ds9 2mass update frame
$xpaset -p ds9 2mass survey j
- $xpaset -p ds9 2mass - open
+ $xpaset -p ds9 2mass open
$xpaset -p ds9 2mass close

3d

Support for 3D frame.

@@ -179,19 +168,15 @@    [scale <scale>]
   [method mip|aip]
   [background none|azimuth|elevation]
- -    [border yes|no]
+    [border yes|no]
   [border color <color>]
   [highlite yes|no]
   [highlite color <color>]
- -    [compass yes|no]
+    [compass yes|no]
   [compass color <color>]
- -    [match]
+    [match]
   [lock [yes|no]]
-    - [open|close]
+    [open|close]
  
Example:
$xpaget ds9 3d view
@@ -199,44 +184,34 @@ $xpaget ds9 3d el
$xpaget ds9 3d scale
$xpaget ds9 3d method
- $xpaget ds9 3d - background
+ $xpaget ds9 3d background
 $xpaget ds9 3d border
$xpaget ds9 3d border color
$xpaget ds9 3d highlite
$xpaget ds9 3d highlite color
- $xpaget ds9 3d - compass
- $xpaget ds9 3d compass - color
- $xpaget ds9 3d - lock
- $xpaset -p ds9 3d # create new 3D - frame
+ $xpaget ds9 3d compass
+ $xpaget ds9 3d compass color
+ $xpaget ds9 3d lock
+ $xpaset -p ds9 3d # create new 3D frame
$xpaset -p ds9 3d view 45 30
$xpaset -p ds9 3d az 45
$xpaset -p ds9 3d el 30
$xpaset -p ds9 3d scale 10
$xpaset -p ds9 3d method mip
$xpaset -p ds9 3d background azimuth
- $xpaset -p - ds9 3d border yes
+ $xpaset -p ds9 3d border yes
$xpaset -p ds9 3d border color red
$xpaset -p ds9 3d highlite yes
$xpaset -p ds9 3d highlite color red
- $xpaset - -p ds9 3d compass yes
- - $xpaset -p ds9 3d compass color - red
- - $xpaset -p ds9 3d - match
+ $xpaset -p ds9 3d compass yes
+ $xpaset -p ds9 3d + compass color red
+ $xpaset + -p ds9 3d match
$xpaset -p ds9 3d lock yes
 - $xpaset - -p ds9 3d open
+ $xpaset -p ds9 3d open
$xpaset -p ds9 3d close

about

@@ -261,8 +236,7 @@

analysis

Control external analysis tasks. Tasks are numbered as they are loaded, starting with 0. Can also be used to display a message - and - display text in the text dialog window.

+ and display text in the text dialog window.

Syntax:
analysis [<task number>]
         @@ -278,8 +252,7 @@ ok|okcancel|yesno <message>]
         [entry <message>]
-          - [text]
+          [text]

 Example:
$xpaget ds9 analysis
@@ -311,10 +284,8 @@ $xpaget ds9 array > foo.arr
$xpaget ds9 array little > foo.arr
$xpaset -p ds9 array foo.arr[dim=512,bitpix=-32,endian=little]
- $xpaset -p ds9 array new - foo.arr[dim=512,bitpix=-32,endian=little]
- $xpaset -p ds9 array mask - foo.arr[dim=512,bitpix=-32,endian=little]
+ $xpaset -p ds9 array new foo.arr[dim=512,bitpix=-32,endian=little]
+ $xpaset -p ds9 array mask foo.arr[dim=512,bitpix=-32,endian=little]
$cat foo.arr | xpaset ds9 array [dim=512,bitpix=-32,endian=little]
$cat foo.arr | xpaset ds9 array new @@ -340,8 +311,7 @@

bin

Controls binning factor, binning buffer size, and  binning function for binning FITS bin tables. The access point blocking - is - provided for backward compatibility.

+ is provided for backward compatibility.

Syntax:
bin [about <x> <y>]
    [about center]
@@ -351,10 +321,8 @@     [factor <value> [<vector>]]
    [depth <value>]
    [filter <string>]
- -     [filter clear]
- -     [function average|sum]
+     [filter clear]
+     [function average|sum]
    [in]
    [out]
    [to fit]
@@ -417,8 +385,7 @@ <value>]
      [in]
      [out]
- -       [to fit]
+       [to fit]
      [match]
      [lock [yes|no]]
      [open|close]
@@ -426,41 +393,34 @@ Example:
$xpaget ds9 block
$xpaget ds9 block lock
- $xpaset -p ds9 - block 4
+ $xpaset -p ds9 block 4
$xpaset -p ds9 block 4 2
- - $xpaset -p ds9 block to - 4
+ $xpaset -p ds9 block + to 4
$xpaset -p ds9 block to 4 2
- - $xpaset -p ds9 block in
- - $xpaset -p ds9 block + $xpaset -p ds9 block in
+ $xpaset -p ds9 block out
- $xpaset -p ds9 block - to fit
+ $xpaset -p ds9 block to + fit
$xpaset -p ds9 block match
$xpaset -p ds9 block lock yes
$xpaset -p ds9 block open
- $xpaset -p ds9 block - close
+ $xpaset -p ds9 block close

catalog
cat

Support for catalogs. The first three commands will create a - new - catalog search. All other commands operated on the last search - created, unless indicated otherwise.

+ new catalog search. All other commands operated on the last + search created, unless indicated otherwise.

Syntax:
catalog [new]
        [ned|simbad|denis|skybot]
        [aavso|ac|ascss|cmc|gaia|gsc1|gsc2|gsc3|nomad|ppmx|sao|sdss5|sdss6|sdss7|sdss8|sdss9|tycho]
-         - [ua2|ub1|ucac2|ucac2sup|ucac3|ucac4|urat1]
+         [ua2|ub1|ucac2|ucac2sup|ucac3|ucac4|urat1]
        [2mass|iras]
        [csc|xmm|rosat]
        [first|nvss]
@@ -474,31 +434,26 @@         [import sb|tsv <filename>]

-         - [<ref>] [<ra> <dec> - <coordsys>]
-       -   [<ref>] [allcols]
- -         [<ref>] - [allrows]
+         [<ref>] + [<ra> <dec> <coordsys>]
+         [<ref>] [allcols]
+         + [<ref>] [allrows]
        [<ref>] [cancel]
-         - [<ref>] [clear]
-         - [<ref>] [close]
-         - [<ref>] [crosshair]
+         [<ref>] + [clear]
+         [<ref>] [close]
+         [<ref>] + [crosshair]
        [<ref>] [dec <col>]
        [<ref>] [edit yes|no]
        [<ref>] [export sb|tsv <filename>]
- -         [<ref>] - [filter <string>]
+         + [<ref>] [filter <string>]
        [<ref>] [filter load <filename>]
        [<ref>] @@ -507,28 +462,25 @@ <code>]
        [<ref>] [match]
- -         +         + [<ref>] [match <ref> <ref>]
- -         [<ref>] +         [<ref>] [match + error <value> degrees|arcmin|arcsec]
-         - [<ref>] [match function 1and2|1not2|2not1]
- -         - [<ref>] [match return 1and2|1only|2only]
-         - [<ref>] [match unique yes|no]
+         [<ref>] + [match function 1and2|1not2|2not1]
+         [<ref>] + [match return 1and2|1only|2only]
+         [<ref>] + [match unique yes|no]
        [<ref>] [maxrows <number>]
        [<ref>] [name <object>]
- -         [<ref>] - [panto - yes|no]
+         + [<ref>] [panto yes|no]
        [<ref>] [plot <xcol> <ycol> <xerrcol> <yerrcol>]
        [<ref>] [print]
@@ -538,55 +490,48 @@ <coordsys>]
        [<ref>] [ra <col>]
-         [<ref>] - [regions]
-         [<ref>] - [retrieve]
+         [<ref>] [regions]
+         [<ref>] [retrieve]
        [<ref>] [samp]
        [<ref>] [samp broadcast]
        [<ref>] [samp - send - <application>]
- -         [<ref>] [save - <filename>]
+ send <application>]
+         + [<ref>] [save <filename>]
        [<ref>] - [server - cds|adac|cadc|cambridge|sao|ukirt|iucaa|bejing|saao]
+ [server cds|adac|cadc|cambridge|sao|ukirt|iucaa|bejing|saao]
        [<ref>] [show yes|no]
        [<ref>] [radius <value> degrees|arcmin|arcsec]
        [<ref>] [sky <skyframe>]
-     -     [<ref>] [skyformat - <skyformat>]
-     -     [<ref>] [sort <col> - incr|decr]
+         [<ref>] + [skyformat <skyformat>]
+         [<ref>] + [sort <col> incr|decr]
        [<ref>] [symbol [#] condition|shape|color|text|font|fontsize|fontweight|fontslant <value>]
-         - [<ref>] [symbol [#] text|size|size2|units|angle - <value>]
-         - [<ref>] [symbol shape circle|ellipse|box|text|point]
+         [<ref>] + [symbol [#] text|size|size2|units|angle <value>]
+         [<ref>] + [symbol shape circle|ellipse|box|text|point]
        [<ref>] [symbol - shape circle point|box point|diamond - point|cross point|x point|arrow point|boxcircle point]
+ + shape circle point|box point|diamond point|cross + point|x point|arrow point|boxcircle point]
        [<ref>] [symbol add| [#] remove]
        [<ref>] [symbol save|load <filename>]
        [<ref>] [system <coordsys>]
-      -    [<ref>] [update]
+         [<ref>] + [update]
        [<ref>] [x <col>]
        [<ref>] [y @@ -594,12 +539,10 @@  
Example:
$xpaget ds9 catalog
- $xpaget ds9 catalog - header
+ $xpaget ds9 catalog header

 $xpaset -p ds9 catalog new
- $xpaset - -p ds9 catalog 2mass
+ $xpaset -p ds9 catalog 2mass
$xpaset -p ds9 catalog cds 2mass
$xpaset -p ds9 catalog cds {I/252}

@@ -607,79 +550,58 @@ $xpaset -p ds9 catalog import tsv foo.tsv

$xpaset -p ds9 catalog 202.48 47.21 fk5
- - $xpaset -p ds9 catalog allrows
+ $xpaset -p ds9 catalog allrows
$xpaset -p ds9 catalog allcols
- $xpaset -p ds9 catalog - cancel
+ $xpaset -p ds9 catalog cancel
 $xpaset -p ds9 catalog clear
- - $xpaset -p ds9 catalog close
- $xpaset -p ds9 - catalog crosshair
- $xpaset -p ds9 catalog dec - DEC
+ $xpaset -p ds9 catalog close
+ $xpaset -p ds9 catalog crosshair
+ $xpaset -p ds9 catalog dec DEC
 $xpaset -p ds9 catalog edit yes
- - $xpaset -p ds9 catalog export tsv bar.tsv
- $xpaset - -p ds9 catalog filter '$Jmag>10'
+ $xpaset -p ds9 catalog export tsv bar.tsv
+ $xpaset -p ds9 catalog filter '$Jmag>10'
$xpaset -p ds9 catalog filter load foo.flt
$xpaset -p ds9 catalog header
- $xpaset -p ds9 catalog - location 500
+ $xpaset -p ds9 catalog location 500
$xpaset -p ds9 catalog match error 2 arcsec
$xpaset -p ds9 catalog match function 1and2
$xpaset -p ds9 catalog match unique no
$xpaset -p ds9 catalog match return 1only
- $xpaset -p - ds9 catalog match # last two catalogs loaded
- $xpaset - -p ds9 catalog match 2mass csc
- $xpaset -p ds9 catalog - maxrows 2000
+ $xpaset -p ds9 catalog match # last two catalogs loaded
+ $xpaset -p ds9 catalog match 2mass csc
+ $xpaset -p ds9 catalog maxrows 2000
 $xpaset -p ds9 catalog name m51
$xpaset -p ds9 catalog panto no
- $xpaset -p ds9 catalog - plot '$Jmag' '$Hmag' '$e_Jmag' '$e_Hmag'
- $xpaset -p - ds9 catalog print
+ $xpaset -p ds9 catalog plot '$Jmag' '$Hmag' '$e_Jmag' + '$e_Hmag'
+ $xpaset -p ds9 catalog print
$xpaset -p ds9 catalog psky fk5
$xpaset -p ds9 catalog psystem wcs
$xpaset -p ds9 catalog ra RA
$xpaset -p ds9 catalog regions
$xpaset -p ds9 catalog retrieve
- $xpaset -p ds9 - catalog samp broadcast
+ $xpaset -p ds9 catalog samp broadcast
$xpaset -p ds9 catalog samp send aladin
$xpaset -p ds9 catalog save foo.xml
- $xpaset -p ds9 - catalog server sao
- $xpaset -p ds9 catalog show - yes
+ $xpaset -p ds9 catalog server sao
+ $xpaset -p ds9 catalog show yes
$xpaset -p ds9 catalog radius 1 degrees
$xpaset -p ds9 catalog symbol condition '$Jmag>15'
$xpaset -p ds9 catalog symbol 2 shape {boxcircle point}
$xpaset -p ds9 catalog symbol color red
$xpaset -p ds9 catalog symbol font times
- $xpaset -p - ds9 catalog symbol fontsize 14
- $xpaset -p ds9 catalog - symbol fontweight bold
- $xpaset -p ds9 catalog symbol - fontslant italic
+ $xpaset -p ds9 catalog symbol fontsize 14
+ $xpaset -p ds9 catalog symbol fontweight bold
+ $xpaset -p ds9 catalog symbol fontslant italic
 $xpaset -p ds9 catalog symbol add
$xpaset -p ds9 catalog symbol 2 remove
$xpaset -p ds9 catalog symbol load foo.sym
$xpaset -p ds9 catalog symbol save bar.sym
$xpaset -p ds9 catalog sky fk5
$xpaset -p ds9 catalog skyformat degrees
- $xpaset -p - ds9 catalog sort {Jmag} incr
- $xpaset -p ds9 catalog - system wcs
- $xpaset -p ds9 catalog - update
+ $xpaset -p ds9 catalog sort {Jmag} incr
+ $xpaset -p ds9 catalog system wcs
+ $xpaset -p ds9 catalog update
 $xpaset -p ds9 catalog x RA
$xpaset -p ds9 catalog y DEC

cd

@@ -694,21 +616,17 @@

cmap

Controls the colormap for the current frame. The colormap name is not case sensitive. A valid contrast value is  from 0 to - 10 - and bias value from 0 to 1.

+ 10 and bias value from 0 to 1.

Syntax:
cmap [<colormap>]
     [file]
     [load <filename>]
- -      [save <filename>]
- -      [invert yes|no]
+      [save <filename>]
+      [invert yes|no]
     [<constrast> <bias>]
     [tag [load|save] <filename>]
     [tag delete]
- -      [open|close]
+      [open|close]
 
Example:
$xpaget ds9 cmap
@@ -717,15 +635,13 @@ $xpaget ds9 cmap value
 $xpaset -p ds9 cmap Heat
$xpaset -p ds9 cmap load foo.sao
- $xpaset -p ds9 cmap - save bar.sao
+ $xpaset -p ds9 cmap save bar.sao
 $xpaset -p ds9 cmap invert yes
$xpaset -p ds9 cmap 5 .5
$xpaset -p ds9 cmap tag load foo.tag
$xpaset -p ds9 cmap tag save foo.tag
$xpaset -p ds9 cmap tag delete
- $xpaset -p ds9 cmap - open
+ $xpaset -p ds9 cmap open
$xpaset -p ds9 cmap close

colorbar
@@ -751,8 +667,7 @@ roman|italic]
         [size]
         [ticks]
-          - [match]
+          [match]
         [lock [yes|no]]
  
@@ -811,8 +726,7 @@ <filename>]
        [copy]
        [paste - [<coordsys> - <color> <width> yes|no]]
+ [<coordsys> <color> <width> yes|no]]
        [color <color>]
        [width <width>]
        [dash yes|no]
@@ -829,8 +743,7 @@         [limits <min> <max>]
        [levels <value - value - value...>]
+ value value...>]
        [open|close]
 
Example:
@@ -852,21 +765,16 @@ $xpaset -p ds9 contour yes
$xpaset -p ds9 contour clear
$xpaset -p ds9 contour generate
- $xpaset -p ds9 - contour load ds9.ctr
- $xpaset -p ds9 contour - save ds9.ctr
- $xpaset -p ds9 contour save ds9.ctr wcs - fk5
+ $xpaset -p ds9 contour load ds9.ctr
+ $xpaset -p ds9 contour save ds9.ctr
+ $xpaset -p ds9 contour save ds9.ctr wcs fk5
$xpaset -p ds9 contour convert
$xpaset -p ds9 contour load levels ds9.ctr
$xpaset -p ds9 contour save levels ds9.lev
- $xpaset - -p ds9 contour copy
- $xpaset -p ds9 contour - paste
- $xpaset -p ds9 contour paste wcs - red 2 no
+ $xpaset -p ds9 contour copy
+ $xpaset -p ds9 contour paste
+ $xpaset -p ds9 contour paste wcs red 2 + no
 $xpaset -p ds9 contour color yellow
$xpaset -p ds9 contour width 2
$xpaset -p ds9 contour dash yes
@@ -902,10 +810,8 @@ 22.000204 wcs galactic arcsec
$xpaset -p ds9 crop match wcs
$xpaset -p ds9 crop lock wcs
- $xpaset -p ds9 crop - reset
- $xpaset -p ds9 crop 3d .25 .50 - wcs
+ $xpaset -p ds9 crop reset
+ $xpaset -p ds9 crop 3d .25 .50 wcs
$xpaset -p ds9 crop open
$xpaset -p ds9 crop close

crosshair

@@ -978,10 +884,8 @@

data

Return an array of data values given a lower left corner and a width and height in specified coordinate system. The last - argument - of yes indicates to strip the coordinates from the output and - just - list the data values. The default is yes.

+ argument of yes indicates to strip the coordinates from the + output and just list the data values. The default is yes.

Syntax:
data [<coordsys> [<skyframe>] <x> <y> <width> <height> [yes|no]]
@@ -1001,11 +905,9 @@ Syntax:
dsssao []
       [<object>]
-        [name - <object>|clear]
+        [name <object>|clear]
       [<ra> <dec>] # - in - wcs fk5
+ in wcs fk5
       [size <width> <height> degrees|arcmin|arcsec]
       [save yes|no]
@@ -1021,29 +923,23 @@ $xpaget ds9 dsssao frame
$xpaset -p ds9 dsssao
$xpaset -p ds9 dsssao m31
- $xpaset -p ds9 dsssao - name m31
- $xpaset -p ds9 dsssao name - clear
- $xpaset -p ds9 dsssao 00:42:44.404 - +41:16:08.78
+ $xpaset -p ds9 dsssao name m31
+ $xpaset -p ds9 dsssao name clear
+ $xpaset -p ds9 dsssao 00:42:44.404 +41:16:08.78
$xpaset -p ds9 dsssao size 60 60 arcmin
$xpaset -p ds9 dsssao save yes
$xpaset -p ds9 dsssao frame current
$xpaset -p ds9 dsssao update frame
$xpaset -p ds9 dsssao open
- $xpaset -p ds9 dsssao - close
+ $xpaset -p ds9 dsssao close

dsseso

Support for Digital Sky Survey at ESO.

Syntax:
dsseso []
       [<object>]
-        [name - <object>|clear]
+        [name <object>|clear]
       [<ra> <dec>] # - in - wcs fk5
+ in wcs fk5
       [size <width> <height> degrees|arcmin|arcsec]
       [save yes|no]
@@ -1062,20 +958,16 @@ $xpaget ds9 dsseso survey
$xpaset -p ds9 dsseso
$xpaset -p ds9 dsseso m31
- $xpaset -p ds9 dsseso - name m31
- $xpaset -p ds9 dsseso name - clear
- $xpaset -p ds9 dsseso 00:42:44.404 - +41:16:08.78
+ $xpaset -p ds9 dsseso name m31
+ $xpaset -p ds9 dsseso name clear
+ $xpaset -p ds9 dsseso 00:42:44.404 +41:16:08.78
$xpaset -p ds9 dsseso size 60 60 arcmin
$xpaset -p ds9 dsseso save yes
$xpaset -p ds9 dsseso frame current
$xpaset -p ds9 dsseso update frame
$xpaset -p ds9 dsseso survey DSS2-red
$xpaset -p ds9 dsseso open
- $xpaset -p ds9 dsseso - close
+ $xpaset -p ds9 dsseso close

dssstsci

Support for Digital Sky Survey at STSCI.

Syntax:
@@ -1109,12 +1001,9 @@ $xpaget ds9 dssstsci survey
$xpaset -p ds9 dssstsci
$xpaset -p ds9 dssstsci m31
- $xpaset -p ds9 - dssstsci name m31
- $xpaset -p ds9 dssstsci - name clear
- $xpaset -p ds9 dssstsci 00:42:44.404 - +41:16:08.78
+ $xpaset -p ds9 dssstsci name m31
+ $xpaset -p ds9 dssstsci name clear
+ $xpaset -p ds9 dssstsci 00:42:44.404 +41:16:08.78
$xpaset -p ds9 dssstsci size 60 60 arcmin
$xpaset -p ds9 dssstsci save yes
$xpaset -p ds9 dssstsci frame current
@@ -1123,8 +1012,7 @@ $xpaset -p ds9 dssstsci open
$xpaset -p ds9 dssstsci close

envi

-

Load an ENVI header and file. Optional parameter: array - endian.
+

Load an ENVI header and file. Optional parameter: array endian.

Syntax:
envi [new] <header> [<filename>]
@@ -1132,8 +1020,7 @@ Example:
 $xpaset -p ds9 envi foo.hdr
$xpaset -p ds9 envi new foo.hdr
- - $xpaset -p ds9 envi foo.hdr + $xpaset -p ds9 envi foo.hdr foo.bsq

 exit
@@ -1153,32 +1040,23 @@ format. Optional parameters: array endian, nrrd endian, jpeg quality (1-100) and tiff compression method.

Syntax:
- export - [array|nrrd|envi|gif|tiff|jpeg|png] + export [array|nrrd|envi|gif|tiff|jpeg|png] <filename>
- export array - <filename> [big|little|native]
- - export nrrd <filename> - [big|little|native]
- export envi <header> [<filename>] - [big|little|native]
+ export array <filename> [big|little|native]
+ export nrrd <filename> [big|little|native]
+ export envi <header> [<filename>] [big|little|native] +
export jpeg <filename> [1-100]
- - export tiff <filename> - [none|jpeg|packbits|deflate]
+ export tiff <filename> [none|jpeg|packbits|deflate]
 
Example:
- $xpaset -p ds9 export array foo.arr - little
+ $xpaset -p ds9 export array foo.arr little
$xpaset -p ds9 export nrrd foo.nrrd little
- $xpaset -p ds9 export envi foo.hdr - little
- - $xpaset -p ds9 export envi - foo.hdr foo.bsq little
- $xpaset -p - ds9 export tiff foo.tiff jpeg
+ $xpaset -p ds9 export envi foo.hdr little
+ $xpaset + -p ds9 export envi foo.hdr foo.bsq little
+ $xpaset -p ds9 export tiff + foo.tiff jpeg
$xpaset -p ds9 export jpeg foo.jpeg 75
$xpaset -p ds9 export png foo.png

file

@@ -1193,10 +1071,8 @@ loaded image.

Syntax:
- fits [new|mask|slice] - [<filename>]
-      - [width|height|depth|bitpix]
+ fits [new|mask|slice] [<filename>]
+      [width|height|depth|bitpix]
     [size [wcs|wcsa...wcsz] [fk4|fk5|icrs|galactic|ecliptic] [degrees|arcmin|arcsecs]]
     [header [<ext>] [keyword @@ -1210,8 +1086,7 @@ $xpaget ds9 fits depth
$xpaget ds9 fits bitpix
$xpaget ds9 fits size
- $xpaget ds9 fits size wcs - fk5 arcmin
+ $xpaget ds9 fits size wcs fk5 arcmin
$xpaget ds9 fits header # primary
$xpaget ds9 fits header 2 # hdu 2
$xpaget ds9 fits header -2 # hdu 2 with inherit
@@ -1220,8 +1095,7 @@ $xpaget ds9 fits image > foo.fits
$xpaget ds9 fits table > bar.fits
$xpaget ds9 fits slice > foo.fits
- $xpaset -p ds9 fits - foo.fits
+ $xpaset -p ds9 fits foo.fits
$xpaset -p ds9 fits new foo.fits
$xpaset -p ds9 fits bar.fits[bin=detx,dety]
$xpaset -p ds9 fits slice foo.fits
@@ -1234,12 +1108,10 @@

frame

Controls frame functions. Frames may be created, deleted, - reset, - and centered. While return the current frame number. If you goto - a - frame that does not exists, it will be created. If the frame is - hidden, it will be shown. The 'frameno' option is available for - backward compatibility.

+ reset, and centered. While return the current frame number. If + you goto a frame that does not exists, it will be created. If + the frame is hidden, it will be shown. The 'frameno' option is + available for backward compatibility.

Syntax:
frame [center [#|all]]
      [clear [#|all]]
@@ -1259,32 +1131,27 @@       [last]
      [frameno #]
      [#]
- -       [match <coordsys>]
-       [lock - <coordsys>|none]
+       [match <coordsys>]
+       [lock <coordsys>|none]
      [has [amplifier|datamin|datasec|detector|grid|iis|irafmin|physical|smooth]]
      [has contour [aux]]]
      [has fits [bin|cube|mosaic]]
      [has marker [highlite|paste|select|undo]]
-       [has system - <coordsys>]
- -       [has wcs +       [has system <coordsys>]
+       [has wcs [<wcssys>]]
-       [has wcs - celestial [<wcssys>]]
-       - [has wcs linear [<wcssys>]]
+       [has wcs celestial + [<wcssys>]]
+       [has wcs linear + [<wcssys>]]
 
Example:
$xpaget ds9 frame # returns the id of the current frame
$xpaget ds9 frame frameno # returns the id of the current frame
$xpaget ds9 frame all # returns the id of all frames
- $xpaget ds9 frame active # returns the id of all active - frames
+ $xpaget ds9 frame active # returns the id of all active frames
 $xpaget ds9 frame lock
$xpaget ds9 frame has amplifier
$xpaget ds9 frame has datamin
@@ -1343,15 +1210,13 @@ $xpaget ds9 gif > foo.gif
$xpaset -p ds9 gif foo.gif
$xpaset -p ds9 gif new foo.gif
- - $xpaset -p ds9 gif slice foo.gif
- $cat - foo.gif | xpaset ds9 gif # not available windows
+ $xpaset -p ds9 gif slice foo.gif
+ $cat foo.gif | xpaset ds9 gif # not available + windows
$cat foo.gif | xpaset ds9 gif new # not - available - windows
- $cat foo.gif | xpaset ds9 gif slice - # not available windows + available windows
+ $cat foo.gif | xpaset ds9 gif slice # + not available windows

grid

Controls coordinate grid. For grid numeric format syntax,  click here.

@@ -1367,14 +1232,11 @@       [grid width <value>]
      [grid dash yes|no]
      [grid gap1 <value>]
- -       [grid gap2 +       [grid gap2 <value>]
- -       [grid gap3 - <value>]
-       [axes - yes|no]
+       [grid + gap3 <value>]
+       [axes yes|no]
      [axes color <color>]
      [axes width <value>]
      [axes dash yes|no]
@@ -1394,22 +1256,17 @@       [numerics yes|no]
      [numerics font times|helvetica|courier]
-       [numerics fontsize - <value>]
-       [numerics fontweight - normal|bold]
-       [numerics fontslant - roman|italic]
+       [numerics fontsize <value>]
+       [numerics fontweight normal|bold]
+       [numerics fontslant roman|italic]
      [numerics color <color>]
-       [numerics gap1 - <value>]
-       - [numerics gap2 <value>]
- -       [numerics gap3 - <value>]
-       - [numerics type interior|exterior]
+       [numerics gap1 <value>]
+       [numerics gap2 + <value>]
+       [numerics + gap3 <value>]
+       [numerics type + interior|exterior]
      [numerics vertical yes|no]
      [title yes|no]
      [title text <text>]
@@ -1422,20 +1279,15 @@       [title fontslant roman|italic]
      [title color <color>]
      [labels yes|no]
- -       [labels def1 yes|no]
+       [labels def1 yes|no]
      [labels def2 yes|no]
- -       [labels text1 <text>]
- -       [labels text2 +       [labels text1 <text>]
+       [labels text2 <text>]
-       - [labels gap1 <value>]
-       - [labels gap2 <value>]
- -       [labels font +       [labels gap1 + <value>]
+       [labels gap2 <value>]
+       [labels font times|helvetica|courier]
      [labels fontsize <value>]
      [labels fontweight normal|bold]
@@ -1457,10 +1309,8 @@ $xpaget ds9 grid grid width
$xpaget ds9 grid grid dash
$xpaget ds9 grid grid gap1
- $xpaget ds9 grid grid - gap2
- $xpaget ds9 grid grid - gap3
+ $xpaget ds9 grid grid gap2
+ $xpaget ds9 grid grid gap3
 $xpaget ds9 grid axes
$xpaget ds9 grid axes color
$xpaget ds9 grid axes width
@@ -1484,10 +1334,8 @@ $xpaget ds9 grid numerics fontslant
$xpaget ds9 grid numerics color
$xpaget ds9 grid numerics gap1
- $xpaget ds9 grid - numerics gap2
- $xpaget ds9 grid numerics - gap3
+ $xpaget ds9 grid numerics gap2
+ $xpaget ds9 grid numerics gap3
 $xpaget ds9 grid numerics type
$xpaget ds9 grid numerics vertical
$xpaget ds9 grid title
@@ -1523,8 +1371,7 @@ $xpaset -p ds9 grid grid dash yes
$xpaset -p ds9 grid grid gap1 10
$xpaset -p ds9 grid grid gap2 10
- $xpaset -p ds9 - grid grid gap3 10
+ $xpaset -p ds9 grid grid gap3 10
 $xpaset -p ds9 grid axes yes
$xpaset -p ds9 grid axes color red
$xpaset -p ds9 grid axes width 2
@@ -1548,12 +1395,9 @@ $xpaset -p ds9 grid numerics fontslant italic
$xpaset -p ds9 grid numerics color red
$xpaset -p ds9 grid numerics gap1 10
- $xpaset -p - ds9 grid numerics gap2 10
- $xpaset -p ds9 - grid numerics gap3 10
- $xpaset -p ds9 grid numerics - type exterior
+ $xpaset -p ds9 grid numerics gap2 10
+ $xpaset -p ds9 grid numerics gap3 10
+ $xpaset -p ds9 grid numerics type exterior
$xpaset -p ds9 grid numerics vertical yes
$xpaset -p ds9 grid title yes
$xpaset -p ds9 grid title text {Hello World}
@@ -1584,8 +1428,7 @@

header

Display current fits header dialog. Optional extension number - maybe specified. Please note, this differs from xpa fits - header.

+ maybe specified. Please note, this differs from xpa fits header.

Syntax:
header [<ext>]
       [close [<ext>]]
@@ -1619,17 +1462,13 @@ $xpaset -p ds9 iconify yes

iexam

Interactive examine function. A blinking cursor will indicate - to - the user to click on a point on an image. The specified - information - will be returned at that time. The default event is + to the user to click on a point on an image. The specified + information will be returned at that time. The default event is button. In the last form, the following macros will be expanded if present: $width, $height, $depth, $bitpix, $filename, $regions, $filename[$regions], $env, $pan, $value, - $x, - $y, $z. See Analysis - Macros - for more information.
+ $x, $y, $z. See Analysis + Macros for more information.

Syntax:
iexam []
@@ -1637,15 +1476,14 @@ <coordsys> [<skyframe>] [<skyformat>]
      [[]|button|key|any] data [width][height]
-       - [[]|button|key|any] <macro string>]
+       [[]|button|key|any] + <macro string>]
 
Example:
$xpaget ds9 iexam # image coordinates
- $xpaget ds9 - iexam coordinate image
- $xpaget ds9 iexam key coordinate - image # return coordinate and key event
+ $xpaget ds9 iexam coordinate image
+ $xpaget ds9 iexam key coordinate image # return coordinate + and key event
$xpaget ds9 iexam coordinate wcs fk5 degrees
$xpaget ds9 iexam coordinate wcs galactic sexagesimal
$xpaget ds9 iexam coordinate fk5
@@ -1665,8 +1503,8 @@ $xpaset -p ds9 iis filename foo.fits
$xpaset -p ds9 iis filename bar.fits 4

jpeg

-

Load JPEG image into current frame. Optional parameters: - jpeg quality (1-100)

+

Load JPEG image into current frame. Optional parameters: jpeg + quality (1-100)

Syntax:
jpeg [new|slice] [<filename>] [1-100]
 
@@ -1675,43 +1513,34 @@ $xpaget ds9 jpeg 100 > foo.jpeg
$xpaset -p ds9 jpeg foo.jpeg
$xpaset -p ds9 jpeg new foo.jpeg
- - $xpaset -p ds9 jpeg slice foo.jpeg
- $cat - foo.jpeg | xpaset ds9 jpeg # not available - windows
- $cat foo.jpeg | xpaset ds9 jpeg new - # not available windows
- $cat - foo.jpeg | xpaset ds9 jpeg slice # - not - available windows + $xpaset -p ds9 jpeg slice foo.jpeg
+ $cat foo.jpeg | xpaset ds9 jpeg # + not available windows
+ $cat foo.jpeg | xpaset ds9 jpeg new # + not available windows
+ $cat foo.jpeg | xpaset ds9 jpeg slice # + not available windows

lock

Lock all other frames to the current frame.

Syntax:
lock [frame <coordsys>|none]
     [crosshair <coordsys>|none]
- -      [crop <coordsys>|none]
-      [slice - <coordsys>|none]]
-      [bin - [yes|no]]
+      [crop <coordsys>|none]
+      [slice <coordsys>|none]]
+      [bin [yes|no]]
     [axes [yes|no]]
     [scale [yes|no]]
     [scalelimites [yes|no]]
     [colorbar [yes|no]]
     [block [yes|no]]
- -      [smooth [yes|no]]
+      [smooth [yes|no]]
     [3d [yes|no]]
 
Example:
$xpaget -p ds9 lock frame
$xpaget -p ds9 lock crosshair
- $xpaget -p ds9 lock - crop
+ $xpaget -p ds9 lock crop
$xpaget -p ds9 lock slice
$xpaget -p ds9 lock bin
$xpaget -p ds9 lock axes
@@ -1719,23 +1548,17 @@ $xpaget -p ds9 lock scalelimits
$xpaget -p ds9 lock colorbar
$xpaget -p ds9 lock block
- $xpaget -p ds9 lock - smooth
- $xpaget -p ds9 lock - 3d
+ $xpaget -p ds9 lock smooth
+ $xpaget -p ds9 lock 3d
 $xpaset -p ds9 lock frame wcs
- - $xpaset -p ds9 lock crosshair wcs
- $xpaset -p ds9 - lock crop wcs
+ $xpaset -p ds9 lock crosshair wcs
+ $xpaset -p ds9 lock crop wcs
$xpaset -p ds9 lock slice wcs
$xpaset -p ds9 lock bin yes
$xpaset -p ds9 lock axes yes
- $xpaset -p ds9 lock scale - yes
+ $xpaset -p ds9 lock scale yes
$xpaset -p ds9 lock scalelimits yes
- $xpaset -p ds9 - lock colorbar yes
+ $xpaset -p ds9 lock colorbar yes
$xpaset -p ds9 lock block yes
$xpaset -p ds9 lock smooth yes
$xpaset -p ds9 lock 3d yes
@@ -1792,14 +1615,11 @@

match

Match all other frames to the current frame.

Syntax:
- match [frame - <coordsys>]
+ match [frame <coordsys>]
      [crosshair <coordsys>]
- -       [crop <coordsys>]
-       [slice - <coordsys>]
+       [crop <coordsys>]
+       [slice <coordsys>]
      [bin]
      [axes]
      [scale]
@@ -1809,15 +1629,12 @@       [smooth]
      [3d]
- - Example:
+ Example:
$xpaset -p ds9 match frame wcs
- $xpaset -p ds9 match - crosshair wcs
+ $xpaset -p ds9 match crosshair wcs
 $xpaset -p ds9 match crop wcs
$xpaset -p ds9 match slice wcs
- $xpaset -p - ds9 match bin
+ $xpaset -p ds9 match bin
$xpaset -p ds9 match axes
$xpaset -p ds9 match scale
$xpaset -p ds9 match scalelimits
@@ -1836,14 +1653,13 @@ $xpaget ds9 mecube > foo.fits
$xpaset -p ds9 mecube foo.fits
$xpaset -p ds9 mecube new foo.fits
- $cat foo.fits | - xpaset ds9 mecube
+ $cat foo.fits | xpaset ds9 mecube
$cat foo.fits | xpaset ds9 mecube new

minmax

This is how DS9 determines  the min and max data values - from the data. SCAN will scan all - data. DATAMIN and IRAFMIN will use the - values of the keywords if present.
+ from the data. SCAN will scan all data. DATAMIN + and IRAFMIN will use the values of the keywords if + present.

Syntax:
minmax [scan|sample|datamin|irafmin]
@@ -1877,14 +1693,11 @@ $xpaset -p ds9 mosaic foo.fits
$xpaset -p ds9 mosaic wcs foo.fits
$xpaset -p ds9 mosaic wcs new foo.fits
- $xpaset -p ds9 mosaic wcs mask - foo.fits
- $cat foo.fits | xpaset - ds9 mosaic
+ $xpaset -p ds9 mosaic wcs mask foo.fits
+ $cat foo.fits | xpaset ds9 mosaic
$cat foo.fits | xpaset ds9 mosaic wcs
$cat foo.fits | xpaset ds9 mosaic wcs new
- $cat - foo.fits | xpaset ds9 mosaic wcs mask
+ $cat foo.fits | xpaset ds9 mosaic wcs mask

mosaicimage

Load FITS mosaic image into current frame.

@@ -1897,35 +1710,31 @@ $xpaset -p ds9 mosaicimage foo.fits
$xpaset -p ds9 mosaicimage wcs foo.fits
$xpaset -p ds9 mosaicimage wcs new foo.fits
- $xpaset -p ds9 mosaicimage wcs mask - foo.fits
- $cat foo.fits | xpaset - ds9 mosaicimage
+ $xpaset -p ds9 mosaicimage wcs mask foo.fits
+ $cat foo.fits | xpaset ds9 mosaicimage
$cat foo.fits | xpaset ds9 mosaicimage wcs
$cat foo.fits | xpaset ds9 mosaicimage wcs new
- - $cat foo.fits | xpaset ds9 mosaicimage wcs mask
+ $cat foo.fits | xpaset ds9 mosaicimage wcs mask

movie
savempeg

-

Create mpeg1 movie from snap shots of the DS9 window. A - slice movie cycles though all slices of a cube. A - frame movie cycles through all active frames. A - 3d movie cycles through specified viewing angles. The - default is frame. Optional parameters for 3d: - number of frames, azimuth from/to, elevation from/to, slice - from/to, oscillate/repeat times.

+

Create mpeg1 movie from snap shots of the DS9 window. A slice + movie cycles though all slices of a cube. A frame + movie cycles through all active frames. A 3d movie + cycles through specified viewing angles. The default is frame. + Optional parameters for 3d: number of frames, azimuth + from/to, elevation from/to, slice from/to, oscillate/repeat + times.

Syntax:
movie [slice|frame|3d] <filename>
- - movie 3d <filename> + movie 3d <filename> [number|azfrom|azto|elfrom|elto|slfrom|slto|oscillate|repeat <#>]
 
Example:
$xpaset -p ds9 movie slice ds9.mpg
- $xpaset -p ds9 - movie 3d ds9.mpg number 10 azfrom -60 azto 60 oscillate 1
+ $xpaset -p ds9 movie 3d ds9.mpg number 10 azfrom -60 + azto 60 oscillate 1

multiframe

Load FITS multiple extension file as multiple images.

@@ -1934,20 +1743,16 @@  
Example:
$xpaset -p ds9 multiframe foo.fits
- $cat - foo.fits | xpaset ds9 multiframe # not - available - windows
+ $cat foo.fits | xpaset ds9 multiframe # + not available windows

nameserver

Support Name Server functions. Coordinates are in fk5.

Syntax:
nameserver [<object>]
           - [name - <object>]
+ [name <object>]
           - [server - ned-sao|ned-cds|simbad-sao|simbad-cds|vizier-sao|vizier-cds]
+ [server ned-sao|ned-cds|simbad-sao|simbad-cds|vizier-sao|vizier-cds]
           [skyformat degrees|sexagesimal]
           @@ -1992,10 +1797,8 @@ $xpaget ds9 nrrd
$xpaget ds9 nrrd big
$xpaset -p ds9 nrrd foo.nrrd
- $xpaset -p ds9 nrrd new - foo.nrrd
- $xpaset -p ds9 nrrd mask - foo.nrrd
+ $xpaset -p ds9 nrrd new foo.nrrd
+ $xpaset -p ds9 nrrd mask foo.nrrd
 $cat foo.nrrd | xpaset ds9 nrrd
$cat foo.nrrd | xpaset ds9 nrrd new
@@ -2022,19 +1825,15 @@ $xpaget ds9 nvss frame
$xpaset -p ds9 nvss
$xpaset -p ds9 nvss m31
- $xpaset -p ds9 nvss name - m31
- $xpaset -p ds9 nvss name - clear
- $xpaset -p ds9 nvss 00:42:44.404 - +41:16:08.78
+ $xpaset -p ds9 nvss name m31
+ $xpaset -p ds9 nvss name clear
+ $xpaset -p ds9 nvss 00:42:44.404 +41:16:08.78
$xpaset -p ds9 nvss size 60 60 arcmin
$xpaset -p ds9 nvss save yes
$xpaset -p ds9 nvss frame current
$xpaset -p ds9 nvss update frame
$xpaset -p ds9 nvss open
- $xpaset -p ds9 nvss - close
+ $xpaset -p ds9 nvss close

orient

Controls the orientation of the current frame.

Syntax:
@@ -2072,8 +1871,8 @@ pan [<coordsys> [<skyframe>] [<skyformat>]] # get current coords

- pan [<x> <y> <coordsys> - [<skyframe>]] # relative
+ pan [<x> <y> <coordsys> [<skyframe>]] # + relative
    [to <x> <y> <coordsys> [<skyframe>]] # absolute
    [open|close]
@@ -2106,10 +1905,8 @@

Display and configure data plots. All plot commands take an optional second command, the plot name. If no plot name is specified, the last plot created is assumed. Plot data is - assumed - to be a pair of coordinates, with optional error values. The - follow - are valid data descriptions:

+ assumed to be a pair of coordinates, with optional error values. + The follow are valid data descriptions:

xy        x and y coordinates
xyex      x,y coordinates with x errors
xyey      x,y coordinates with y errors
@@ -2118,425 +1915,263 @@

To create a new plot, use the plot new command.

Syntax:
- # create new empty plot - window
+ # create new empty plot window
 plot []
- -      [line|bar|scatter]
- -      [new]
- -      [new - line|bar|scatter]
-      - [new name <plotname>]
- -      [new name <plotname> +      [line|bar|scatter]
+      [new]
+      [new line|bar|scatter]
+      [new name <plotname>]
+      [new name <plotname> line|bar|scatter]
- # create new - plot with data from stdin
- plot [new - <title> <xaxis label> <yaxis label> - xy|xyex|xyey|xyexey]
- -      [new [line|bar|scatter] - <title> <xaxis label> <yaxis label> - xy|xyex|xyey|xyexey]
- -      [new name + # create new plot with data from stdin
+ plot [new <title> <xaxis label> + <yaxis label> xy|xyex|xyey|xyexey]
+      [new + [line|bar|scatter] <title> <xaxis label> <yaxis + label> xy|xyex|xyey|xyexey]
+      [new name <plotname> <title> <xaxis label> - <yaxis label> - xy|xyex|xyey|xyexey]
- -      [new name + <yaxis label> xy|xyex|xyey|xyexey]
+      [new name <plotname> line|bar|scatter <title> - <xaxis - label> <yaxis label> - xy|xyex|xyey|xyexey]
+ <xaxis label> <yaxis label> xy|xyex|xyey|xyexey]
- - # create new plot with data from stdin which includes - title/dim - headers
- plot [new - stdin]
-      - [new [line|bar|scatter] - stdin]
- -      [new name <plotname> - stdin]
-      - [new name <plotname> line|bar|scatter + # create new plot with data from stdin which includes + title/dim headers
+ plot [new stdin]
+      [new [line|bar|scatter] stdin]
+      [new name + <plotname> stdin]
+      [new name + <plotname> line|bar|scatter stdin]
- # - load data into existing plot from stdin
- - plot [[<plotname>] data - xy|xyex|xyey|xyexey]
+ # load data into existing plot from stdin
+ plot [[<plotname>] data xy|xyex|xyey|xyexey]
- # existing - plot
+ # existing plot
 plot [[<plotname>] load <filename> xy|xyex|xyey|xyexey]
- -      [[<plotname>] save - <filename>]
-      - [[<plotname>] clear]
- -      [[<plotname>] - duplicate - [#]]
-      - [[<plotname>] stats yes|no]
- -      [[<plotname>] list - yes|no]
-      - [[<plotname>] loadconfig +      [[<plotname>] save <filename>]
-      - [[<plotname>] saveconfig <filename>]
- -      [[<plotname>] pagesetup orient - portrait|landscape]
-      - [[<plotname>] pagesetup size - letter|legal|tabloid|poster|a4]
- -      [[<plotname>] - print]
-      - [[<plotname>] print destination - printer|file]
-      - [[<plotname>] print command - <command>]
-      - [[<plotname>] print filename +      [[<plotname>] clear]
+      [[<plotname>] + duplicate [#]]
+      [[<plotname>] + stats yes|no]
+      [[<plotname>] + list yes|no]
+      [[<plotname>] + loadconfig <filename>]
+      [[<plotname>] saveconfig <filename>]
-      - [[<plotname>] print color rgb|gray]
- -      [[<plotname>] +      [[<plotname>] pagesetup + orient portrait|landscape]
+      [[<plotname>] pagesetup + size letter|legal|tabloid|poster|a4]
+      [[<plotname>] print]
+      [[<plotname>] print + destination printer|file]
+      [[<plotname>] print + command <command>]
+      [[<plotname>] print + filename <filename>]
+      [[<plotname>] print + color rgb|gray]
+      [[<plotname>] close]
-      - [[<plotname>] mode pointer|zoom]
- -
+      [[<plotname>] + mode pointer|zoom]
+
# configure graph
- plot - [[<plotname>] axis x|y grid yes|no]
- -      [[<plotname>] axis x|y log + plot [[<plotname>] axis x|y grid yes|no]
+      [[<plotname>] axis x|y + log yes|no]
+      [[<plotname>] axis x|y + flip yes|no]
+      [[<plotname>] axis x|y auto yes|no]
-      - [[<plotname>] axis x|y flip yes|no]
- -      [[<plotname>] axis x|y auto - yes|no]
-      - [[<plotname>] axis x|y min <value>]
- -      [[<plotname>] axis x|y max +      [[<plotname>] axis x|y min <value>]
-      - [[<plotname>] axis x|y format +      [[<plotname>] axis x|y max + <value>]
+      [[<plotname>] axis x|y format <string>]
-      - [[<plotname>] legend yes|no]
- -      [[<plotname>] legend position - right|left|top|bottom]
-      - [[<plotname>] font title|labels|numbers font - times|helvetica|courier]
-      - [[<plotname>] font title|labels|numbers +      [[<plotname>] + legend yes|no]
+      [[<plotname>] legend + position right|left|top|bottom]
+      [[<plotname>] font + title|labels|numbers font times|helvetica|courier]
+      [[<plotname>] font title|labels|numbers size <value>]
-      - [[<plotname>] font title|labels|numbers +      [[<plotname>] font title|labels|numbers weight normal|bold]
-      - [[<plotname>] font title|labels|numbers +      [[<plotname>] font title|labels|numbers slant roman|italic]
-      - [[<plotname>] title <string>]
- -      [[<plotname>] title x|y +      [[<plotname>] title + <string>]
+      [[<plotname>] title x|y <string>]
-      - [[<plotname>] barmode - normal|stacked|aligned|overlap]
+      [[<plotname>] + barmode normal|stacked|aligned|overlap]
- - # configure current dataset
- plot - [[<plotname>] show yes|no]
-   -    [[<plotname>] shape + # configure current dataset
+ plot [[<plotname>] show yes|no]
+      [[<plotname>] shape circle|square|diamond|plus|splus|scross|triangle|arrow]
      [[<plotname>] shape fill yes|no]
- -      [[<plotname>] shape - color <value>]
- -      [[<plotname>] smooth - step|linear|cubic|quadratic|catrom]
- -      [[<plotname>] color - <value>]
-      - [[<plotname>] width <value>]
- -      [[<plotname>] dash - yes|no]
-      - [[<plotname>] error yes|no]
- -      [[<plotname>] error +      [[<plotname>] + shape color <value>]
+      [[<plotname>] + smooth step|linear|cubic|quadratic|catrom]
+      [[<plotname>] color <value>]
-      - [[<plotname>] color <value>]
- -      [[<plotname>] error +      [[<plotname>] width <value>]
- -      [[<plotname>] name - <string>]
+      [[<plotname>] + dash yes|no]
+      [[<plotname>] + error yes|no]
+      [[<plotname>] + error color <value>]
+      [[<plotname>] color + <value>]
+      [[<plotname>] + error width <value>]
+      [[<plotname>] + name <string>]
- # select - current dataset
- plot [[<plotname>] - select <value>]
- -  
+ # select current dataset
+ plot [[<plotname>] select <value>]
+  
 Example:
- # - return all plotnames
- $xpaget ds9 - plot
+ # return all plotnames
+ $xpaget ds9 plot
- # create new empty plot - window
+ # create new empty plot window
 $xpaset -p ds9 plot
- - $xpaset -p ds9 plot bar
- $xpaset -p ds9 - plot new
- $xpaset -p ds9 plot new - bar
- $xpaset -p ds9 plot new name - foo
- $xpaset -p ds9 plot new name foo - bar
+ $xpaset -p ds9 plot bar
+ $xpaset -p ds9 plot new
+ $xpaset -p ds9 plot new bar
+ $xpaset -p ds9 plot new name foo
+ $xpaset -p ds9 plot new name foo bar
- # create new plot with data - from stdin
- $cat xy.dat | xpaset ds9 plot new - {The Title} {X Axis} {Y Axis} xy
- $cat xy.dat - | xpaset ds9 plot new bar {The Title} {X Axis} {Y Axis} - xy
- $cat xy.dat | xpaset ds9 plot new name foo - {The Title} {X Axis} {Y Axis} xy
- $cat xy.dat - | xpaset ds9 plot new name foo bar {The Title} {X Axis} {Y Axis} - xy
+ # create new plot with data from stdin
+ $cat xy.dat | xpaset ds9 plot new {The Title} {X Axis} + {Y Axis} xy
+ $cat xy.dat | xpaset ds9 plot new bar {The Title} {X + Axis} {Y Axis} xy
+ $cat xy.dat | xpaset ds9 plot new name foo {The Title} + {X Axis} {Y Axis} xy
+ $cat xy.dat | xpaset ds9 plot new name foo bar {The + Title} {X Axis} {Y Axis} xy
- # create new plot with data - from stdin which includes title/dim headers
- - $cat stdin.2.dat | xpaset ds9 plot new stdin
- - $cat stdin.2.dat | xpaset ds9 plot new line + # create new plot with data from stdin which includes + title/dim headers
+ $cat stdin.2.dat | xpaset ds9 plot new stdin
+ $cat stdin.2.dat | xpaset ds9 plot new line stdin
+ $cat stdin.2.dat | xpaset ds9 plot new name foo stdin
+ $cat stdin.2.dat | xpaset ds9 plot new name foo line stdin
- $cat stdin.2.dat | xpaset ds9 plot new - name foo stdin
- $cat stdin.2.dat | xpaset ds9 - plot new name foo line stdin
- - # load data into existing plot from - stdin
- $cat xy.dat | xpaset ds9 plot data - xy
- $cat xy.dat | xpaset ds9 plot foo data - xy
+ # load data into existing plot from stdin
+ $cat xy.dat | xpaset ds9 plot data xy
+ $cat xy.dat | xpaset ds9 plot foo data xy
- # existing - plot
+ # existing plot
 $xpaget ds9 plot stats
- - $xpaget ds9 plot list
- $xpaset -p ds9 plot - load xy.dat xy
- $xpaset -p ds9 plot save - foo.dat
- $xpaset -p ds9 plot - clear
- $xpaset -p ds9 plot duplicate - 1
- $xpaset -p ds9 plot stats - yes
- $xpaset -p ds9 plot list - yes
- $xpaset -p ds9 plot loadconfig - foo.plt
- $xpaset -p ds9 plot saveconfig - foo.plt
- $xpaset -p ds9 plot pagesetup orient - portrait
- $xpaset -p ds9 plot pagesetup size - letter
- $xpaset -p ds9 plot - print
- $xpaset -p ds9 plot print destination - file
- $xpaset -p ds9 plot print command - lp
- $xpaset -p ds9 plot print filename - foo.ps
- $xpaset -p ds9 plot print color - rgb
- $xpaset -p ds9 plot - close
+ $xpaget ds9 plot list
+ $xpaset -p ds9 plot load xy.dat xy
+ $xpaset -p ds9 plot save foo.dat
+ $xpaset -p ds9 plot clear
+ $xpaset -p ds9 plot duplicate 1
+ $xpaset -p ds9 plot stats yes
+ $xpaset -p ds9 plot list yes
+ $xpaset -p ds9 plot loadconfig foo.plt
+ $xpaset -p ds9 plot saveconfig foo.plt
+ $xpaset -p ds9 plot pagesetup orient portrait
+ $xpaset -p ds9 plot pagesetup size letter
+ $xpaset -p ds9 plot print
+ $xpaset -p ds9 plot print destination file
+ $xpaset -p ds9 plot print command lp
+ $xpaset -p ds9 plot print filename foo.ps
+ $xpaset -p ds9 plot print color rgb
+ $xpaset -p ds9 plot close
 $xpaget ds9 plot mode
- - $xpaset -p ds9 plot mode pointer
+ $xpaset -p ds9 plot mode pointer
# configure plot
- $xpaget ds9 plot - axis x grid
- $xpaget ds9 plot axis x - log
- $xpaget ds9 plot axis x - flip
- $xpaget ds9 plot axis x - auto
- $xpaget ds9 plot axis x - min
- $xpaget ds9 plot axis x - max
- $xpaget ds9 plot axis x - format
- $xpaset -p ds9 plot axis x grid - yes
- $xpaset -p ds9 plot axis x log - yes
- $xpaset -p ds9 plot axis x flip - yes
- $xpaset -p ds9 plot axis x auto - no
- $xpaset -p ds9 plot axis x min - 1
- $xpaset -p ds9 plot axis x max - 100
- $xpaset -p ds9 plot axis x format - {%f}
+ $xpaget ds9 plot axis x grid
+ $xpaget ds9 plot axis x log
+ $xpaget ds9 plot axis x flip
+ $xpaget ds9 plot axis x auto
+ $xpaget ds9 plot axis x min
+ $xpaget ds9 plot axis x max
+ $xpaget ds9 plot axis x format
+ $xpaset -p ds9 plot axis x grid yes
+ $xpaset -p ds9 plot axis x log yes
+ $xpaset -p ds9 plot axis x flip yes
+ $xpaset -p ds9 plot axis x auto no
+ $xpaset -p ds9 plot axis x min 1
+ $xpaset -p ds9 plot axis x max 100
+ $xpaset -p ds9 plot axis x format {%f}
- $xpaget ds9 plot - legend
- $xpaget ds9 plot legend - position
- $xpaset -p ds9 plot legend - yes
- $xpaset -p ds9 plot legend position - left
+ $xpaget ds9 plot legend
+ $xpaget ds9 plot legend position
+ $xpaset -p ds9 plot legend yes
+ $xpaset -p ds9 plot legend position left
- $xpaget ds9 plot font - numbers font
- $xpaget ds9 plot font numbers - size
- $xpaget ds9 plot font numbers - weight
- $xpaget ds9 plot font numbers - slant
- $xpaset -p ds9 plot font numbers font - times
- $xpaset -p ds9 plot font numbers size - 12
- $xpaset -p ds9 plot font numbers weight - bold
- $xpaset -p ds9 plot font numbers slant - italic
+ $xpaget ds9 plot font numbers font
+ $xpaget ds9 plot font numbers size
+ $xpaget ds9 plot font numbers weight
+ $xpaget ds9 plot font numbers slant
+ $xpaset -p ds9 plot font numbers font times
+ $xpaset -p ds9 plot font numbers size 12
+ $xpaset -p ds9 plot font numbers weight bold
+ $xpaset -p ds9 plot font numbers slant italic
- $xpaget ds9 plot - title
- $xpaget ds9 plot title - xaxis
- $xpaget ds9 plot title - yaxis
- $xpaset -p ds9 plot title {This is a - Title}
- $xpaset -p ds9 plot title x {X - Axis}
- $xpaset -p ds9 plot title y {Y - Axis}
- $xpaset -p ds9 plot title legend {This - is the Legend}
+ $xpaget ds9 plot title
+ $xpaget ds9 plot title xaxis
+ $xpaget ds9 plot title yaxis
+ $xpaset -p ds9 plot title {This is a Title}
+ $xpaset -p ds9 plot title x {X Axis}
+ $xpaset -p ds9 plot title y {Y Axis}
+ $xpaset -p ds9 plot title legend {This is the Legend}
- $xpaget ds9 plot - barmode
- $xpaset -p ds9 plot barmode - aligned
+ $xpaget ds9 plot barmode
+ $xpaset -p ds9 plot barmode aligned
- # configure current - dataset
- $xpaget ds9 plot - show
+ # configure current dataset
+ $xpaget ds9 plot show
 $xpaget ds9 plot shape
- - $xpaget ds9 plot shape fill
- $xpaget ds9 - plot shape color
- $xpaget ds9 plot - smooth
- $xpaget ds9 plot - color
- $xpaget ds9 plot - width
+ $xpaget ds9 plot shape fill
+ $xpaget ds9 plot shape color
+ $xpaget ds9 plot smooth
+ $xpaget ds9 plot color
+ $xpaget ds9 plot width
 $xpaget ds9 plot dash
- - $xpaget ds9 plot error
- $xpaget ds9 plot - error color
- $xpaget ds9 plot error - width
+ $xpaget ds9 plot error
+ $xpaget ds9 plot error color
+ $xpaget ds9 plot error width
 $xpaget ds9 plot name
- - $xpaset -p ds9 plot show yes
- $xpaset -p - ds9 plot shape circle
- $xpaset -p ds9 plot - shape fill no
- $xpaset -p ds9 plot shape color - cyan
- $xpaset -p ds9 plot smooth - step
- $xpaset -p ds9 plot color - red
- $xpaset -p ds9 plot width - 2
- $xpaset -p ds9 plot dash - yes
- $xpaset -p ds9 plot error - yes
- $xpaset -p ds9 plot error color - red
- $xpaset -p ds9 plot error width - 2
- $xpaset -p ds9 plot name {My - Data}
+ $xpaset -p ds9 plot show yes
+ $xpaset -p ds9 plot shape circle
+ $xpaset -p ds9 plot shape fill no
+ $xpaset -p ds9 plot shape color cyan
+ $xpaset -p ds9 plot smooth step
+ $xpaset -p ds9 plot color red
+ $xpaset -p ds9 plot width 2
+ $xpaset -p ds9 plot dash yes
+ $xpaset -p ds9 plot error yes
+ $xpaset -p ds9 plot error color red
+ $xpaset -p ds9 plot error width 2
+ $xpaset -p ds9 plot name {My Data}
- # select current - dataset
- $xpaget ds9 plot - select
+ # select current dataset
+ $xpaget ds9 plot select
 $xpaset -p ds9 plot select 2

png

Load PNG image into current frame.
@@ -2548,25 +2183,20 @@ $xpaget ds9 png > foo.png
$xpaset -p ds9 png foo.png
$xpaset -p ds9 png new foo.png
- - $xpaset -p ds9 png slice foo.png
- $cat - foo.png | xpaset ds9 png # not available - windows
- $cat foo.png | xpaset ds9 png new - # not available windows
- $cat - foo.png | xpaset ds9 png slice # not - available windows
+ $xpaset -p ds9 png slice foo.png
+ $cat foo.png | xpaset ds9 png # + not available windows
+ $cat foo.png | xpaset ds9 png new # + not available windows
+ $cat foo.png | xpaset ds9 png slice # + not available windows

precision

Set region and coordinate output format precision.

Syntax:
precision <linear> <degree> - <hms> - <dms> - <arcmin> - <arcsec>
+ <hms> <dms> + <arcmin> <arcsec>

 Example:
$xpaget ds9 precision
@@ -2605,9 +2235,9 @@       [command <command>]
      [filename <filename>]
      [color rgb|cmyk|gray]
-       [level 1|2]
+       [level 1|2|3]
      [resolution - 53|72|75|150|300|600]
+ 72|screen|96|144|150|225|300|600|1200]
 
Example:
$xpaget ds9 print destination
@@ -2622,7 +2252,7 @@ $xpaset -p ds9 print filename foo.ps
$xpaset -p ds9 print color cmyk
$xpaset -p ds9 print level 2
- $xpaset -p ds9 print resolution 75 + $xpaset -p ds9 print resolution 96

raise

Raise in the window stacking order.

Syntax:
@@ -2664,12 +2294,10 @@         [skyformat degrees|sexagesimal]
        [strip yes|no]
-         [shape - <shape>]
+         [shape <shape>]
        [color &ltcolor>]
-         [width - <width>]
+         [width <width>]
         [fixed|edit|rotate|delete yes|no]
        @@ -2681,23 +2309,20 @@         [template <filename>]
        [template <filename> - at - <ra> <dec> <coordsys> <skyframe>]
+ at <ra> <dec> <coordsys> <skyframe>]
        [savetemplate <filename>]
        [groups]
        [group new]
        [group <tag> new]
-         [group <tag> - update]
+         [group <tag> update]
        [group <tag> select]
        [group <tag> color &ltcolor>]
        [group <tag> copy]
-         [group <tag> - delete]
+         [group <tag> delete]
        [group <tag> cut]
        [group <tag> font <font>]
@@ -2708,8 +2333,7 @@         [group <tag> moveback]
        [group <tag> - property - <property> yes|no]
+ property <property> yes|no]
        [copy]
        [cut]
        [paste @@ -2723,8 +2347,7 @@ fk4|fk5|icrs|galactic|ecliptic]
        [-skyformat degrees|sexagesimal]
-         [-delim - [nl|<char>]]
+         [-delim [nl|<char>]]
        [-prop select|edit|move|rotate|delete|fixed|include|source 1|0]
        [-group <tag>]
@@ -2774,8 +2397,7 @@ $xpaset -p ds9 regions -format ciao bar.reg # load as ciao format
$xpaset -p ds9 regions foo.fits # FITS regions files do not need - a - format specification
+ a format specification
$xpaset -p ds9 regions load foo.reg # load foo.reg into current frame
$xpaset -p ds9 regions load all foo.reg # load foo.reg into all @@ -2812,19 +2434,16 @@ $xpaset -p ds9 regions width 3
$xpaset -p ds9 regions edit yes
$xpaset -p ds9 regions include
- $xpaset -p ds9 regions command '{circle 100 100 20 # - color=red}'
+ $xpaset -p ds9 regions command '{circle 100 100 20 # color=red}'
$xpaset -p ds9 regions composite
$xpaset -p ds9 regions dissolve
$xpaset -p ds9 regions template foo.tpl
$xpaset -p ds9 regions template foo.tpl at 13:29:55.92 - +47:12:48.02 - fk5
+ +47:12:48.02 fk5
$xpaset -p ds9 regions savetemplate foo.tpl
$xpaset -p ds9 regions group new
$xpaset -p ds9 regions group foo new
- $xpaset -p ds9 - regions group foo update
+ $xpaset -p ds9 regions group foo update
$xpaset -p ds9 regions group foo select
$xpaset -p ds9 regions group foo color red
$xpaset -p ds9 regions group foo copy
@@ -2863,8 +2482,7 @@  
Example:
$xpaget ds9 rgb channel
- $xpaget ds9 rgb lock - wcs
+ $xpaget ds9 rgb lock wcs
$xpaget ds9 rgb lock crop
$xpaget ds9 rgb lock slice
$xpaget ds9 rgb lock bin
@@ -2882,8 +2500,7 @@ $xpaset -p ds9 rgb channel red # set current channel to red
$xpaset -p ds9 rgb view blue no # turn off blue channel
$xpaset -p ds9 rgb system wcs # set rgb coordinate system
- - $xpaset -p ds9 rgb lock wcs yes
+ $xpaset -p ds9 rgb lock wcs yes
$xpaset -p ds9 rgb lock crop yes
$xpaset -p ds9 rgb lock slice yes
$xpaset -p ds9 rgb lock bin yes
@@ -2907,8 +2524,7 @@ $xpaget ds9 rgbarray little > foo.arr
$xpaset -p ds9 rgbarray foo.arr[dim=512,zdim=3,bitpix=-32,endian=little]
- $xpaset -p ds9 rgbarray new - foo.arr[dim=512,zdim=3,bitpix=-32,endian=little]
+ $xpaset -p ds9 rgbarray new foo.arr[dim=512,zdim=3,bitpix=-32,endian=little]
$cat foo.arr | xpaset ds9 rgbarray [dim=512,zdim=3,bitpix=-32,endian=little]
$cat foo.arr | xpaset ds9 rgbarray new @@ -2923,8 +2539,7 @@ $xpaget ds9 rgbcube > foo.fits
$xpaset -p ds9 rgbcube foo.fits
$xpaset -p ds9 rgbcube new foo.fits
- $cat foo.fits - | xpaset ds9 rgbcube
+ $cat foo.fits | xpaset ds9 rgbcube
$cat foo.fits | xpaset ds9 rgbcube new

rgbimage

Load FITS rgbimage into rgb frame.
@@ -2936,13 +2551,11 @@ $xpaget ds9 rgbimage > foo.fits
$xpaset -p ds9 rgbimage foo.fits
$xpaset -p ds9 rgbimage new foo.fits
- $cat foo.fits - | xpaset ds9 rgbimage
+ $cat foo.fits | xpaset ds9 rgbimage
$cat foo.fits | xpaset ds9 rgbimage new

rotate

-

Controls the rotation angle (in degrees) of the current - frame.

+

Controls the rotation angle (in degrees) of the current frame.

Syntax:
rotate [<value>]
       [to <value>]
@@ -2968,8 +2581,7 @@ $xpaset -p ds9 save fits foo.fits table
$xpaset -p ds9 save fits foo.fits slice
$xpaset -p ds9 save rgbimage foo.fits
- $xpaset -p - ds9 save rgbcube foo.fits
+ $xpaset -p ds9 save rgbcube foo.fits
$xpaset -p ds9 save mecube foo.fits
$xpaset -p ds9 save mosaic foo.fits
$xpaset -p ds9 save mosaicimage foo.fits
@@ -2981,8 +2593,7 @@ parameters: jpeg quality (1-100) and tiff compression method.

Syntax:
- saveimage [fits|eps|gif|tiff|jpeg|png] - <filename>
+ saveimage [fits|eps|gif|tiff|jpeg|png] <filename>
saveimage <filename>.jpeg [1-100]
saveimage <filename>.tiff [none|jpeg|packbits|deflate]
 
@@ -3072,67 +2683,49 @@

Support for VO Simple Image Access protocol. The first command will create a new search. All other commands operated on the - last - search created, unless indicated otherwise.

+ last search created, unless indicated otherwise.

Syntax:
- sia - [2mass|akari|astrowise|cadc|cxc|mast|sdss|skyview|tgssadr]
+ sia [2mass|akari|astrowise|cadc|cxc|mast|sdss|skyview|tgssadr]

-     [<ref>] - [cancel]
-     [<ref>] - [clear]
-     [<ref>] - [close]
+     [<ref>] [cancel]
+     [<ref>] [clear]
+     [<ref>] [close]
    [<ref>] [coordinate <ra> <dec> <coordsys>]
- -     [<ref>] [crosshair]
+     [<ref>] [crosshair]
    [<ref>] [export sb|tsv <filename>]
-     [<ref>] - [name <object>]
-     [<ref>] - [print]
+     [<ref>] [name <object>]
+     [<ref>] [print]
    [<ref>] [retrieve]
-     [<ref>] [save - <filename>]
+     [<ref>] [save <filename>]
    [<ref>] [radius <value> degrees|arcmin|arcsec]
-     [<ref>] [sky - <skyframe>]
-     [<ref>] - [skyformat <skyformat>]
-     - [<ref>] [system <coordsys>]
- -     [<ref>] [update]
+     [<ref>] [sky <skyframe>]
+     [<ref>] [skyformat + <skyformat>]
+     [<ref>] [system + <coordsys>]
+     [<ref>] [update]
 
Example:
$xpaget ds9 sia
$xpaset -p ds9 sia 2mass
- $xpaset -p ds9 sia - cancel
+ $xpaset -p ds9 sia cancel
 $xpaset -p ds9 sia clear
- $xpaset - -p ds9 sia close
- $xpaset -p ds9 sia coordinate 202.48 - 47.21 fk5
+ $xpaset -p ds9 sia close
+ $xpaset -p ds9 sia coordinate 202.48 47.21 fk5
 $xpaset -p ds9 sia crosshair
- - $xpaset -p ds9 sia export tsv bar.tsv
- $xpaset -p - ds9 sia name m51
+ $xpaset -p ds9 sia export tsv bar.tsv
+ $xpaset -p ds9 sia name m51
 $xpaset -p ds9 sia print
$xpaset -p ds9 sia retrieve
$xpaset -p ds9 sia save foo.xml
- $xpaset -p ds9 sia - radius 1 degrees
+ $xpaset -p ds9 sia radius 1 degrees
$xpaset -p ds9 sia sky fk5
$xpaset -p ds9 sia skyformat degrees
- $xpaset -p ds9 - sia system wcs
+ $xpaset -p ds9 sia system wcs
 $xpaset -p ds9 sia update

 single @@ -3152,8 +2745,7 @@         [name <object>|clear]
        [<ra> - <dec>] - # in wcs fk5
+ <dec>] # in wcs fk5
        [size <width> <height> degrees|arcmin|arcsec]
        [pixels <width> @@ -3175,12 +2767,9 @@ $xpaget ds9 skyview survey
$xpaset -p ds9 skyview
$xpaset -p ds9 skyview m31
- $xpaset -p ds9 skyview - name m31
- $xpaset -p ds9 skyview name - clear
- $xpaset -p ds9 skyview 00:42:44.404 - +41:16:08.78
+ $xpaset -p ds9 skyview name m31
+ $xpaset -p ds9 skyview name clear
+ $xpaset -p ds9 skyview 00:42:44.404 +41:16:08.78
$xpaset -p ds9 skyview size 60 60 arcmin
$xpaset -p ds9 skyview pixels 600 600
$xpaset -p ds9 skyview save yes
@@ -3188,8 +2777,7 @@ $xpaset -p ds9 skyview update frame
$xpaset -p ds9 skyview survey sdssi
$xpaset -p ds9 skyview open
- $xpaset -p ds9 skyview - close
+ $xpaset -p ds9 skyview close

sleep

Delays execution for specified number of seconds. Default is 1 second.
@@ -3206,8 +2794,7 @@ Boxcar width = 2*radius+1
Tophat diameter = 2*radius+1
Gaussian diameter = 2*radius+1, mean =0
- Elliptical Gaussian diameter = 2*radius+1, mean - =0
+ Elliptical Gaussian diameter = 2*radius+1, mean =0
  
Syntax:

@@ -3215,60 +2802,47 @@        [yes|no]
       [function boxcar|tophat|gaussian]
- -        [radius +        [radius <value>]
- -        [radiusminor - <value>]
- -        - [sigma - <value>]
- -        +        + [radiusminor <value>]
+        + + [sigma <value>]
+        + [sigmaminor <value>]
- -        +        [angle + <value>]
- -        [match]
+     +    [match]
       [lock [yes|no]]
       [open|close]

 Example:
$xpaget ds9 smooth
$xpaget ds9 smooth function
- $xpaget ds9 smooth - radius
- $xpaget ds9 smooth - radiusminor
- $xpaget ds9 - smooth sigma
- - $xpaget ds9 smooth - sigmaminor
+ $xpaget ds9 smooth radius
+ $xpaget ds9 smooth radiusminor
+ $xpaget ds9 smooth sigma
+ $xpaget + ds9 smooth sigmaminor
 $xpaget - ds9 - smooth lock
+ ds9 smooth lock
$xpaset -p ds9 smooth
$xpaset -p ds9 smooth yes
$xpaset -p ds9 smooth function tophat
- $xpaset -p - ds9 smooth radius 4
- $xpaset - -p ds9 smooth radiusminor 4
- - $xpaset -p ds9 smooth sigma - 2.0
- - $xpaset -p ds9 smooth - sigmaminor 2.0
- - $xpaset -p ds9 - smooth angle - 45
+ $xpaset -p ds9 smooth radius 4
+ $xpaset -p ds9 smooth + radiusminor 4
+ $xpaset + -p ds9 smooth sigma 2.0
+ $xpaset + -p ds9 smooth sigmaminor 2.0
+ $xpaset + -p ds9 smooth angle 45
 $xpaset -p ds9 smooth match
$xpaset -p ds9 smooth lock yes
@@ -3304,28 +2878,23 @@ $xpaget ds9 threads
$xpaset -p ds9 threads 8

tiff

-

Load TIFF image into current frame. Optional parameters: - tiff compression method.

+

Load TIFF image into current frame. Optional parameters: tiff + compression method.

Syntax:
- tiff [new|slice] [<filename>] - [none|jpeg|packbits|deflate]
+ tiff [new|slice] [<filename>] [none|jpeg|packbits|deflate]
 
Example:
$xpaget ds9 tiff > foo.tiff
$xpaget ds9 tiff jpeg > foo.tiff
$xpaset -p ds9 tiff foo.tiff
$xpaset -p ds9 tiff new foo.tiff
- - $xpaset -p ds9 tiff slice foo.tiff
- $cat - foo.tiff | xpaset ds9 tiff # not available - windows
- $cat foo.tiff | xpaset ds9 tiff new - # not available windows
- $cat - foo.tiff | xpaset ds9 tiff slice # - not - available windows + $xpaset -p ds9 tiff slice foo.tiff
+ $cat foo.tiff | xpaset ds9 tiff # + not available windows
+ $cat foo.tiff | xpaset ds9 tiff new # + not available windows
+ $cat foo.tiff | xpaset ds9 tiff slice # + not available windows

tile

Controls the tile display mode.

Syntax:
@@ -3362,9 +2931,8 @@ form, the first argument is the number of the fits HDU (starting with 1) and the remaining args are a bounding box in IMAGE coordinates. By default, the screen is updated the next - available - idle cycle. However, you may force an immediate update by - specifying the NOW option.

+ available idle cycle. However, you may force an immediate update + by specifying the NOW option.

Syntax:
update []
       [# x1 y1 x2 y2]
@@ -3413,8 +2981,7 @@       [units yes|no]
      [image|physical|wcs|wcsa...wcsz yes|no]
-       [frame - yes|no]
+       [frame yes|no]
       [red yes|no]
      [green yes|no]
      [blue yes|no]
@@ -3437,8 +3004,7 @@ $xpaget ds9 view image
$xpaget ds9 view wcsa
$xpaget ds9 view red
- $xpaget ds9 view - frame
+ $xpaget ds9 view frame
 $xpaset -p ds9 view layout vertical
$xpaset -p ds9 view keyvalue BITPIX
$xpaset -p ds9 view info yes
@@ -3454,8 +3020,7 @@ $xpaset -p ds9 view lowhigh yes
$xpaset -p ds9 view units yes
$xpaset -p ds9 view wcsa yes
- $xpaset -p ds9 view - frame yes
+ $xpaset -p ds9 view frame yes
$xpaset -p ds9 view red yes
$xpaset -p ds9 view green yes
$xpaset -p ds9 view blue yes
@@ -3469,8 +3034,7 @@       [<ra> <dec>] # in wcs fk5
      [size <width> - <height> - degrees|arcmin|arcsec]
+ <height> degrees|arcmin|arcsec]
      [save yes|no]
      [frame new|current]
      [update frame|crosshair]
@@ -3486,20 +3050,16 @@ $xpaget ds9 vla survey
$xpaset -p ds9 vla
$xpaset -p ds9 vla m31
- $xpaset -p ds9 vla name - m31
- $xpaset -p ds9 vla name - clear
- $xpaset -p ds9 vla 00:42:44.404 - +41:16:08.78
+ $xpaset -p ds9 vla name m31
+ $xpaset -p ds9 vla name clear
+ $xpaset -p ds9 vla 00:42:44.404 +41:16:08.78
$xpaset -p ds9 vla size 60 60 arcmin
$xpaset -p ds9 vla save yes
$xpaset -p ds9 vla frame current
$xpaset -p ds9 vla update frame
$xpaset -p ds9 vla survey stripe82
$xpaset -p ds9 vla open
- $xpaset -p ds9 vla - close
+ $xpaset -p ds9 vla close

vlss

Support for NRAO VLSS Sky Survey.

@@ -3523,19 +3083,15 @@ $xpaget ds9 vlss frame
$xpaset -p ds9 vlss
$xpaset -p ds9 vlss m31
- $xpaset -p ds9 vlss name - m31
- $xpaset -p ds9 vlss name - clear
- $xpaset -p ds9 vlss 00:42:44.404 - +41:16:08.78
+ $xpaset -p ds9 vlss name m31
+ $xpaset -p ds9 vlss name clear
+ $xpaset -p ds9 vlss 00:42:44.404 +41:16:08.78
$xpaset -p ds9 vlss size 60 60 arcmin
$xpaset -p ds9 vlss save yes
$xpaset -p ds9 vlss frame current
$xpaset -p ds9 vlss update frame
$xpaset -p ds9 vlss open
- $xpaset -p ds9 vlss - close
+ $xpaset -p ds9 vlss close

vo

Invoke an connection to a Virtual Observatory site.

@@ -3569,16 +3125,12 @@

wcs

Controls the World Coordinate System for the current frame. If the wcs system, skyframe, or skyformat is modified, the info - panel, - compass, grid, and alignment will be modified accordingly. Also, - using this access point, a new WCS specification can be loaded - and - used by the current image regardless of the WCS that was - contained - in the image file. WCS specification can be sent to DS9 as an - ASCII - file . Please see WCS for more - information.

+ panel, compass, grid, and alignment will be modified + accordingly. Also, using this access point, a new WCS + specification can be loaded and used by the current image + regardless of the WCS that was contained in the image file. WCS + specification can be sent to DS9 as an ASCII file . Please see WCS for more information.

Syntax:
wcs [[system] wcs|wcsa...wcsz]
    [[sky] fk4|fk5|icrs|galactic|ecliptic]
@@ -3598,11 +3150,9 @@ $xpaset -p ds9 wcs wcs
$xpaset -p ds9 wcs system wcs
$xpaset -p ds9 wcs fk5
- $xpaset -p ds9 wcs sky - fk5
+ $xpaset -p ds9 wcs sky fk5
 $xpaset -p ds9 wcs sexagesimal
- - $xpaset -p ds9 wcs skyformat sexagesimal
+ $xpaset -p ds9 wcs skyformat sexagesimal
$xpaset -p ds9 wcs align yes
$xpaset -p ds9 wcs reset
$xpaset -p ds9 wcs reset 3
diff --git a/ds9/doc/release/r8.0.html b/ds9/doc/release/r8.0.html index 135d516..f3c49ea 100644 --- a/ds9/doc/release/r8.0.html +++ b/ds9/doc/release/r8.0.html @@ -99,6 +99,12 @@ incorrectly calculating an index into the data cube.
  • 10.18.2018 RELEASE version 8.0rc6
  • 11.03.2018 BACKUP: fixed an issue with soft links.
  • 12.15.2018 RELEASE version 8.0
    • +
  • 12.26.2018 VIEW: fixed view graph command.
    • +
  • 01.03.2019 DS9: fixed a problem with MacOS Aqua and Windows unable to locate ds9 parser scripts at startup.
    • +
  • 01.03.2019 SCALE: fixed scale command.
    • +
  • 01.03.2019 PRINT: add backward compatible options for resolution to command.
    • +
  • 01.03.2019 TILE: fix tile grid layout command.
    • +
  • 01.07.2019 RELEASE version 8.0.1
    • diff --git a/ds9/library/ds9.tcl b/ds9/library/ds9.tcl index 24f0881..c1e9fb4 100644 --- a/ds9/library/ds9.tcl +++ b/ds9/library/ds9.tcl @@ -13,7 +13,7 @@ proc DS9Def {} { } # for beta version, MUST have space - set ds9(version) {8.0} + set ds9(version) {8.0.1} set ds9(top) . set ds9(mb) .mb diff --git a/ds9/macos/SAOImageDS9.app/Contents/Info.plist b/ds9/macos/SAOImageDS9.app/Contents/Info.plist index d41fb7b..8da42ae 100644 --- a/ds9/macos/SAOImageDS9.app/Contents/Info.plist +++ b/ds9/macos/SAOImageDS9.app/Contents/Info.plist @@ -35,7 +35,7 @@ CFBundleExecutable ds9 CFBundleGetInfoString - "SAOImageDS9 8.0 + "SAOImageDS9 8.0.1 Copyright 1999-2018 Smithsonian Astrophysical Observatory" CFBundleIconFile @@ -49,11 +49,11 @@ Smithsonian Astrophysical Observatory" CFBundlePackageType APPL CFBundleShortVersionString - 8.0 + 8.0.1 CFBundleSignature DS9 CFBundleVersion - 8.0 + 8.0.1 NSHighResolutionCapable True LSMinimumSystemVersion diff --git a/ds9/make.include b/ds9/make.include index 0d0e028..45cd78c 100644 --- a/ds9/make.include +++ b/ds9/make.include @@ -9,11 +9,13 @@ vpath %.fcl $(prefix)/ds9/parsers $(prefix)/ds9/parsers/%parser.tcl : %parser.tac tclsh $(prefix)/taccle/taccle.tcl -p $* -d $< # tclsh $(prefix)/taccle/taccle.tcl -p $* -d -w -v $< + echo "package provide DS9 1.0" | cat - $@ > tmp && mv tmp $@ # -d debug $(prefix)/ds9/parsers/%lex.tcl : %lex.fcl tclsh $(prefix)/fickle/fickle.tcl -P $* $< # tclsh $(prefix)/fickle/fickle.tcl -P $* -d $< + echo "package provide DS9 1.0" | cat - $@ > tmp && mv tmp $@ #--------------------------library diff --git a/ds9/parsers/pslex.fcl b/ds9/parsers/pslex.fcl index ea34343..208d7b8 100644 --- a/ds9/parsers/pslex.fcl +++ b/ds9/parsers/pslex.fcl @@ -31,6 +31,9 @@ screen {return $SCREEN_} 600 {return $600_} 1200 {return $1200_} +53 {return $53_} +75 {return $75_} + #include string.fin #include ws.fin diff --git a/ds9/parsers/psparser.tac b/ds9/parsers/psparser.tac index aca229c..6bd877c 100644 --- a/ds9/parsers/psparser.tac +++ b/ds9/parsers/psparser.tac @@ -30,6 +30,9 @@ %token 600_ %token 1200_ +%token 53_ +%token 75_ + %% command : ps @@ -70,6 +73,9 @@ resolution : 72_ {set _ 72} | 300_ {set _ 300} | 600_ {set _ 600} | 1200_ {set _ 1200} +#backward compatibility + | 53_ {set _ 53} + | 75_ {set _ 75} ; %% diff --git a/ds9/parsers/scalesendparser.tac b/ds9/parsers/scalesendparser.tac index 9436518..cc11c11 100644 --- a/ds9/parsers/scalesendparser.tac +++ b/ds9/parsers/scalesendparser.tac @@ -31,7 +31,7 @@ scalesend : {ProcessSendCmdGet scale type} %% -proc scale::yyerror {msg} { +proc scalesend::yyerror {msg} { variable yycnt variable yy_current_buffer variable index_ diff --git a/ds9/parsers/tileparser.tac b/ds9/parsers/tileparser.tac index 67dd750..14dc83d 100644 --- a/ds9/parsers/tileparser.tac +++ b/ds9/parsers/tileparser.tac @@ -43,7 +43,7 @@ tileMode : GRID_ {set _ grid} tileGrid : {ProcessCmdSet tile mode grid DisplayMode} | MODE_ tileGridMode {ProcessCmdSet tile grid,mode $2 DisplayMode} | DIRECTION_ tileGridDir {ProcessCmdSet tile grid,dir $2 DisplayMode} - | LAYOUT_ INT_ INT_ {ProcessCmdSet tile grid,col $2; ProcessCmdSet tile grid,row $3; TileCmdSetgrid,mode manual DisplayMode} + | LAYOUT_ INT_ INT_ {ProcessCmdSet tile grid,col $2; ProcessCmdSet tile grid,row $3; ProcessCmdSet tile grid,mode manual DisplayMode} | GAP_ INT_ {ProcessCmdSet tile grid,gap $2 DisplayMode} ; diff --git a/ds9/parsers/viewparser.tac b/ds9/parsers/viewparser.tac index 809a77d..16016a9 100644 --- a/ds9/parsers/viewparser.tac +++ b/ds9/parsers/viewparser.tac @@ -55,7 +55,7 @@ view : layout # backward compatible | COLORBARNUMERICS_ yesno {ColorbarCmdSet numerics $2 UpdateView} - | GRAPH_ orient yesno {ProcessCmdSet view graph,$1 $2 UpdateView} + | GRAPH_ orient yesno {ProcessCmdSet view graph,$2 $3 UpdateView} # backward compatible | HORZGRAPH_ yesno {ProcessCmdSet view graph,horz $2 UpdateView} diff --git a/ds9/win/ds9.rc b/ds9/win/ds9.rc index 0a0050d..fa8a7cd 100644 --- a/ds9/win/ds9.rc +++ b/ds9/win/ds9.rc @@ -1,6 +1,6 @@ #include -#define VV "8.0" +#define VV "8.0.1" VS_VERSION_INFO VERSIONINFO FILEVERSION 8,0,0,0 diff --git a/make.include b/make.include index f9a3b55..f8761f6 100644 --- a/make.include +++ b/make.include @@ -21,7 +21,7 @@ # libxslt 1.1.29 # openssl 1.0.2k -DS9_VERSION = 8.0 +DS9_VERSION = 8.0.1 XPA_VERSION = 2.1.18 TCL_VERSION = 8.6 -- cgit v0.12 From 13a0acdf842cd1fe0fd6c0437c631c44b254d5b3 Mon Sep 17 00:00:00 2001 From: William Joye Date: Fri, 4 Jan 2019 14:36:40 -0500 Subject: fix print cmd --- ds9/parsers/pslex.fcl | 1 + ds9/parsers/psparser.tac | 2 ++ 2 files changed, 3 insertions(+) diff --git a/ds9/parsers/pslex.fcl b/ds9/parsers/pslex.fcl index 208d7b8..43be11b 100644 --- a/ds9/parsers/pslex.fcl +++ b/ds9/parsers/pslex.fcl @@ -14,6 +14,7 @@ file {return $FILE_} filename {return $FILENAME_} interpolate {return $INTERPOLATE_} level {return $LEVEL_} +palette {return $PALETTE} printer {return $PRINTER_} resolution {return $RESOLUTION_} diff --git a/ds9/parsers/psparser.tac b/ds9/parsers/psparser.tac index 6bd877c..56e3f35 100644 --- a/ds9/parsers/psparser.tac +++ b/ds9/parsers/psparser.tac @@ -13,6 +13,7 @@ %token FILENAME_ %token INTERPOLATE_ %token LEVEL_ +%token PALETTE_ %token PRINTER_ %token RESOLUTION_ @@ -48,6 +49,7 @@ ps : {PostScript} | RESOLUTION_ resolution {ProcessCmdSet ps resolution $2} #backward compatibility | INTERPOLATE_ + | PALETTE_ color {ProcessCmdSet ps color $2} ; dest : PRINTER_ {set _ printer} -- cgit v0.12 From f22781f8773743906bb5ccdc4fd0b38945591cd2 Mon Sep 17 00:00:00 2001 From: William Joye Date: Fri, 4 Jan 2019 14:48:45 -0500 Subject: fix print cmd --- ds9/parsers/pslex.fcl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ds9/parsers/pslex.fcl b/ds9/parsers/pslex.fcl index 43be11b..fe13465 100644 --- a/ds9/parsers/pslex.fcl +++ b/ds9/parsers/pslex.fcl @@ -14,7 +14,7 @@ file {return $FILE_} filename {return $FILENAME_} interpolate {return $INTERPOLATE_} level {return $LEVEL_} -palette {return $PALETTE} +palette {return $PALETTE_} printer {return $PRINTER_} resolution {return $RESOLUTION_} -- cgit v0.12 From 5049d4662dc3bedcf9f8cdf5aeb2df2eeacae9fe Mon Sep 17 00:00:00 2001 From: William Joye Date: Sat, 5 Jan 2019 12:44:41 -0500 Subject: fix version number vs prefs issue --- ds9/library/ds9.tcl | 6 ++++-- ds9/library/help.tcl | 2 +- ds9/library/prefs.tcl | 2 +- ds9/library/util.tcl | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ds9/library/ds9.tcl b/ds9/library/ds9.tcl index c1e9fb4..9954af1 100644 --- a/ds9/library/ds9.tcl +++ b/ds9/library/ds9.tcl @@ -12,8 +12,10 @@ proc DS9Def {} { win32 {set ds9(title) [file rootname $ds9(app)]} } - # for beta version, MUST have space - set ds9(version) {8.0.1} + # Must be major,minor + set ds9(version) {8.0} + # For display purposes only + set ds9(version,display) {8.0.1} set ds9(top) . set ds9(mb) .mb diff --git a/ds9/library/help.tcl b/ds9/library/help.tcl index fb9967a..11c95aa 100644 --- a/ds9/library/help.tcl +++ b/ds9/library/help.tcl @@ -19,7 +19,7 @@ proc HelpDef {} { set help(vo) "$ds9(root)/doc/ref/vo.html" set help(authors) "William Joye (Smithsonian Astrophysical Observatory)\nEric Mandel (Smithsonian Astrophysical Observatory)\nSteve Murray (Smithsonian Astrophysical Observatory)\n" - set help(about) "SAOImageDS9\nVersion $ds9(version)\n\nAuthors\n$help(authors)\nSAOImage DS9 development has been made possible by funding from NASA's Applied Information Systems Research Program, Chandra X-ray Science Center (CXC), and the High Energy Astrophysics Science Archive Center (HEASARC). Additional funding was provided by the JWST Mission office at Space Telescope Science Institute to improve capabilities for 3D data visualization.\n\nColormaps\nh5utils: Steven Johnson (MIT)\nViridis: Eric Firing (UW)\nCubehelix: Dave Green (Cavendish)\nGist: David Munro (LLNL)\nTopographic: Tom Patterson (US National Park Service) " + set help(about) "SAOImageDS9\nVersion $ds9(version,display)\n\nAuthors\n$help(authors)\nSAOImage DS9 development has been made possible by funding from NASA's Applied Information Systems Research Program, Chandra X-ray Science Center (CXC), and the High Energy Astrophysics Science Archive Center (HEASARC). Additional funding was provided by the JWST Mission office at Space Telescope Science Institute to improve capabilities for 3D data visualization.\n\nColormaps\nh5utils: Steven Johnson (MIT)\nViridis: Eric Firing (UW)\nCubehelix: Dave Green (Cavendish)\nGist: David Munro (LLNL)\nTopographic: Tom Patterson (US National Park Service) " } proc HelpRef {} { diff --git a/ds9/library/prefs.tcl b/ds9/library/prefs.tcl index f2dfb59..9ca01f8 100644 --- a/ds9/library/prefs.tcl +++ b/ds9/library/prefs.tcl @@ -47,7 +47,7 @@ proc LoadPrefs {} { if {$minor>0} { set minor [expr $minor-1] } else { - set major [expr $minor-1] + set major [expr $major-1] set minor 9 } } diff --git a/ds9/library/util.tcl b/ds9/library/util.tcl index b1af02c..9994119 100644 --- a/ds9/library/util.tcl +++ b/ds9/library/util.tcl @@ -1673,7 +1673,7 @@ proc ProcessSendThemeCmd {proc id param {sock {}} {fn {}}} { proc ProcessSendVersionCmd {proc id param {sock {}} {fn {}}} { global ds9 - $proc $id "$ds9(title) [lindex $ds9(version) 0]\n" + $proc $id "$ds9(title) $ds9(version,display)\n" } proc XMLQuote {val} { -- cgit v0.12 From 0af2c4f73a9152637afc86b87307e4af1cd06295 Mon Sep 17 00:00:00 2001 From: William Joye Date: Sat, 5 Jan 2019 13:12:02 -0500 Subject: update version for SAMP --- ds9/library/samp.tcl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ds9/library/samp.tcl b/ds9/library/samp.tcl index 981591b..0118493 100644 --- a/ds9/library/samp.tcl +++ b/ds9/library/samp.tcl @@ -988,7 +988,7 @@ proc samp.client.receiveCall {args} { SAMPReplySimple $msgid "http://ds9.si.edu" } x-samp.releasenotes.url { - SAMPReplySimple $msgid OK "http://ds9.si.edu/doc/release/r7.0.html" + SAMPReplySimple $msgid OK "http://ds9.si.edu/doc/release/r8.0.html" } x-samp.faq.url { SAMPReplySimple $msgid OK "http://ds9.si.edu/doc/faq.html" @@ -998,7 +998,7 @@ proc samp.client.receiveCall {args} { SAMPReplySimple $msgid OK "$help(authors)" } x-samp.release.version { - SAMPReplySimple $msgid OK "$ds9(version)" + SAMPReplySimple $msgid OK "$ds9(version,display)" } ds9.get { SAMPRcvdDS9Get $msgid params -- cgit v0.12