Changeset 719 for trunk/liveplot


Ignore:
Timestamp:
Dec 4, 2009 5:10:52 PM (11 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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/liveplot

    • Property rcs:date changed from 2003/05/22 21:40:10 to 2003/08/11 18:13:56
    • Property rcs:lines changed from +11 -8 to +49 -49
    • Property rcs:rev changed from 1.33 to 1.34
    r695 r719  
    12761276    .bkg.cw config -state normal
    12771277    set k 0
    1278     if {$expgui(FitFunction) == 3} {
    1279         # o is number of refinable terms
    1280         set o [expr {2 + ($expgui(FitOrder) - 2)/2}]
    1281         grid [label $top.lbl -text terms] -col $k -row 1
    1282         if {$expgui(FitOrder) >= 4} {
    1283             grid [label $top.rlbl -text radii] -col $k -row 2
    1284         }
    1285         incr k
    1286         set width 7
    1287     } else {
     1278#    if {$expgui(FitFunction) == 3} {
     1279#       # o is number of refinable terms
     1280#       set o [expr {2 + ($expgui(FitOrder) - 2)/2}]
     1281#       grid [label $top.lbl -text terms] -col $k -row 1
     1282#       if {$expgui(FitOrder) >= 4} {
     1283#           grid [label $top.rlbl -text radii] -col $k -row 2
     1284#       }
     1285#       incr k
     1286#       set width 7
     1287#    } else {
    12881288        set o $expgui(FitOrder)
    12891289        set width 10
    1290     }
     1290#    }
    12911291    for {set i 0} {$i < $o} {incr i} {
    12921292        if {$i >= [llength $termlist]} {lappend termlist 0.}
     
    12961296        grid [entry $top.$i.e -textvariable bkgeditbox($i) -width $width] \
    12971297                -col 2 -row 1
    1298         if {$expgui(FitFunction) == 3 && $i > 1} {
    1299             set j [expr $i-2]
    1300             if {$j >= [llength $expgui(RadiiList)]} {lappend expgui(RadiiList) 0.}
    1301             set bkgeditbox(r$j) [lindex $expgui(RadiiList) $j]
    1302             if {$bkgeditbox(r$j) == 0} {
    1303                 set bkgeditbox(r$j) ??
    1304             }
    1305             grid [frame $top.r$j -relief groove -bd 3] \
    1306                     -col [expr $k-2] -row 2
    1307             grid [label $top.r$j.l -text "[expr -1+$i]"] -col 1 -row 1
    1308             grid [entry $top.r$j.e -textvariable bkgeditbox(r$j) -width $width] \
    1309                     -col 2 -row 1       
    1310         }
     1298#       if {$expgui(FitFunction) == 3 && $i > 1} {
     1299#           set j [expr $i-2]
     1300#           if {$j >= [llength $expgui(RadiiList)]} {lappend expgui(RadiiList) 0.}
     1301#           set bkgeditbox(r$j) [lindex $expgui(RadiiList) $j]
     1302#           if {$bkgeditbox(r$j) == 0} {
     1303#               set bkgeditbox(r$j) ??
     1304#           }
     1305#           grid [frame $top.r$j -relief groove -bd 3] \
     1306#                   -col [expr $k-2] -row 2
     1307#           grid [label $top.r$j.l -text "[expr -1+$i]"] -col 1 -row 1
     1308#           grid [entry $top.r$j.e -textvariable bkgeditbox(r$j) -width $width] \
     1309#                   -col 2 -row 1       
     1310#       }
    13111311        incr k
    13121312    }
     
    13301330    set good 1
    13311331
    1332     if {$expgui(FitFunction) == 3} {
    1333         set expgui(RadiiList) {}
    1334         for {set j 0} {$j < ($expgui(FitOrder) - 2)/2} {incr j} {
    1335             lappend expgui(RadiiList) $bkgeditbox(r$j)
    1336             if {[catch {expr $bkgeditbox(r$j)}]} {
    1337                 $top.r$j.e config -fg red
    1338                 set good 0
    1339             } elseif {$bkgeditbox(r$j) == 0} {
    1340                 $top.r$j.e config -fg red
    1341                 set good 0
    1342             } else {
    1343                 $top.r$j.e config -fg black
    1344             }
    1345         }
    1346         set o [expr {2 + ($expgui(FitOrder) - 2)/2}]
    1347     } else {
     1332#    if {$expgui(FitFunction) == 3} {
     1333#       set expgui(RadiiList) {}
     1334#       for {set j 0} {$j < ($expgui(FitOrder) - 2)/2} {incr j} {
     1335#           lappend expgui(RadiiList) $bkgeditbox(r$j)
     1336#           if {[catch {expr $bkgeditbox(r$j)}]} {
     1337#               $top.r$j.e config -fg red
     1338#               set good 0
     1339#           } elseif {$bkgeditbox(r$j) == 0} {
     1340#               $top.r$j.e config -fg red
     1341#               set good 0
     1342#           } else {
     1343#               $top.r$j.e config -fg black
     1344#           }
     1345#       }
     1346#       set o [expr {2 + ($expgui(FitOrder) - 2)/2}]
     1347#    } else {
    13481348        set o $expgui(FitOrder)
    1349     }
     1349#    }
    13501350    set termlist {}
    13511351    for {set j 0} {$j < $o} {incr j} {
     
    17781778    histinfo $hst backtype set $expgui(FitFunction)
    17791779    # stick the r values into the list
    1780     if {$expgui(FitFunction) == 3} {
    1781         set t [lrange $termlist 0 1]
    1782         foreach a [lrange $termlist 2 end] b $expgui(RadiiList) {lappend t $a $b}
    1783     } else {
     1780#    if {$expgui(FitFunction) == 3} {
     1781#       set t [lrange $termlist 0 1]
     1782#       foreach a [lrange $termlist 2 end] b $expgui(RadiiList) {lappend t $a $b}
     1783#    } else {
    17841784        set t $termlist
    1785     }
     1785#    }
    17861786    histinfo $hst backterms set [llength $t]
    17871787    set num 0
     
    21642164        "1 - Shifted Chebyschev polynomial"
    21652165        "2 - Cosine Fourier series"
    2166         "3 - Radial distribution peaks"
    21672166        "4 - Power series in Q**2n/n!"
    21682167        "5 - Power series in n!/Q**2n"
     
    21742173                -command "set termlist {};BkgFillTermBoxes nosave"
    21752174    }
     2175#       "3 - Radial distribution peaks"
    21762176    set expgui(FitFunction) 1
    21772177
Note: See TracChangeset for help on using the changeset viewer.