Changeset 780 for trunk/liveplot

Timestamp:

Dec 4, 2009 5:11:54 PM (11 years ago)

Author:

toby

Message:

# on 2004/04/27 14:07:39, toby did:
plot (obs-calc)/sigma
Add ability to scan zoom region with arrow keys

File:

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

trunk/liveplot

@@ -52 +52 @@
 set yunits {}
 set graph(chi2) 0
+set graph(OmCoS) 0
 set graph(xunits) 0
 set graph(yunits) 0
@@ -57 +58 @@
 set graph(color_diff) blue
 set graph(color_chi2) magenta
+set graph(color_OmCoS) magenta
 set graph(color_bkg) green
 set graph(color_obs) black
@@ -426 +428 @@
         wifdvec set [wifdvec / [wifdvec length]]
     }
+    if {$graph(OmCoS)} {
+        wifdvec set $WGT
+        wifdvec expr sqrt(wifdvec)
+        wifdvec set [wifdvec * diffvec]
+    }
     if $graph(backsub) {
         obsvec set [obsvec - bckvec]
@@ -570 +577 @@
             -symbol $peakinfo(obssym) -color $graph(color_obs) \
             -pixels [expr 0.125 * $peakinfo(obssize)]i
-    $box element config 0 -color $graph(color_chi2) 
+    if $graph(chi2) {
+        $box element config 0 -dash 0 -line 3 -color $graph(color_chi2) 
+    } else {
+        $box element config 0 -dash 4 -line 2 -color $graph(color_OmCoS)
+    }
     $box element config 1 -color $graph(color_bkg)
     $box element config 2 -color $graph(color_calc)
@@ -700 +711 @@
     if {$color == ""} return
     set peakinfo(color$num) $color
+}
+
+proc setSymcolor {var lbl} {
+    global graph
+    set color [tk_chooseColor -initialcolor $graph(color_$var) \
+            -title "Choose $lbl color"]
+    if {$color == ""} return
+    set graph(color_$var) $color
 }
 
@@ -957 +976 @@
     }
     puts $fp "# LIVEPLOT saved options from [clock format [clock seconds]]"
-    foreach v {printout legend outname outcmd autoraise chi2 xunits yunits} {
+    foreach v {printout legend outname outcmd autoraise chi2 xunits yunits OmCoS} {
         puts $fp "set graph($v) [list $graph($v)]"
     }
-    foreach v {diff chi2 bkg calc obs input fit} {
+    foreach v {diff chi2 bkg calc obs input fit OmCoS} {
         puts $fp "set graph(color_$v) [list $graph(color_$v)]"
     }
@@ -1057 +1076 @@
     global graph box
     if $graph(chi2) {
+        catch {$box y2axis config -min 0}
+        $box y2axis config -title {Cumulative Chi Squared}
         eval $box y2axis config $graph(ElementShowOption)
         eval $box element config 0 $graph(ElementShowOption) -label "Chi2"
+        #$box elem conf 0 -dash 0 -line 3
+        set cycle [getcycle]
+        readdata .g
+    } elseif $graph(OmCoS) {
+        catch {$box y2axis config -min ""}
+        $box y2axis config -title {(obs-calc)/sigma}
+        eval $box y2axis config $graph(ElementShowOption)
+        eval $box element config 0 $graph(ElementShowOption) -label "(O-C)/s"
+        #$box elem conf 0 -dash 4 -line 2
         set cycle [getcycle]
         readdata .g
@@ -1067 +1097 @@
     }
 }
+
 # evaluate the Chebyshev polynomial with coefficients A at point x
 # coordinates are rescaled from $xmin=-1 to $xmax=1
@@ -1883 +1914 @@
             "x=[format %.3f [$graph(blt) xaxis invtransform $x]] y=[format %.3f [$graph(blt) yaxis invtransform $y]]"
 }
+
 #-------------------------------------------------------------------------
 # override options with locally defined values
@@ -2073 +2105 @@
 .a.options.menu add cascade -label "Symbol color" -menu .a.options.menu.color
 menu .a.options.menu.color
-set l1 {obs calc diff bkg chi2}
-set l2 {Observed Calculated Obs-Calc Background Cumulative-Chi2}
+set l1 {obs calc diff bkg chi2 OmCoS}
+set l2 {Observed Calculated Obs-Calc Background Cumulative-Chi2 (obs-calc)/sig}
 if {$program != "liveplot"} {
     lappend l1 input fit
@@ -2082 +2114 @@
 foreach var $l1 lbl $l2 {
     .a.options.menu.color add command -label $lbl \
-        -command "set graph(color_$var) \[tk_chooseColor -initialcolor \$graph(color_$var) -title \"Choose \$lbl color\"]; plotdata"
+        -command "setSymcolor $var $lbl; plotdata"
 }
 if {$expgui(tcldump) != "" && $program == "liveplot"} {
@@ -2131 +2163 @@
             -variable graph(autoraise)
     .a.options.menu add checkbutton -label "Cumulative Chi2" \
-            -variable graph(chi2) -command ShowCumulativeChi2
+            -variable graph(chi2) \
+            -command "set graph(OmCoS) 0; ShowCumulativeChi2"
+    .a.options.menu add checkbutton -label "(Obs-Calc)/sig" \
+            -variable graph(OmCoS) \
+            -command "set graph(chi2) 0; ShowCumulativeChi2"
     .a.options.menu add command -label "Save Options" -underline 1 \
             -command "SaveOptions"
@@ -2357 +2393 @@
 bind . <Key-l> {ToggleLiveCursor}
 bind . <Key-L> {ToggleLiveCursor}
+# move the zoom region around
+proc ScanZoom {box key frac} {
+    foreach var  {xl xh yl yh} axis {xaxis  xaxis  yaxis  yaxis} \
+            flg  {-min -max -min -max} {
+        set $var [$box $axis cget $flg]
+        if {$var == ""} return
+    }
+    catch {
+        switch -- $key {
+            Right {set a x; set l $xl; set h $xh; set d [expr {$frac*($h-$l)}]}
+            Left {set a x; set l $xl; set h $xh; set d [expr {-$frac*($h-$l)}]}
+            Up   {set a y; set l $yl; set h $yh; set d [expr {$frac*($h-$l)}]}
+            Down {set a y; set l $yl; set h $yh; set d [expr {-$frac*($h-$l)}]}
+        }
+        $box ${a}axis configure -min [expr {$l + $d}] -max [expr {$h + $d}]
+    }
+}
+bind . <Key-Up> "ScanZoom $box %K .1"
+bind . <Key-Left> "ScanZoom $box %K .1"
+bind . <Key-Right> "ScanZoom $box %K .1"
+bind . <Key-Down> "ScanZoom $box %K .1"
+bind . <Control-Key-Up> "ScanZoom $box %K 1.0"
+bind . <Control-Key-Left> "ScanZoom $box %K 1.0"
+bind . <Control-Key-Right> "ScanZoom $box %K 1.0"
+bind . <Control-Key-Down> "ScanZoom $box %K 1.0"
 # seems to be needed in OSX
 update