From a78f03fd65c1f61dee4617fe1b4a2e5c2ad91b0b Mon Sep 17 00:00:00 2001
From: William Joye <wjoye@cfa.harvard.edu>
Date: Thu, 25 Apr 2019 13:26:42 -0400
Subject: MASK: fixed an issue with mask and backups

---
 ds9/library/backup.tcl |  4 ----
 ds9/library/frame.tcl  |  3 ---
 ds9/library/load.tcl   | 27 +++++++++++++--------------
 3 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/ds9/library/backup.tcl b/ds9/library/backup.tcl
index ac15743..dcf20b8 100644
--- a/ds9/library/backup.tcl
+++ b/ds9/library/backup.tcl
@@ -296,12 +296,10 @@ proc BackupFrame {ch which dir} {
 proc BackupFrameLoad {ch which fdir rdir channel} {
     set base $which$channel
     
-    # regular loadParams
     set varname $base
     global $varname
     BackupFrameLoadParam $varname $ch $which $fdir $rdir $channel
 
-    # file,mode loadParams
     set cnt [$which get fits count]
     for {set ii 2} {$ii<=$cnt} {incr ii} {
 	set varname "$base.$ii"
@@ -312,8 +310,6 @@ proc BackupFrameLoad {ch which fdir rdir channel} {
 	    break
 	}
     }
-
-    # mask loadParams
     set cnt [$which get mask count]
     for {set ii 1} {$ii<=$cnt} {incr ii} {
 	set varname "$base.m${ii}"
diff --git a/ds9/library/frame.tcl b/ds9/library/frame.tcl
index c2648fc..38d2a6c 100644
--- a/ds9/library/frame.tcl
+++ b/ds9/library/frame.tcl
@@ -1834,7 +1834,6 @@ proc ClearFrame {which} {
 	return
     }
 
-    # delete saved regular loadParams
     foreach cc {{} red green blue} {
 	set varname $which$cc
 	global $varname
@@ -1843,7 +1842,6 @@ proc ClearFrame {which} {
 	}
     }
 
-    # delete saved file,mode loadParams
     set cnt [$which get fits count]
     for {set ii 2} {$ii<=$cnt} {incr ii} {
 	set varname $which.$ii
@@ -1855,7 +1853,6 @@ proc ClearFrame {which} {
 	}
     }
 
-    # delete saved mask loadParams
     set cnt [$which get mask count]
     for {set ii 1} {$ii<=$cnt} {incr ii} {
 	set varname $which.m${ii}
diff --git a/ds9/library/load.tcl b/ds9/library/load.tcl
index f3095da..2371c70 100644
--- a/ds9/library/load.tcl
+++ b/ds9/library/load.tcl
@@ -204,21 +204,20 @@ proc ProcessLoadSaveParams {varname} {
     global loadParam
     global current
 
-    switch $loadParam(load,layer) {
-	mask {
-	    global $varname
-	    if {[info exists $varname]} {
-		set varname "$varname.m[$current(frame) get mask count]"
-	    }
+    if {$loadParam(load,layer) == {mask}} {
+	global $varname
+	if {[info exists $varname]} {
+	    set varname "$varname.m[$current(frame) get mask count]"
 	}
-    }
-    switch $loadParam(file,mode) {
-	slice -
-	{mosaic wcs} -
-	{mosaic iraf} {
-	    global $varname
-	    if {[info exists $varname]} {
-		set varname "$varname.[$current(frame) get fits count]"
+    } else {
+	switch $loadParam(file,mode) {
+	    slice -
+	    {mosaic wcs} -
+	    {mosaic iraf} {
+		global $varname
+		if {[info exists $varname]} {
+		    set varname "$varname.[$current(frame) get fits count]"
+		}
 	    }
 	}
     }
-- 
cgit v0.12