diff options
| author | William Joye <wjoye@cfa.harvard.edu> | 2018-06-12 21:07:26 (GMT) |
|---|---|---|
| committer | William Joye <wjoye@cfa.harvard.edu> | 2018-06-12 21:07:26 (GMT) |
| commit | c603e045890f38b2c64bac190e934800355bc771 (patch) | |
| tree | 2e32265ebdfb8012a46694f38b450fadf0cd88cf /ds9/parsers | |
| parent | 2a884140458c2f4ed271dd5b6fb74502db4653be (diff) | |
| download | blt-c603e045890f38b2c64bac190e934800355bc771.zip blt-c603e045890f38b2c64bac190e934800355bc771.tar.gz blt-c603e045890f38b2c64bac190e934800355bc771.tar.bz2 | |
catalog: use cone search radius instead of width/height
Diffstat (limited to 'ds9/parsers')
| -rw-r--r-- | ds9/parsers/catlex.fcl | 1 | ||||
| -rw-r--r-- | ds9/parsers/catparser.tac | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/ds9/parsers/catlex.fcl b/ds9/parsers/catlex.fcl index d966799..cd6836b 100644 --- a/ds9/parsers/catlex.fcl +++ b/ds9/parsers/catlex.fcl @@ -58,6 +58,7 @@ print {return $PRINT_} psky {return $PSKY_} psystem {return $PSYSTEM_} ra {return $RA_} +radius {return $RADIUS_} regions {return $REGIONS_} remove {return $REMOVE_} retrieve {return $RETRIEVE_} diff --git a/ds9/parsers/catparser.tac b/ds9/parsers/catparser.tac index c887e98..fdbddd3 100644 --- a/ds9/parsers/catparser.tac +++ b/ds9/parsers/catparser.tac @@ -63,6 +63,7 @@ %token PSKY_ %token PSYSTEM_ %token RA_ +%token RADIUS_ %token REGIONS_ %token REMOVE_ %token RETRIEVE_ @@ -163,8 +164,9 @@ catCmd : coordinate | SAVE_ STRING_ {CatalogCmdSave $2 VOTWrite} | SERVER_ server {ProcessCmdCVAR server $2} | SHOW_ yesno {ProcessCmdCVAR show $2 CATGenerate} - | SIZE_ numeric numeric rformat {ProcessCmdCVAR4 width $2 height $3 rformat $4 rformat,msg $4} -# | SIZE_ numeric numeric rformat {CatalogCmdSize $2 $3 $4} + | RADIUS_ numeric rformat {ProcessCmdCVAR3 radius $2 rformat $3 rformat,msg $3} +# backward compatibility + | SIZE_ numeric numeric rformat {ProcessCmdCVAR3 radius [expr ($2+$3)/2.] rformat $4 rformat,msg $4} | SKY_ skyframe {CatalogCmdSkyframe $2} | SKYFORMAT_ skyformat {ProcessCmdCVAR skyformat $2} | SORT_ sort |