simplify has wcs command

15 files changed, 34 insertions, 34 deletions

diff --git a/ds9/library/cat.tcl b/ds9/library/cat.tcl
index cb61551..cfc9188 100644
--- a/ds9/library/cat.tcl
+++ b/ds9/library/cat.tcl
@@ -935,7 +935,7 @@ proc CATConfigCols {varname} {
 		set var(coly) [starbase_colname $var(catdb) 2]
 
 		return
-	    } elseif {![$var(frame) has wcs equatorial $var(psystem)]} {
+	    } elseif {![$var(frame) has wcs celestial $var(psystem)]} {
 		# linear
 		set var(colx) [starbase_colname $var(catdb) 1]
 		set var(coly) [starbase_colname $var(catdb) 2]
diff --git a/ds9/library/catdialog.tcl b/ds9/library/catdialog.tcl
index 6bb650a..5228e65 100644
--- a/ds9/library/catdialog.tcl
+++ b/ds9/library/catdialog.tcl
@@ -670,7 +670,7 @@ proc CATCrosshair {varname} {
 	return
     }
 
-    if {[$var(frame) has wcs equatorial $var(system)]} {
+    if {[$var(frame) has wcs celestial $var(system)]} {
 	set coord [$var(frame) get crosshair \
 		       $var(system) $var(sky) $var(skyformat)]
 	set var(x) [lindex $coord 0]
@@ -981,7 +981,7 @@ proc CATUpdate {varname} {
 	return
     }
 
-    if {[$var(frame) has wcs equatorial $var(system)]} {
+    if {[$var(frame) has wcs celestial $var(system)]} {
 	set coord [$var(frame) get fits center \
 		       $var(system) $var(sky) $var(skyformat)]
 	set var(x) [lindex $coord 0]
@@ -1026,7 +1026,7 @@ proc CATColsUpdate {varname} {
 		-font [font actual TkDefaultFont]
 	}
 	default {
-	    if {[$var(frame) has wcs equatorial $var(psystem)]} {
+	    if {[$var(frame) has wcs celestial $var(psystem)]} {
 		switch $var(psky) {
 		    fk4 -
 		    fk5 -
diff --git a/ds9/library/coord.tcl b/ds9/library/coord.tcl
index 15f0dba..80d519e 100644
--- a/ds9/library/coord.tcl
+++ b/ds9/library/coord.tcl
@@ -118,7 +118,7 @@ proc DisplayCoordDialog {which x y} {
 	if {"$pcoord(wcs$l)" && [$which has wcs "wcs$l"]} {
 	    set cd "[$which get coordinates $x $y wcs$l $wcs(sky) $wcs(skyformat)]"
 
-	    if {[$which has wcs equatorial "wcs$l"]} {
+	    if {[$which has wcs celestial "wcs$l"]} {
 		append r " [lindex $cd 0] [lindex $cd 1] $wcs(sky)"
 	    } else {
 		set name [$which get wcs name "wcs$l"]
diff --git a/ds9/library/grid.tcl b/ds9/library/grid.tcl
index 63f82f0..76e2b32 100644
--- a/ds9/library/grid.tcl
+++ b/ds9/library/grid.tcl
@@ -146,7 +146,7 @@ proc GridAdjustOptions {which} {
 	detector {}
 	default {
 	    if {$which != {}} {
-		if {[$which has wcs celestrial $grid(system)]} {
+		if {[$which has wcs celestial $grid(system)]} {
 		    set grid(grid,gapunit1) degrees
 		    set grid(grid,gapunit2) degrees
 		}
@@ -1039,7 +1039,7 @@ proc GridDefaultFormat1 {} {
 	detector -
 	amplifier {return {}}
 	default {
-	    if {[$current(frame) has wcs equatorial $grid(system)]} {
+	    if {[$current(frame) has wcs celestial $grid(system)]} {
 		switch $grid(sky) {
 		    fk4 -
 		    fk5 -
@@ -1061,7 +1061,7 @@ proc GridDefaultFormat1 {} {
 		}
 		return {}
 	    }
-	    if {[$current(frame) has wcs celestrial $grid(system)]} {
+	    if {[$current(frame) has wcs celestial $grid(system)]} {
 		switch $grid(skyformat) {
 		    degrees {return {d.3}}
 		    sexagesimal {return {dms.1}}
@@ -1083,7 +1083,7 @@ proc GridDefaultFormat2 {} {
 	detector -
 	amplifier {return {}}
 	default {
-	    if {[$current(frame) has wcs equatorial $grid(system)]} {
+	    if {[$current(frame) has wcs celestial $grid(system)]} {
 		switch $grid(sky) {
 		    fk4 -
 		    fk5 -
@@ -1105,7 +1105,7 @@ proc GridDefaultFormat2 {} {
 		}
 		return {}
 	    }
-	    if {[$current(frame) has wcs celestrial $grid(system)]} {
+	    if {[$current(frame) has wcs celestial $grid(system)]} {
 		switch $grid(skyformat) {
 		    degrees {return {d.3}}
 		    sexagesimal {return {dms.1}}
diff --git a/ds9/library/hv.tcl b/ds9/library/hv.tcl
index 8d63b03..0a70be8 100644
--- a/ds9/library/hv.tcl
+++ b/ds9/library/hv.tcl
@@ -745,7 +745,7 @@ proc HVArchChandraChaser {} {
 
     set coord {}
     if {$current(frame) != {}} {
-	if {[$current(frame) has wcs equatorial wcs]} {
+	if {[$current(frame) has wcs celestial wcs]} {
 	    set coord [$current(frame) get fits center wcs fk5 degrees]
 	    set size \
 		[expr [lindex [$current(frame) get fits size wcs fk5 arcmin] 0]/2.]
@@ -768,7 +768,7 @@ proc HVArchChandraPop {} {
 
     set coord {}
     if {$current(frame) != {}} {
-	if {[$current(frame) has wcs equatorial wcs]} {
+	if {[$current(frame) has wcs celestial wcs]} {
 	    set coord [$current(frame) get fits center wcs fk5 degrees]
 	    set size \
 		[expr [lindex [$current(frame) get fits size wcs fk5 arcmin] 0]/2.]
@@ -795,7 +795,7 @@ proc HVArchChandraFTP {} {
     set wid {}
 
     if {$current(frame) != {}} {
-	if {[$current(frame) has wcs equatorial wcs]} {
+	if {[$current(frame) has wcs celestial wcs]} {
 	    set coord [$current(frame) get fits center wcs fk5 sexagesimal]
 	    set ra [lindex $coord 0]
 	    set dec [lindex $coord 1]
diff --git a/ds9/library/imgsvr.tcl b/ds9/library/imgsvr.tcl
index 5a9f761..3bfa845 100644
--- a/ds9/library/imgsvr.tcl
+++ b/ds9/library/imgsvr.tcl
@@ -154,7 +154,7 @@ proc IMGSVRUpdate {varname} {
     if {[winfo exists $var(top)]} {
 	set var(name) {}
 	if {$current(frame) != {} } {
-	    if {[$current(frame) has wcs equatorial $wcs(system)]} {
+	    if {[$current(frame) has wcs celestial $wcs(system)]} {
 		set coord [$current(frame) get fits center \
 			       $wcs(system) $var(sky) $var(skyformat)]
 		set var(x) [lindex $coord 0]
@@ -191,7 +191,7 @@ proc IMGSVRCrosshair {varname} {
     if {[winfo exists $var(top)]} {
 	set var(name) {}
 	if {$current(frame) != {} } {
-	    if {[$current(frame) has wcs equatorial $wcs(system)]} {
+	    if {[$current(frame) has wcs celestial $wcs(system)]} {
 		set coord [$current(frame) get crosshair \
 			       $wcs(system) $var(sky) $var(skyformat)]
 		set var(x) [lindex $coord 0]
diff --git a/ds9/library/info.tcl b/ds9/library/info.tcl
index 7fc1125..17a82c5 100644
--- a/ds9/library/info.tcl
+++ b/ds9/library/info.tcl
@@ -557,7 +557,7 @@ proc UpdateInfoBox {which x y sys} {
 		set infobox(wcs$ll,sys) "WCS $ll"
 		$infobox(wcs$ll,x,nm) configure -text {}
 		$infobox(wcs$ll,y,nm) configure -text {}
-	    } elseif {[$which has wcs equatorial wcs$ll]} {
+	    } elseif {[$which has wcs celestial wcs$ll]} {
 		switch -- $infobox(wcs$ll,sys) {
 		    fk4 -
 		    fk5 -
@@ -580,7 +580,7 @@ proc UpdateInfoBox {which x y sys} {
 			    -font "$ds9(times) $fsz"
 		    }
 		}
-	    } elseif {[$which has wcs celestrial wcs$ll]} {
+	    } elseif {[$which has wcs celestial wcs$ll]} {
 		if {$infobox(wcs$ll,sys) == {}} {
 		    set infobox(wcs$ll,sys) "WCS $ll"
 		}
diff --git a/ds9/library/marker.tcl b/ds9/library/marker.tcl
index f003894..bca6116 100644
--- a/ds9/library/marker.tcl
+++ b/ds9/library/marker.tcl
@@ -1351,12 +1351,12 @@ proc MarkerPaste {} {
 	    [$current(frame) has wcs $marker(copy,system)]} {
 
 	    # do we have an equatorial wcs?
-	    if {[$marker(copy) has wcs equatorial $marker(copy,system)] &&
-		[$current(frame) has wcs equatorial $marker(copy,system)]} {
+	    if {[$marker(copy) has wcs celestial $marker(copy,system)] &&
+		[$current(frame) has wcs celestial $marker(copy,system)]} {
 		# then use wcs
 		set cmd "[$marker(copy) marker paste $marker(copy,system)]"
 	    } else {
-		# mix of equatorial and non-equatorial wcs, use physical
+		# mix of celestial and non-celestial wcs, use physical
 		set cmd "[$marker(copy) marker paste physical]"
 	    }
 	} else {
@@ -1407,7 +1407,7 @@ proc MarkerBackup {ch which fdir rdir} {
 	set rfn $rdir/ds9.reg
 
 	catch {file delete -force $fn}
-	if {[$which has wcs equatorial wcs]} {
+	if {[$which has wcs celestial wcs]} {
 	    $which marker save \"$fn\" ds9 wcs fk5 degrees 0
 	} else {
 	    $which marker save \"$fn\" ds9 physical fk5 degrees 0
diff --git a/ds9/library/markeranalysispanda.tcl b/ds9/library/markeranalysispanda.tcl
index 5f04925..ec8f36e 100644
--- a/ds9/library/markeranalysispanda.tcl
+++ b/ds9/library/markeranalysispanda.tcl
@@ -140,7 +140,7 @@ proc MarkerAnalysisPandaAxisTitle {vvarname} {
 	    set ytitle "Surface Brightness (cnts/pixels**2)"
 	}
 	default {
-	    if {[$vvar(frame) has wcs equatorial $vvar(system)]} {
+	    if {[$vvar(frame) has wcs celestial $vvar(system)]} {
 		set xtitle "Avg Radius (arcsecs)"
 		set ytitle "Surface Brightness (cnts/arcsec**2)"
 	    } else {
diff --git a/ds9/library/markeranalysisplot2d.tcl b/ds9/library/markeranalysisplot2d.tcl
index e773eb5..121e948 100644
--- a/ds9/library/markeranalysisplot2d.tcl
+++ b/ds9/library/markeranalysisplot2d.tcl
@@ -220,7 +220,7 @@ proc MarkerAnalysisPlot2dXAxisTitle {vvarname} {
 	amplifier -
 	detector {set xtitle "$vvar(system)"}
 	default {
-	    if {[$vvar(frame) has wcs equatorial $vvar(system)]} {
+	    if {[$vvar(frame) has wcs celestial $vvar(system)]} {
 		set xtitle "$vvar(system)"
 	    } else {
 		set xtitle "[$vvar(frame) get wcs name $vvar(system)]"
diff --git a/ds9/library/markeranalysisradial.tcl b/ds9/library/markeranalysisradial.tcl
index 3f109ef..45a552d 100644
--- a/ds9/library/markeranalysisradial.tcl
+++ b/ds9/library/markeranalysisradial.tcl
@@ -157,7 +157,7 @@ proc MarkerAnalysisRadialAxisTitle {vvarname} {
 	    set ytitle "Surface Brightness (cnts/pixels**2)"
 	}
 	default {
-	    if {[$vvar(frame) has wcs equatorial $vvar(system)]} {
+	    if {[$vvar(frame) has wcs celestial $vvar(system)]} {
 		set xtitle "Avg Radius (arcsecs)"
 		set ytitle "Surface Brightness (cnts/arcsec**2)"
 	    } else {
diff --git a/ds9/library/menu.tcl b/ds9/library/menu.tcl
index 78e6196..8226ec2 100644
--- a/ds9/library/menu.tcl
+++ b/ds9/library/menu.tcl
@@ -138,7 +138,7 @@ proc CoordMenuButtonCmd {varname system sky cmd} {
 	    default {
 		if {[info exists var(frame)]} {
 		    if {$var(frame) != {}} {
-			if {[$var(frame) has wcs equatorial $var($system)]} {
+			if {[$var(frame) has wcs celestial $var($system)]} {
 			    set ${varname}($system,msg) [msgcat::mc $var($sky)]
 			}
 		    }
@@ -193,7 +193,7 @@ proc CoordMenuEnable {w varname system other sky skyformat} {
     }
 
     if {$sky != {}} {
-	if {[$var(frame) has wcs equatorial $var($system)]} {
+	if {[$var(frame) has wcs celestial $var($system)]} {
 	    $w entryconfig [msgcat::mc {FK4}] -state normal
 	    $w entryconfig [msgcat::mc {FK5}] -state normal
 	    $w entryconfig [msgcat::mc {ICRS}] -state normal
@@ -209,7 +209,7 @@ proc CoordMenuEnable {w varname system other sky skyformat} {
     }
 
     if {$skyformat != {}} {
-	if {[$var(frame) has wcs celestrial $var($system)]} {
+	if {[$var(frame) has wcs celestial $var($system)]} {
 	    $w entryconfig [msgcat::mc {Degrees}] -state normal
 	    $w entryconfig {Sexagesimal} -state normal
 	} else {
@@ -320,7 +320,7 @@ proc DistMenuButtonCmd {varname system format cmd} {
 	    default {
 		if {[info exists var(frame)]} {
 		    if {$var(frame) != {}} {
-			if {[$var(frame) has wcs equatorial $var($system)]} {
+			if {[$var(frame) has wcs celestial $var($system)]} {
 			    set ${varname}($system,msg) [msgcat::mc $var($format)]
 			}
 		    }
@@ -370,7 +370,7 @@ proc DistMenuEnable {w varname system other format} {
     }
 
     if {$format != {}} {
-	if {[$var(frame) has wcs celestrial $var($system)]} {
+	if {[$var(frame) has wcs celestial $var($system)]} {
 	    $w entryconfig [msgcat::mc {Degrees}] -state normal
 	    $w entryconfig [msgcat::mc {ArcMin}] -state normal
 	    $w entryconfig [msgcat::mc {ArcSec}] -state normal
diff --git a/ds9/library/nameres.tcl b/ds9/library/nameres.tcl
index 2040539..c7bc60b 100644
--- a/ds9/library/nameres.tcl
+++ b/ds9/library/nameres.tcl
@@ -144,7 +144,7 @@ proc NRESCrosshair {varname} {
     global current
 
     if {($current(frame) != {})} {
-	if {[$current(frame) has wcs equatorial $var(system)]} {
+	if {[$current(frame) has wcs celestial $var(system)]} {
 	    if {($var(x) != {}) && ($var(y) != {})} {
 		set current(mode) crosshair
 		ChangeMode
diff --git a/ds9/library/samp.tcl b/ds9/library/samp.tcl
index d126c02..981591b 100644
--- a/ds9/library/samp.tcl
+++ b/ds9/library/samp.tcl
@@ -629,7 +629,7 @@ proc SAMPSendCoordPointAtSkyCmd {which} {
 	return
     }
 
-    if {[$which has wcs equatorial wcs]} {
+    if {[$which has wcs celestial wcs]} {
 	set coord [$which get coordinates [$which get cursor canvas] wcs fk5 degrees]
 	if {$coord != {}} {
 	    SAMPSendCoordPointAtSky {} "$coord"
@@ -1499,7 +1499,7 @@ proc SAMPRcvdCoordPointAtSky {varname} {
     }
 
     global current
-    if {$ra != {} && $dec != {} && [$current(frame) has wcs equatorial wcs]} {
+    if {$ra != {} && $dec != {} && [$current(frame) has wcs celestial wcs]} {
 	set samp(rcvd,lock) 1
 	PanTo $ra $dec wcs fk5
 	set samp(rcvd,lock) 0
diff --git a/ds9/library/siadialog.tcl b/ds9/library/siadialog.tcl
index 0571ae4..51ae927 100644
--- a/ds9/library/siadialog.tcl
+++ b/ds9/library/siadialog.tcl
@@ -493,7 +493,7 @@ proc SIAUpdate {varname} {
     if {[winfo exists $var(top)]} {
 	set var(name) {}
 	if {$current(frame) != {} } {
-	    if {[$current(frame) has wcs equatorial $wcs(system)]} {
+	    if {[$current(frame) has wcs celestial $wcs(system)]} {
 		set coord [$current(frame) get fits center \
 			       $wcs(system) $var(sky) $var(skyformat)]
 		set var(x) [lindex $coord 0]
@@ -530,7 +530,7 @@ proc SIACrosshair {varname} {
     if {[winfo exists $var(top)]} {
 	set var(name) {}
 	if {$current(frame) != {} } {
-	    if {[$current(frame) has wcs equatorial $wcs(system)]} {
+	    if {[$current(frame) has wcs celestial $wcs(system)]} {
 		set coord [$current(frame) get crosshair \
 			       $wcs(system) $var(sky) $var(skyformat)]
 		set var(x) [lindex $coord 0]