catalog: use cone search radius instead of width/height

9 files changed, 29 insertions, 140 deletions

diff --git a/ds9/library/cat.tcl b/ds9/library/cat.tcl
index 0661ff7..32ba2b7 100644
--- a/ds9/library/cat.tcl
+++ b/ds9/library/cat.tcl
@@ -13,8 +13,7 @@ proc CATDef {} {
     set icat(cats) {}
 
     set icat(rformat) arcmin
-    set icat(width) 15
-    set icat(height) 15
+    set icat(radius) 15
     set icat(max) 5000
     set icat(allrows) 1
     set icat(allcols) 0
@@ -390,8 +389,7 @@ proc CATLoadFn {varname fn reader} {
     set var(name) {}
     set var(x) {}
     set var(y) {}
-    set var(width) {}
-    set var(height) {}
+    set var(radius) {}
 
     if {[file exists $fn]} {
 	$reader $var(catdb) $fn
diff --git a/ds9/library/catcds.tcl b/ds9/library/catcds.tcl
index 62c86ff..45b793b 100644
--- a/ds9/library/catcds.tcl
+++ b/ds9/library/catcds.tcl
@@ -67,9 +67,7 @@ proc CATCDS {varname} {
 	arcsec {set cr "-c.rs"}
     }
 
-    set ww $var(width)
-    set hh $var(height)
-    set rr [expr ($ww+$hh)/2.]
+    set rr $var(radius)
 
     set query [http::formatQuery -source $var(catalog) -c $xx$yy -c.eq $eq $cr $rr -oc.form dec]
 
diff --git a/ds9/library/catcxc.tcl b/ds9/library/catcxc.tcl
index 5cad000..311b25a 100644
--- a/ds9/library/catcxc.tcl
+++ b/ds9/library/catcxc.tcl
@@ -14,12 +14,7 @@ proc CATCXC {varname} {
 	puts stderr "CATCXC $varname"
     }
 
-    # go for votable or tsv
-    if {$pcat(vot)} {
-	CATCXCVOT $varname
-    } else {
-	CATCXCTSV $varname
-    }
+    CATCXCVOT $varname
 }
 
 proc CATCXCVOT {varname} {
@@ -48,22 +43,16 @@ proc CATCXCVOT {varname} {
     # size (degrees)
     switch $var(rformat) {
 	degrees {
-	    set ww $var(width)
-	    set hh $var(height)
+	    set rr $var(radius)
 	}
 	arcmin {
-	    set ww [expr $var(width)/60.]
-	    set hh [expr $var(height)/60.]
+	    set rr [expr $var(radius)/60.]
 	}
 	arcsec {
-	    set ww [expr $var(width)/60./60.]
-	    set hh [expr $var(height)/60./60.]
+	    set rr [expr $var(radius)/60./60.]
 	}
     }
 
-    # now to radius
-    set rr [expr ($ww+$hh)/2.]
-
     # output
     if {$var(allcols)} {
 	set type 3
@@ -78,74 +67,6 @@ proc CATCXCVOT {varname} {
     CATLoad $varname
 }
 
-proc CATCXCTSV {varname} {
-    upvar #0 $varname var
-    global $varname
-
-    global debug
-    if {$debug(tcl,cat)} {
-	puts stderr "CATCXCTSV $varname"
-    }
-
-    set var(proc,reader) CATCXCReader
-    
-    # coord (degrees)
-    switch $var(skyformat) {
-	degrees {
-	    set xx $var(x)
-	    set yy $var(y)
-	}
-	sexagesimal {
-	    switch -- $var(sky) {
-		fk4 -
-		fk5 -
-		icrs {set xx [h2d [Sex2H $var(x)]]}
-		galactic -
-		ecliptic {set xx [Sex2D $var(x)]}
-	    }
-	    set yy [Sex2D $var(y)]
-	}
-    }
-
-    # size (arcmin)
-    switch $var(rformat) {
-	degrees {
-	    set ww [expr $var(width)*60.]
-	    set hh [expr $var(height)*60.]
-	}
-	arcmin {
-	    set ww $var(width)
-	    set hh $var(height)
-	}
-	arcsec {
-	    set ww [expr $var(width)/60.]
-	    set hh [expr $var(height)/60.]
-	}
-    }
-
-    # now to radius
-    set rr [expr ($ww+$hh)/2.]
-
-    # output
-    if {$var(allcols)} {
-	set type observation
-    } else {
-	set type master
-    }
-
-    # query
-    set var(query) "ra=$xx&dec=$yy&sr=$rr&type=$type"
-
-    # rows
-    if {!$var(allrows)} {
-	append var(query) "&rows=$var(max)"
-    }
-
-    set var(url) "http://cda.cfa.harvard.edu/cscds9/coneSearch"
-
-    CATLoadIncr $varname
-}
-
 proc CATCXCReader {t sock token} {
     upvar #0 $t T
     global $t
diff --git a/ds9/library/catdialog.tcl b/ds9/library/catdialog.tcl
index 0b8f1c9..3a7d585 100644
--- a/ds9/library/catdialog.tcl
+++ b/ds9/library/catdialog.tcl
@@ -68,8 +68,7 @@ proc CATDialog {varname format catalog title action} {
     set var(sky) $wcs(sky)
     set var(skyformat) $wcs(skyformat)
     set var(rformat) $icat(rformat)
-    set var(width) $icat(width)
-    set var(height) $icat(height)
+    set var(radius) $icat(radius)
     set var(max) $icat(max)
     set var(allrows) $icat(allrows)
     set var(allcols) $icat(allcols)
@@ -320,17 +319,15 @@ proc CATDialog {varname format catalog title action} {
     ttk::button $f.update -text [msgcat::mc {Update}] \
 	-command [list CATUpdate $varname]
 
-    ttk::label $f.wtitle -text [msgcat::mc {Width}]
-    ttk::entry $f.w -textvariable ${varname}(width) -width 14
-    ttk::label $f.htitle -text [msgcat::mc {Height}]
-    ttk::entry $f.h -textvariable ${varname}(height) -width 14
+    ttk::label $f.rtitle -text [msgcat::mc {Radius}]
+    ttk::entry $f.r -textvariable ${varname}(radius) -width 14
 
     ARRFormat $f.rformat $varname
 
     grid $f.nametitle $f.name - - - - -padx 2 -pady 2 -sticky w
     grid $f.xtitle $f.x $f.ytitle $f.y $f.coord $f.update \
 	-padx 2 -pady 2 -sticky w
-    grid $f.wtitle $f.w $f.htitle $f.h $f.rformat -padx 2 -pady 2 -sticky w
+    grid $f.rtitle $f.r $f.rformat -padx 2 -pady 2 -sticky w
 
     switch $var(format) {
 	skybot {
@@ -951,11 +948,7 @@ proc CATServer {varname} {
 	puts stderr "CATServer $varname"
     }
 
-    if {($var(x) != {}) && 
-	($var(y) != {}) && 
-	($var(width) != {}) && 
-	($var(height) != {})} {
-
+    if {($var(x) != {}) && ($var(y) != {}) && ($var(radius) != {})} {
 	ARStatus $varname "Searching [string range $var(title) 0 50]"
 
 	switch $var(format) {
@@ -996,8 +989,9 @@ proc CATUpdate {varname} {
 
 	set size [$var(frame) get fits size \
 		      $var(system) $var(sky) $var(rformat)]
-	set var(width) [lindex $size 0]
-	set var(height) [lindex $size 1]
+	set ww [lindex $size 0]
+	set hh [lindex $size 1]
+	set var(radius) [expr ($ww+$hh)/4]
 	set var(name) {}
     }
 }
diff --git a/ds9/library/catmatch.tcl b/ds9/library/catmatch.tcl
index bcd770d..9ecaaa8 100644
--- a/ds9/library/catmatch.tcl
+++ b/ds9/library/catmatch.tcl
@@ -358,8 +358,7 @@ proc CATMatchAnd1and2 {varname1 varname2 rrname} {
     set var(name) {}
     set var(x) {}
     set var(y) {}
-    set var(width) {}
-    set var(height) {}
+    set var(radius) {}
 
     # required 
     set T(Header) $T1(Header)
@@ -480,8 +479,7 @@ proc CATMatchAnd1only {varname1 varname2 rrname} {
     set var(name) {}
     set var(x) {}
     set var(y) {}
-    set var(width) {}
-    set var(height) {}
+    set var(radius) {}
 
    # required 
     set T(Header) $T1(Header)
@@ -569,8 +567,7 @@ proc CATMatchAnd2only {varname1 varname2 rrname} {
     set var(name) {}
     set var(x) {}
     set var(y) {}
-    set var(width) {}
-    set var(height) {}
+    set var(radius) {}
 
    # required 
     set T(Header) $T2(Header)
@@ -658,8 +655,7 @@ proc CATMatchNot {varname1 varname2 rrname} {
     set var(name) {}
     set var(x) {}
     set var(y) {}
-    set var(width) {}
-    set var(height) {}
+    set var(radius) {}
 
     # required 
     set T(Header) $T1(Header)
diff --git a/ds9/library/catned.tcl b/ds9/library/catned.tcl
index c456005..007ce16 100644
--- a/ds9/library/catned.tcl
+++ b/ds9/library/catned.tcl
@@ -41,19 +41,15 @@ proc CATNED {varname} {
 
     switch -- $var(rformat) {
 	degrees {
-	    set ww $var(width)
-	    set hh $var(height)
+	    set rr $var(radius)
 	}
 	arcmin {
-	    set ww [expr $var(width)/60.]
-	    set hh [expr $var(height)/60.]
+	    set rr [expr $var(radius)/60.]
 	}
 	arcsec {
-	    set ww [expr $var(width)/60./60.]
-	    set hh [expr $var(height)/60./60.]
+	    set rr [expr $var(radius)/60./60.]
 	}
     }
-    set rr [expr ($ww+$hh)/2.]
 
     if {$pcat(vot)} {
 	set out "xml_main"
diff --git a/ds9/library/catsdss.tcl b/ds9/library/catsdss.tcl
index 754d86d..439da06 100644
--- a/ds9/library/catsdss.tcl
+++ b/ds9/library/catsdss.tcl
@@ -30,22 +30,16 @@ proc CATSDSS {varname} {
     # size (arcmin)
     switch $var(rformat) {
 	degrees {
-	    set ww [expr $var(width)*60.]
-	    set hh [expr $var(height)*60.]
+	    set rr [expr $var(radius)*60.]
 	}
 	arcmin {
-	    set ww $var(width)
-	    set hh $var(height)
+	    set rr $var(radius)
 	}
 	arcsec {
-	    set ww [expr $var(width)/60.]
-	    set hh [expr $var(height)/60.]
+	    set rr [expr $var(radius)/60.]
 	}
     }
 
-    # now to radius
-    set rr [expr ($ww+$hh)/2.]
-
     set query {}
     append query "ra=$xx&"
     append query "dec=$yy&"
diff --git a/ds9/library/catsimbad.tcl b/ds9/library/catsimbad.tcl
index 85dda66..7efeda3 100644
--- a/ds9/library/catsimbad.tcl
+++ b/ds9/library/catsimbad.tcl
@@ -74,9 +74,7 @@ proc CATSIMBAD {varname} {
 	append qq "$yy"
     }
 
-    set ww $var(width)
-    set hh $var(height)
-    set rr [expr ($ww+$hh)/2.]
+    set rr $var(radius)
 
     append qq " radius=$rr"
     switch -- $var(rformat) {
diff --git a/ds9/library/catskybot.tcl b/ds9/library/catskybot.tcl
index 45a9335..51bc408 100644
--- a/ds9/library/catskybot.tcl
+++ b/ds9/library/catskybot.tcl
@@ -48,22 +48,16 @@ proc CATSkyBotVOT {varname} {
     # size (arcmin)
     switch $var(rformat) {
 	degrees {
-	    set ww $var(width)
-	    set hh $var(height)
+	    set rr $var(radius)
 	}
 	arcmin {
-	    set ww [expr $var(width)/60.]
-	    set hh [expr $var(height)/60.]
+	    set rr [expr $var(radius)/60.]
 	}
 	arcsec {
-	    set ww [expr $var(width)/60./60.]
-	    set hh [expr $var(height)/60./60.]
+	    set rr [expr $var(radius)/60./60.]
 	}
     }
 
-    # now to radius
-    set rr [expr ($ww+$hh)/2.]
-
     # output
     if {$var(allcols)} {
 	set type 3