Changeset 78 for trunk

Timestamp:

Dec 4, 2009 5:00:02 PM (14 years ago)

Author:

toby

Message:

# on 1999/04/06 22:27:03, toby did:
add background subtraction
adjust pixelregion for hkl labeling
move tickmarks before histogram in File menu

File:

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

trunk/liveplot

@@ -1 +1 @@
 #!/usr/local/bin/wish
-# $RCSfile: liveplot,v $
+# $Id$
 set Revision {$Revision$ $Date$}
 
@@ -23 +23 @@
 }
 
+set graph(backsub) 0
 
 if {$tcl_platform(platform) == "windows"} {
@@ -45 +46 @@
 set expgui(fadetime) 10
 set expgui(hklbox) 1
+set expgui(pixelregion) 5
 set peakinfo(obssym) scross
 set peakinfo(obssize) 1.0
@@ -321 +323 @@
     refposvec set $refpos
     diffvec set [obsvec - calcvec]
+    if $graph(backsub) {
+        obsvec set [obsvec - bckvec]
+        calcvec set [calcvec - bckvec]
+    }
     global obsvec calcvec diffvec 
     set maxdiff  [set diffvec(max)]
@@ -337 +343 @@
     global refhkllist refphaselist peakinfo refpos
     # look for peaks within pixelregion pixels
-    set pixelregion 5
-    set xmin [$plot xaxis invtransform [expr $x - $pixelregion]]
-    set xmax [$plot xaxis invtransform [expr $x + $pixelregion]]
+    set xmin [$plot xaxis invtransform [expr $x - $expgui(pixelregion)]]
+    set xmax [$plot xaxis invtransform [expr $x + $expgui(pixelregion)]]
     set peaknums [refposvec search $xmin $xmax]
     set peaklist {}
@@ -623 +628 @@
     pack [frame $box.d] -side top  -anchor w
     pack [label $box.d.l -text "HKL label size:"] -side left
-    pack [entry $box.d.e -textvariable expgui(lblfontsize) -width 8] \
+    pack [entry $box.d.e -textvariable expgui(lblfontsize) -width 4] \
             -side left
     pack [label $box.d.l1 -text pixels] -side left
@@ -632 +637 @@
         $box.d.l1 config -fg #888
     }
+    pack [frame $box.f] -side top  -anchor w
+    pack [label $box.f.l -text "HKL search region:"] -side left
+    pack [entry $box.f.e -textvariable expgui(pixelregion) -width 3] \
+            -side left
+    pack [label $box.f.l1 -text pixels] -side left
     pack [frame $box.e] -side top  -anchor w
     pack [checkbutton $box.e.b -text "Separate window for HKL labels"\
@@ -661 +671 @@
             -from .1 -to 3 -resolution 0.05] -side top
     pack [frame $box.a] -side bottom
-    pack [button $box.a.1 -text "Apply" \
-            -command {set peakinfo(obssym) $expgui(obssym); \
-            set peakinfo(obssize) $expgui(obssize)} ] -side left
+    pack [button $box.a.1 -text "Apply" -command { \
+            if {$peakinfo(obssym) != $expgui(obssym)} {set peakinfo(obssym) $expgui(obssym)}; \
+            if {$peakinfo(obssize) != $expgui(obssize)} {set peakinfo(obssize) $expgui(obssize)} \
+        } ] -side left
     pack [button $box.a.2 -text "Close" -command "destroy $box"] -side left
 }
@@ -680 +691 @@
     puts $fp "set peakinfo(obssym) $peakinfo(obssym)"
     puts $fp "set peakinfo(obssize) $peakinfo(obssize)"
+    puts $fp "set expgui(pixelregion) $expgui(pixelregion)"
 
     close $fp
@@ -791 +803 @@
 pack [menubutton .a.file -text File -underline 0 -menu .a.file.menu] -side left
 menu .a.file.menu
+.a.file.menu add cascade -label Tickmarks -menu .a.file.menu.tick
+menu .a.file.menu.tick
+foreach num {1 2 3 4 5 6 7 8 9} {
+    .a.file.menu.tick add checkbutton -label "Phase $num" \
+            -variable  peakinfo(flag$num) \
+            -command {plotdata $box}
+}
 .a.file.menu add cascade -label "Histogram" -menu .a.file.menu.hist
 menu .a.file.menu.hist
@@ -802 +821 @@
                 -command {set cycle [getcycle];readdata .g}
     }
-}
-.a.file.menu add cascade -label Tickmarks -menu .a.file.menu.tick
-menu .a.file.menu.tick
-foreach num {1 2 3 4 5 6 7 8 9} {
-    .a.file.menu.tick add checkbutton -label "Phase $num" \
-            -variable  peakinfo(flag$num) \
-            -command {plotdata $box}
 }
 .a.file.menu add command -label "Update Plot" \
@@ -846 +858 @@
             -command {set cycle [getcycle];readdata .g}
     .a.options.menu add command -label "HKL labeling" -command setlblopts
+    .a.options.menu add checkbutton -label "Subtract background" \
+            -variable graph(backsub) \
+            -command {set cycle [getcycle];readdata .g}
 }