summaryrefslogtreecommitdiffstats
path: root/ds9/parsers
diff options
context:
space:
mode:
authorWilliam Joye <wjoye@cfa.harvard.edu>2018-06-12 21:42:17 (GMT)
committerWilliam Joye <wjoye@cfa.harvard.edu>2018-06-12 21:42:17 (GMT)
commit3f1ae1680574d28ef25414c21cde23d1ec78e4a3 (patch)
treef9834df3e87fb9419cd1c80eec60b750e2f4a560 /ds9/parsers
parentc603e045890f38b2c64bac190e934800355bc771 (diff)
downloadblt-3f1ae1680574d28ef25414c21cde23d1ec78e4a3.zip
blt-3f1ae1680574d28ef25414c21cde23d1ec78e4a3.tar.gz
blt-3f1ae1680574d28ef25414c21cde23d1ec78e4a3.tar.bz2
SIA: use cone search radius instead of width/height
Diffstat (limited to 'ds9/parsers')
-rw-r--r--ds9/parsers/sialex.fcl1
-rw-r--r--ds9/parsers/siaparser.tac5
2 files changed, 5 insertions, 1 deletions
diff --git a/ds9/parsers/sialex.fcl b/ds9/parsers/sialex.fcl
index 36295f1..e038871 100644
--- a/ds9/parsers/sialex.fcl
+++ b/ds9/parsers/sialex.fcl
@@ -15,6 +15,7 @@ crosshair {return $CROSSHAIR_}
export {return $EXPORT_}
name {return $NAME_}
print {return $PRINT_}
+radius {return $RADIUS_}
retrieve {return $RETRIEVE_}
save {return $SAVE_}
size {return $SIZE_}
diff --git a/ds9/parsers/siaparser.tac b/ds9/parsers/siaparser.tac
index 0732fe2..d0e75a4 100644
--- a/ds9/parsers/siaparser.tac
+++ b/ds9/parsers/siaparser.tac
@@ -18,6 +18,7 @@
%token EXPORT_
%token NAME_
%token PRINT_
+%token RADIUS_
%token RETRIEVE_
%token SAVE_
%token SIZE_
@@ -69,7 +70,9 @@ siaCmd : CANCEL_ {global cvarname; ARCancel $cvarname}
| NAME_ STRING_ {ProcessCmdCVAR name $2}
| PRINT_ {global cvarname; CATPrint $cvarname}
| RETRIEVE_ {global cvarname; SIAApply $cvarname 1}
- | SIZE_ numeric numeric rformat {SIACmdSize $2 $3 $4}
+ | RADIUS_ numeric rformat {SIACmdSize $2 $3}
+# backward compatibily
+ | SIZE_ numeric numeric rformat {SIACmdSize [expr ($2+$3)/2.] $4}
| SKY_ skyframe {SIACmdSkyframe $2}
| SKYFORMAT_ skyformat {ProcessCmdCVAR skyformat $2}
| SYSTEM_ wcssys {SIACmdSystem $2}