Changeset 719 for trunk

Timestamp:

Dec 4, 2009 5:10:52 PM (14 years ago)

Author:

toby

Message:

# on 2003/08/11 18:13:56, toby did:
remove BKG function #3 since it is gone from GSAS

File:

• trunk/liveplot (modified) (6 diffs, 3 props)

trunk/liveplot

@@ -1276 +1276 @@
     .bkg.cw config -state normal
     set k 0
-    if {$expgui(FitFunction) == 3} {
-        # o is number of refinable terms
-        set o [expr {2 + ($expgui(FitOrder) - 2)/2}]
-        grid [label $top.lbl -text terms] -col $k -row 1
-        if {$expgui(FitOrder) >= 4} {
-            grid [label $top.rlbl -text radii] -col $k -row 2
-        }
-        incr k
-        set width 7
-    } else {
+#    if {$expgui(FitFunction) == 3} {
+#       # o is number of refinable terms
+#       set o [expr {2 + ($expgui(FitOrder) - 2)/2}]
+#       grid [label $top.lbl -text terms] -col $k -row 1
+#       if {$expgui(FitOrder) >= 4} {
+#           grid [label $top.rlbl -text radii] -col $k -row 2
+#       }
+#       incr k
+#       set width 7
+#    } else {
         set o $expgui(FitOrder)
         set width 10
-    }
+#    }
     for {set i 0} {$i < $o} {incr i} {
         if {$i >= [llength $termlist]} {lappend termlist 0.}
@@ -1296 +1296 @@
         grid [entry $top.$i.e -textvariable bkgeditbox($i) -width $width] \
                 -col 2 -row 1
-        if {$expgui(FitFunction) == 3 && $i > 1} {
-            set j [expr $i-2]
-            if {$j >= [llength $expgui(RadiiList)]} {lappend expgui(RadiiList) 0.}
-            set bkgeditbox(r$j) [lindex $expgui(RadiiList) $j]
-            if {$bkgeditbox(r$j) == 0} {
-                set bkgeditbox(r$j) ??
-            }
-            grid [frame $top.r$j -relief groove -bd 3] \
-                    -col [expr $k-2] -row 2
-            grid [label $top.r$j.l -text "[expr -1+$i]"] -col 1 -row 1
-            grid [entry $top.r$j.e -textvariable bkgeditbox(r$j) -width $width] \
-                    -col 2 -row 1       
-        }
+#       if {$expgui(FitFunction) == 3 && $i > 1} {
+#           set j [expr $i-2]
+#           if {$j >= [llength $expgui(RadiiList)]} {lappend expgui(RadiiList) 0.}
+#           set bkgeditbox(r$j) [lindex $expgui(RadiiList) $j]
+#           if {$bkgeditbox(r$j) == 0} {
+#               set bkgeditbox(r$j) ??
+#           }
+#           grid [frame $top.r$j -relief groove -bd 3] \
+#                   -col [expr $k-2] -row 2
+#           grid [label $top.r$j.l -text "[expr -1+$i]"] -col 1 -row 1
+#           grid [entry $top.r$j.e -textvariable bkgeditbox(r$j) -width $width] \
+#                   -col 2 -row 1       
+#       }
         incr k
     }
@@ -1330 +1330 @@
     set good 1
 
-    if {$expgui(FitFunction) == 3} {
-        set expgui(RadiiList) {}
-        for {set j 0} {$j < ($expgui(FitOrder) - 2)/2} {incr j} {
-            lappend expgui(RadiiList) $bkgeditbox(r$j)
-            if {[catch {expr $bkgeditbox(r$j)}]} {
-                $top.r$j.e config -fg red
-                set good 0
-            } elseif {$bkgeditbox(r$j) == 0} {
-                $top.r$j.e config -fg red
-                set good 0
-            } else {
-                $top.r$j.e config -fg black
-            }
-        }
-        set o [expr {2 + ($expgui(FitOrder) - 2)/2}]
-    } else {
+#    if {$expgui(FitFunction) == 3} {
+#       set expgui(RadiiList) {}
+#       for {set j 0} {$j < ($expgui(FitOrder) - 2)/2} {incr j} {
+#           lappend expgui(RadiiList) $bkgeditbox(r$j)
+#           if {[catch {expr $bkgeditbox(r$j)}]} {
+#               $top.r$j.e config -fg red
+#               set good 0
+#           } elseif {$bkgeditbox(r$j) == 0} {
+#               $top.r$j.e config -fg red
+#               set good 0
+#           } else {
+#               $top.r$j.e config -fg black
+#           }
+#       }
+#       set o [expr {2 + ($expgui(FitOrder) - 2)/2}]
+#    } else {
         set o $expgui(FitOrder)
-    }
+#    }
     set termlist {}
     for {set j 0} {$j < $o} {incr j} {
@@ -1778 +1778 @@
     histinfo $hst backtype set $expgui(FitFunction)
     # stick the r values into the list
-    if {$expgui(FitFunction) == 3} {
-        set t [lrange $termlist 0 1]
-        foreach a [lrange $termlist 2 end] b $expgui(RadiiList) {lappend t $a $b}
-    } else {
+#    if {$expgui(FitFunction) == 3} {
+#       set t [lrange $termlist 0 1]
+#       foreach a [lrange $termlist 2 end] b $expgui(RadiiList) {lappend t $a $b}
+#    } else {
         set t $termlist
-    }
+#    }
     histinfo $hst backterms set [llength $t]
     set num 0
@@ -2164 +2164 @@
         "1 - Shifted Chebyschev polynomial"
         "2 - Cosine Fourier series"
-        "3 - Radial distribution peaks"
         "4 - Power series in Q**2n/n!"
         "5 - Power series in n!/Q**2n"
@@ -2174 +2173 @@
                 -command "set termlist {};BkgFillTermBoxes nosave"
     }
+#       "3 - Radial distribution peaks"
     set expgui(FitFunction) 1