Changeset 1178 for branches/sandbox/liveplot

Timestamp:

Oct 25, 2011 8:13:56 PM (11 years ago)

Author:

toby

Message:

add log(I) option to liveplot: request from Ling Yang

File:

• branches/sandbox/liveplot (modified) (4 diffs)

branches/sandbox/liveplot

@@ -572 +572 @@
     global expnam hst peakinfo xunits yunits cycle reflns modtime
     global lasthst graph expgui box
-    global obsvec calcvec diffvec 
+    global obsvec calcvec diffvec bckvec
 
     if {$graph(yunits) == 2} {
@@ -584 +584 @@
         wifdvec set {}
         $box element config 1 -label {} -line 0 -hide 1
+        $box element config 4 -label diff  -line 1 -hide 0
+    } elseif {$graph(yunits) == 3} {
+        bckvec expr 0*bckvec
+        set msg {}
+        if {[set calcvec(min)] <= 0} {
+            if {$msg != ""} {append msg ", "}
+            append msg "calculated" 
+        }
+        if {[set obsvec(min)] <= 0} {
+            if {$msg != ""} {append msg " & "}
+            append msg "observed" 
+        }
+        if {$msg != ""} {
+            MyMessageBox -parent . -title "Invalid Range" \
+                -message "Log computation impossible due to zero or negative $msg intensity values" \
+                -icon warning -type Continue -default continue
+        } else {
+            set yunits {log(Intensity)}
+            obsvec expr log10(obsvec)
+            calcvec expr log10(calcvec)
+            if {[set bckvec(min)] <= 0} {
+                bckvec set {}
+                $box element config 1 -label {} -line 0 -hide 1
+            } else {
+                bckvec expr log10(bckvec)
+                $box element config 1 -label bckgr -line 1 -hide 0
+            }
+            diffvec set {}
+            $box element config 4 -label {} -line 0 -hide 1
+        }
     } else {
         $box element config 1 -label bckgr -line 1 -hide 0
+        $box element config 4 -label diff  -line 1 -hide 0
     }
 
@@ -691 +722 @@
         }
     }
-    # offset the difference pattern
-    set maxdiff  [set diffvec(max)]
-    if {$expgui(autotick)} {
-        diffvec set [diffvec + [expr {$cmin - $maxdiff}]]
-    } else {
-        diffvec set [diffvec + [expr {$cmin - 1.1*$maxdiff}]]
-    }
-    diffvec notify now
-
+    catch {
+        # offset the difference pattern
+        set maxdiff  [set diffvec(max)]
+        if {$expgui(autotick)} {
+            diffvec set [diffvec + [expr {$cmin - $maxdiff}]]
+        } else {
+            diffvec set [diffvec + [expr {$cmin - 1.1*$maxdiff}]]
+        }
+        diffvec notify now
+    }
     # force an update of the plot as BLT may not
     $box config -title [$box cget -title]
@@ -2523 +2555 @@
             -variable graph(yunits) -value 2 \
             -command {set cycle [getcycle];readdata .g}
+    .a.options.menu.yunits add radiobutton -label "log(I)" \
+            -variable graph(yunits) -value 3 \
+            -command {set cycle [getcycle];readdata .g}
     .a.options.menu add command -label "HKL labeling" -command setlblopts
     .a.options.menu add checkbutton -label "Subtract background" \