Changeset 391

Timestamp:

Dec 4, 2009 5:05:23 PM (14 years ago)

Author:

toby

Message:

# on 2001/05/11 18:32:34, toby did:
Add support for WIF David's Cumulative Chi2 function
Link to web page
put Cumulative Chi2 & background on top

File:

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

trunk/liveplot

@@ -38 +38 @@
 set xunits {}
 set yunits {}
+set graph(chi2) 0
 set graph(xunits) 0
 set graph(yunits) 0
@@ -157 +158 @@
 set expgui(gsasdir) [file dirname $expgui(scriptdir)]
 set expgui(gsasexe) [file join $expgui(gsasdir) exe]
+set expgui(docdir) [file join $expgui(scriptdir) doc]
 
 # called by a trace on expgui(lblfontsize)
@@ -198 +200 @@
         update
     }
+    $box element show [lsort -decreasing [$box element show]]
 }
    
@@ -315 +318 @@
     set CALC {}
     set BKG {}
+    set WGT {}
     global refhkllist refphaselist refpos
     set refpos {}
@@ -340 +344 @@
     refposvec set $refpos
     diffvec set [obsvec - calcvec]
+    if {$graph(chi2)} {
+        wifdvec set $WGT
+        wifdvec set [wifdvec * diffvec]
+        wifdvec set [wifdvec * diffvec]
+        # now do a running sum
+        set sum 0
+        set sumlist {}
+        foreach n [wifdvec range 0 end] {
+            set sum [expr $sum + $n]
+            lappend sumlist $sum
+        }
+        wifdvec set $sumlist
+        wifdvec set [wifdvec / [wifdvec length]]
+    }
     if $graph(backsub) {
         obsvec set [obsvec - bckvec]
@@ -457 +475 @@
     bckvec notify now
     diffvec notify now
+    wifdvec notify now
     $box config -title "$expnam cycle $cycle Hist $hst"
     $box xaxis config -title $xunits
@@ -462 +481 @@
     setlegend $box $graph(legend)
     # reconfigure the obs data
-    $box element configure obs \
+    $box element configure 3 \
             -symbol $peakinfo(obssym) \
             -pixels [expr 0.125 * $peakinfo(obssize)]i
@@ -492 +511 @@
                 }
             }
-            # $box element config phase$i -mapped  1
             catch {$box element create phase$i}
             catch {
@@ -717 +735 @@
     set fp [open [file join ~ .gsas_config] a]
     puts $fp "set graph(legend) $graph(legend)"
+    puts $fp "set graph(chi2) $graph(chi2)"
     puts $fp "set graph(printout) $graph(printout)"
     puts $fp "set graph(outname) $graph(outname)"
@@ -811 +830 @@
     donewaitmsg
 }
+proc ShowCumulativeChi2 {} {
+    global graph box
+    if $graph(chi2) {
+        eval $box y2axis config $graph(ElementShowOption)
+        eval $box element config 0 $graph(ElementShowOption) -label "Chi2"
+        set cycle [getcycle]
+        readdata .g
+    } else {
+        eval $box element config 0 $graph(ElementHideOption) 
+        eval $box y2axis config $graph(ElementHideOption) 
+        $box element config 0 -label ""
+    }
+}
+
+source [file join $expgui(scriptdir) gsascmds.tcl]
 
 # override options with locally defined values
@@ -829 +863 @@
 
 # vectors
-vector xvec
-xvec notify never
-vector obsvec 
-obsvec notify never
-vector calcvec
-calcvec notify never
-vector bckvec 
-bckvec notify never
-vector diffvec 
-diffvec notify never
-vector refposvec
-refposvec notify never
+foreach vec {xvec obsvec calcvec bckvec diffvec refposvec wifdvec} {
+    vector $vec
+    $vec notify never
+}
 # create the graph
 if [catch {
@@ -861 +887 @@
             error 0 "Limp ahead"
 }
-$box element create obs -color black -linewidth 0 \
+$box element create 0 -xdata xvec -ydata wifdvec -color magenta \
+        -line 3 -symbol none -label "Chi2" -mapy y2
+$box element create 3 -color black -linewidth 0 -label Obs \
         -symbol $peakinfo(obssym) \
         -pixels [expr 0.125 * $peakinfo(obssize)]i
-$box element create calc -color red  -symbol none  
-$box element create diff -color blue  -symbol none  
-$box element config obs -xdata xvec -ydata obsvec
-$box element config calc -xdata xvec -ydata calcvec
-$box element config diff -xdata xvec -ydata diffvec
+$box element create 2 -label Calc -color red  -symbol none  
+$box element create 4 -label diff -color blue  -symbol none  
+$box element config 3 -xdata xvec -ydata obsvec
+$box element config 2 -xdata xvec -ydata calcvec
+$box element config 4 -xdata xvec -ydata diffvec
 if {$expgui(tcldump) != ""} {
-    $box element create bckg -color green  -symbol none  
-    $box element config bckg -xdata xvec -ydata bckvec
+    $box element create 1 -label bckgr -color green  -symbol none  
+    $box element config 1 -xdata xvec -ydata bckvec
     bind . <Shift-Button-1> "lblhkl $box %x"
     bind . <Key-h> "lblhkl $box %x"
@@ -880 +908 @@
 $box yaxis config -title {} 
 setlegend $box $graph(legend)
+ShowCumulativeChi2
 
 updateifnew
@@ -956 +985 @@
 .a.options.menu add checkbutton -label "Raise on update" \
         -variable graph(autoraise)
+.a.options.menu add checkbutton -label "Cumulative Chi2" \
+        -variable graph(chi2) -command ShowCumulativeChi2
 .a.options.menu add command -label "Save Options" -underline 1 \
         -command "SaveOptions"
+$box y2axis config -min 0 -title {Cumulative Chi Squared}
+ShowCumulativeChi2
 
 pack [menubutton .a.help -text Help -underline 0 -menu .a.help.menu] -side right
 menu .a.help.menu -tearoff 0
+.a.help.menu add command -command "MakeWWWHelp liveplot.html" -label "Web page"
 .a.help.menu add command -command aboutliveplot -label About