Changeset 399 for trunk/expgui

Timestamp:

Dec 4, 2009 5:05:31 PM (13 years ago)

Author:

toby

Message:

# on 2001/06/29 18:06:31, toby did:
Add Marquardt, convergence, LeBail? damping to LS page
bkgedit button to background edit dialog

File:

• trunk/expgui (modified) (14 diffs, 3 props)

trunk/expgui

@@ -379 +379 @@
     # set fo extraction on LS page
     SetupExtractHist
+    # set convergence criterion
+    InitLSvars
 
     # update the histogram list & update the page
@@ -417 +419 @@
     set expgui(titleunchanged) 1
     wm iconname . [file tail $expgui(expfile)]
+    # set convergence criterion
+    InitLSvars
 }
 
@@ -783 +787 @@
     wm title . $expgui(expfile)
     set expgui(titleunchanged) 1
+    # set convergence criterion
+    InitLSvars
 }
 
@@ -2235 +2241 @@
     set entrycmd(fobsextract) "histinfo [list $histlist] foextract"
     if {[llength $histlist] == 0 || [string trim $histlist] == ""} {
+        set entrycmd(LBdamp) ""
         foreach phase {1 2 3 4 5 6 7 8 9} {
             $expgui(FobsExtractFrame).l$phase config -fg grey
@@ -2246 +2253 @@
         set entrycmd(trace) 0
         set entryvar(fobsextract) [histinfo $histlist foextract]
+        set entrycmd(LBdamp) "histinfo $histlist LBdamp"
+        set entryvar(LBdamp) [histinfo $histlist LBdamp]
         foreach phase {1 2 3 4 5 6 7 8 9} {
             # is the phase present?
@@ -2264 +2273 @@
     } elseif {[llength $histlist] > 1} {
         # disable traces on entryvar
+        set entrycmd(LBdamp) "histinfo [list $histlist] LBdamp"
+        set entryvar(LBdamp) [histinfo [lindex $histlist 0] LBdamp]
         set entrycmd(trace) 0
         # multiple histograms need phases in any histogram
@@ -2330 +2341 @@
         grid [label $w.0.a \
             -text "Setting background terms for histogram $histlist" \
-            -bg beige] -row 0 -column 0 -columnspan 10
+            -bg beige] -row 0 -column 0 -columnspan 4
+        grid [button $w.0.bkg -text "Fit Background\nGraphically" \
+                -command "QuitEditBackground $w; bkgedit $histlist"] \
+                -row 0 -column 4 -rowspan 2
+        grid columnconfig $w.0 0 -weight 1
+        grid columnconfig $w.0 4 -weight 1
     }
     set hist [lindex $histlist 0]
-    grid [label $w.0.b -text "Function type"  -bg beige]  -row 1 -column 0
+    grid [label $w.0.b -text "Function type" -bg beige]  -row 1 -column 0 -sticky e
 
     # disable traces on  expgui(backtype) & expgui(backterms) now
@@ -2345 +2361 @@
     $typemenu delete 0 end
     foreach item {
-        "1 - Shifted Chebyshev"
+        "1 - Shifted Chebyschev"
         "2 - Cosine Fourier series"
         "3 - Radial distribution peaks"
@@ -3235 +3251 @@
 
 pack [frame $expgui(lsFrame).f1] -fill both -expand true
-grid rowconfigure $expgui(lsFrame).f1  4 -weight 1
 set row 0
 grid [label $expgui(lsFrame).f1.his1 -pady 6 -text "Last History:"] -row $row -column 0
@@ -3249 +3264 @@
 
 incr row
+grid rowconfigure $expgui(lsFrame).f1 $row -weight 1
+incr row
 grid [frame $expgui(lsFrame).f1.b -bd 4 -relief groove] \
-        -row $row -column 0 -columnspan 2 -pady 3
+        -row $row -column 0 -columnspan 2 -pady 3  -sticky s
 grid [label $expgui(lsFrame).f1.b.lcyc -text "Number of Cycles"] -row 0 -column 0
 grid [entry $expgui(lsFrame).f1.b.ecyc -width 3 \
         -textvariable entryvar(cycles)] -row 0 -column 1
 set entrybox(cycles) $expgui(lsFrame).f1.b.ecyc
+
+grid [frame $expgui(lsFrame).f1.cv -bd 4 -relief groove] \
+        -row $row -column 2 -sticky ew
+grid [label $expgui(lsFrame).f1.cv.l -text "Convgerence Criterion"] \
+        -row 0 -column 0 -columnspan 2
+grid [label $expgui(lsFrame).f1.cv.v -textvariable expgui(convlbl)] -row 1 -column 0
+grid [scale $expgui(lsFrame).f1.cv.s -orient horizontal \
+        -from -200 -to 200 -showvalue 0 -command SetConv -resolution 10 \
+        -variable expgui(convg)] -row 1 -column 1
+
+incr row
 grid [menubutton $expgui(lsFrame).f1.lprint -textvariable expgui(printopt) \
         -menu $expgui(lsFrame).f1.lprint.menu -bd 4 -relief raised \
-        ] -row $row -column 2 
+        ] -row $row -column 0 -columnspan 2 
 menu $expgui(lsFrame).f1.lprint.menu
 foreach num [lsort [array names printopts]] {
@@ -3264 +3292 @@
         -variable entryvar(printopt$num)
 }
-#grid [frame $expgui(lsFrame).f1.c -bd 4 -relief groove] -row $row -column 3
-#grid [label $expgui(lsFrame).f1.c.fol -text "Extract Fobs"] -row 0 -column 2
-#grid [checkbutton $expgui(lsFrame).f1.c.foc -variable entryvar(fobsextract)] -row 0 -column 3
+
+grid [frame $expgui(lsFrame).f1.marq -bd 4 -relief groove] \
+        -row $row -column 2 -sticky ew
+grid [label $expgui(lsFrame).f1.marq.l -text "Marquardt Damping"] \
+        -row 0 -column 0 -columnspan 2
+grid [label $expgui(lsFrame).f1.marq.v -textvariable expgui(marq)] \
+        -row 1 -column 0
+grid [scale $expgui(lsFrame).f1.marq.s -orient horizontal \
+        -from 1.0 -to 9.99 -showvalue 0 -command SetMarq -resolution 0.01 \
+        -variable expgui(marq)] -row 1 -column 1
+
+incr row
+grid rowconfigure $expgui(lsFrame).f1 $row -weight 1
+
 incr row
 if {$expgui(haveBW)} {
@@ -3278 +3317 @@
     set expgui(FobsExtractFrame) $expgui(lsFrame).f1.a
 }
-grid rowconfigure $expgui(lsFrame).f1 $row -pad 16
+
 grid [frame $expgui(FobsExtractFrame).c -bd 4 -relief groove] \
-        -row 0 -column 8 -columnspan 3 -sticky e
+        -row 0 -column 8 -columnspan 3 -sticky ens
 grid [label $expgui(FobsExtractFrame).c.fol -text "Extract Fobs"] \
         -row 0 -column 2
 grid [checkbutton $expgui(FobsExtractFrame).c.foc \
         -variable entryvar(fobsextract)] -row 0 -column 3
+
+grid [frame $expgui(FobsExtractFrame).d -bd 4 -relief groove] \
+        -row 0 -column 3 -columnspan 5 -sticky ens
+grid [label $expgui(FobsExtractFrame).d.fol -text "LeBail damping"] \
+        -row 0 -column 2
+tk_optionMenu $expgui(FobsExtractFrame).d.d entryvar(LBdamp) \
+        0 1 2 3 4 5 6 7 8 9
+grid $expgui(FobsExtractFrame).d.d -row 0 -column 3
+incr row
+grid rowconfigure $expgui(lsFrame).f1 $row -weight 1
+
+
+
 foreach num {1 2 3 4 5 6 7 8 9} {
     grid [label $expgui(FobsExtractFrame).l$num -text $num] -row 1 -column $num
@@ -3306 +3358 @@
 grid [label $expgui(FobsExtractFrame).t \
         -text "Extraction\nMethod" -anchor c] \
-        -column 0 -row 0 -rowspan 2 -sticky s
-grid [label $expgui(FobsExtractFrame).t0 -text "Phase #" -anchor sw] \
-        -column 1 -row 0 -columnspan 7 -sticky sw
+        -column 0 -row 0 -sticky n
+grid [label $expgui(FobsExtractFrame).t0 -text "(Phase #)" -anchor c] \
+        -column 10 -row 1 -sticky w
 grid [label $expgui(FobsExtractFrame).t1 -text "Rietveld" -anchor c] -column 0 -row 2
 grid [label $expgui(FobsExtractFrame).t2 -text "F(calc) Weighted" -anchor c] -column 0 -row 3
@@ -3314 +3366 @@
 grid [label $expgui(FobsExtractFrame).t2a -text "(Model biased)" -anchor c] -column 10 -row 3
 grid [label $expgui(FobsExtractFrame).t3a -text "(Le Bail method)" -anchor c] -column 10 -row 4
+
+proc InitLSvars {} {
+    global expgui
+    set expgui(convg) [set expgui(convinit) [expinfo convg]]
+    set expgui(convlbl) [format %5.2f [expr pow(10,$expgui(convg)/100.)]]
+    set expgui(marq) [set expgui(marqinit) [expinfo marq]]
+}
+proc SetConv {x} {
+    global expgui
+    if {$x != $expgui(convinit) && $expgui(changed) <= 0} {
+        incr expgui(changed)
+    }
+    if {$expgui(changed)} {expinfo convg set $x}
+    set expgui(convlbl) [format %5.2f [expr {pow(10,$x/100.)}]]
+}
+proc SetMarq {x} {
+    global expgui
+    if {$x != $expgui(marqinit) && $expgui(changed) <= 0} {
+        incr expgui(changed)
+    }
+    if {$expgui(changed)} {expinfo marq set $x}
+}
 # ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ END OF LS PANE CODE ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^
 #-------------------------------------------------------------------------