Changeset 668

Timestamp:

Dec 4, 2009 5:10:01 PM (14 years ago)

Author:

toby

Message:

# on 2003/04/10 21:59:03, toby did:
leave filenames up for rawplot
set tmin properly for TOF
show text for bank selected
add Qmax option
add "run powpref" warning

File:

• trunk/addcmds.tcl (modified) (21 diffs, 3 props)

trunk/addcmds.tcl

@@ -215 +215 @@
     }
     file delete exptool.in exptool.out
+    # set the powpref warning (2 = required)
+    set expgui(needpowpref) 2
+    set msg "A phase was added" 
+    if {[string first $msg $expgui(needpowpref_why)] == -1} {
+        append expgui(needpowpref_why) "\t$msg\n"
+    }
     # now select the new phase
     SelectOnePhase [lindex $expmap(phaselist) end]    
@@ -220 +226 @@
 
 #----------- Add Histogram routines --------------------------------------
+proc LabelInstParm {args} {
+    global newhist
+    switch $newhist(insttype) {
+        TOF {
+            set newhist(instfiletext) "Neutron Time of Flight"
+            catch {
+                set b $newhist(setnum)
+                append newhist(instfiletext) ", 2theta = $newhist(inst${b}Angle)"
+            }
+        }
+        ED {set newhist(instfiletext) "X-ray Energy Dispersive"}
+        "CW X" {set newhist(instfiletext) "CW X-ray"}
+        "CW N" {set newhist(instfiletext) "CW Neutron"}
+    }
+}
+trace variable newhist(setnum) w LabelInstParm
 proc MakeAddHistBox {} {
     global expmap newhist
@@ -255 +277 @@
     grid [label $np.lset -text "Select set" -anchor w] -column 1 -row 6 -sticky w
     grid [frame $np.set]  -column 2 -row 6 -columnspan 7 -sticky ew
-
-    grid [button $np.f6a -text "Run\nRAWPLOT" -command RunRawplot] \
-            -column 4 -row 8 -rowspan 2
-    grid [label $np.l3 -text "Usable data limit:"] -column 0 -row 8 -rowspan 2 
+    grid [label $np.t2a -textvariable newhist(instfiletext) \
+            -justify center -anchor center -fg blue] \
+            -column 0 -row 8 -columnspan 99 -sticky ew
+
+    grid [button $np.f6a -text "Run\nRAWPLOT" -command "RunRawplot $np"] \
+            -column 4 -row 18 -rowspan 2
+    grid [label $np.l3 -text "Usable data limit:"] -column 0 -row 18 -rowspan 3 
     grid [entry $np.e3 -width 12 -textvariable newhist(2tLimit) \
-            ] -column 1 -row 8 -rowspan 2 
+            ] -column 1 -row 18 -rowspan 3
     grid [radiobutton $np.cb3 -text "D-min" -variable newhist(LimitMode) \
-            -value 0] -column 2 -row 8 -sticky w
+            -value 0] -column 2 -row 18 -sticky w
     grid [radiobutton $np.cb4 -textvariable newhist(limitLbl)  \
             -variable newhist(LimitMode) -anchor w -justify l \
-            -value 1] -column 2 -row 9 -sticky w
+            -value 1] -column 2 -row 20 -sticky w
+    grid [radiobutton $np.cb5 -text "Q-max" -variable newhist(LimitMode) \
+            -value 2] -column 2 -row 19 -sticky w
     set newhist(limitLbl) "TOF-min\n2-Theta Max"
     # spacers
@@ -273 +300 @@
             -columnspan 20 -column 0 -row 4 -sticky nsew -ipady 2
     grid [frame $np.sp2 -bg white] \
-            -columnspan 20 -column 0 -row 7 -sticky nsew -ipady 2
+            -columnspan 20 -column 0 -row 17 -sticky nsew -ipady 2
     grid [frame $np.sp3 -bg white] \
             -columnspan 20 -column 0 -row 98 -sticky nsew -ipady 2
@@ -349 +376 @@
         set len [gets $in line]
         if {$len > 160} {
-            # this is a UNIX file. Hope there are no control characters
+            # this is an old-style UNIX file. Hope there are no control characters
             set i 0
             set j 79
@@ -490 +517 @@
     set num $newhist(banknum)
     if {$newhist(insttype) == "TOF"} {
-        set newhist(2tLimit) $newhist(tmin$num)
+        set newhist(2tLimit) [expr {$newhist(tmin$num) / 10.}]
         if {[llength $newhist(banklist)] == $newhist(instbanks)} {
             set newhist(setnum) $newhist(banknum)
@@ -557 +584 @@
                     [string trim [string range $line 12 end]]
         }
-        # scan for the INS   BANK line
+        # scan for the INS   HTYPE line
         if {[string first "INS   HTYPE" $line] == 0} {
             if {[string index [lindex $line 2] 2] == "T"} {
@@ -563 +590 @@
             } elseif {[string index [lindex $line 2] 2] == "E"} {
                 set newhist(insttype) ED
+            } elseif {[string index [lindex $line 2] 1] == "X"} {
+                set newhist(insttype) "CW X"
             } else {
-                set newhist(insttype) CW
+                set newhist(insttype) "CW N"
             }
         }
@@ -575 +604 @@
             set b [string trim $b]
             set newhist(inst${b}ITYP) [string trim $c]
+        }
+        if {[regexp {INS ([ 1-9][0-9])BNKPAR(.*)} $line a b c]} {
+            set b [string trim $b]
+            set newhist(inst${b}Angle) [string trim [lindex $c 1]]
         }
     }
@@ -604 +637 @@
     }
     if {$newhist(dummy)} {PostDummyOpts $np; ValidateDummyHist $np}
+    LabelInstParm
 }
 
@@ -634 +668 @@
     } elseif {[catch {expr $newhist(2tLimit)}]} {
         append err "  The 2Theta/d-space limit is not valid\n"
+    } elseif {$newhist(2tLimit) <= 0} {
+        append err "  The 2Theta/d-space limit is not valid\n"
     }
     if {[string trim $newhist(LimitMode)] == ""} {
-        append err "  Please choose between either a 2Theta or d-space limit\n"
+        append err "  Please choose between either a 2Theta, Q or d-space limit\n"
     }
 
@@ -659 +695 @@
     puts $fp $newhist(banknum)
     puts $fp $newhist(setnum)
-    if {$newhist(LimitMode)} {
+    if {$newhist(LimitMode) == 1} {
         puts $fp "T"
-    } else {
+        puts $fp "$newhist(2tLimit)"
+    } elseif {$newhist(LimitMode) == 2} {
         puts $fp "D"
-    }
-    puts $fp "$newhist(2tLimit)"
+        set Q 100
+        catch {set Q [expr {4*acos(0)/$newhist(2tLimit)}]}
+        puts $fp "$Q"
+    } else {
+        puts $fp "D"
+        puts $fp "$newhist(2tLimit)"
+    }
     puts $fp "/"
     puts $fp "X"
@@ -705 +747 @@
     }
     file delete exptool.in exptool.out
-}
-
-proc RunRawplot {} {
+    # set the powpref warning (2 = required)
+    set expgui(needpowpref) 2
+    set msg "A histogram was added" 
+    if {[string first $msg $expgui(needpowpref_why)] == -1} {
+        append expgui(needpowpref_why) "\t$msg\n"
+    }
+    # select the most recently added histogram
+    if {!$err} {
+        set i [llength $expmap(histlistboxcontents)]
+        if {$i > 0} {
+            incr i -1
+            set expgui(curhist) $i
+            sethistlist
+        }
+    }
+}
+
+proc RunRawplot {parent} {
     global newhist tcl_platform
+    set f1 $newhist(rawfile)
+    set f2 $newhist(instfile)
     # for Windows put a message on top, in case file names must be shortened
     if {$tcl_platform(platform) == "windows"} {
-        set f1 {}
         catch {set f1 [file nativename \
                     [file attributes $newhist(rawfile) -shortname]]}
-        set f2 {}
         catch {set f2 [file nativename \
                 [file attributes $newhist(instfile) -shortname]]}
-        if {$f1 != "" || $f2 != ""} {
-            set msg "Note: input to RAWPLOT\n"
-            if {$f1 != ""} {append msg "data file: $f1\n"}
-            if {$f2 != ""} {append msg "instrument file: $f2"}
-            MyMessageBox -icon info -message $msg -parent .
-        }
+    }
+    if {$f1 != "" || $f2 != ""} {
+        #set msg "Note: input to RAWPLOT\n"
+        #if {$f1 != ""} {append msg "data file: $f1\n"}
+        #if {$f2 != ""} {append msg "instrument file: $f2"}
+        catch {toplevel $parent.msg}
+        catch {eval destroy [winfo children $parent.msg]}
+        wm title $parent.msg "File names"
+        grid [label $parent.msg.1 \
+                -text "File names to be input to RAWPLOT" \
+                -justify center -anchor center] \
+                -col 0 -row 0 -columnspan 2
+        if {$f1 != ""} {
+            grid [label $parent.msg.2a \
+                    -text "Raw histogram: $f1" \
+                    -justify center -anchor e] \
+                    -col 0 -row 1
+            grid [button $parent.msg.2b \
+                    -command "clipboard clear; clipboard append $f1" \
+                    -text "put name\nin clipboard"] \
+                    -col 1 -row 1
+        }           
+        if {$f2 != ""} {
+            grid [label $parent.msg.3a \
+                    -text "Raw histogram: $f2" \
+                    -justify center -anchor e] \
+                    -col 0 -row 2
+            grid [button $parent.msg.3b \
+                    -command "clipboard clear; clipboard append $f2" \
+                    -text "put name\nin clipboard"] \
+                    -col 1 -row 2
+        }           
+        grid [button $parent.msg.4 \
+                -command "destroy $parent.msg" \
+                -text "Close"] \
+                -col 0 -columnspan 2 -row 9
     }
     # start RAWPLOT
     runGSASprog rawplot 1
+    if {[winfo exists $parent.msg]} {raise $parent.msg}
+    update
 }
 #--- Dummy histogram stuff
@@ -740 +829 @@
         $np.d1.m2 config -text {}
         $np.b1 config -state disabled
-        grid forget $np.l3 $np.e3 $np.cb3 $np.cb4  $np.bank $np.f6a
-        grid $np.dl1 -column 0 -row 8
-        grid $np.d1 -column 1 -row 8 -rowspan 2 -columnspan 4 -sticky e
-        grid $np.dl3 -column 0 -columnspan 99 -row 10 -sticky ew
+        grid forget $np.l3 $np.e3 $np.cb3 $np.cb4 $np.cb5 $np.bank $np.f6a
+        grid $np.dl1 -column 0 -row 18
+        grid $np.d1 -column 1 -row 18 -rowspan 2 -columnspan 4 -sticky e
+        grid $np.dl3 -column 0 -columnspan 99 -row 20 -sticky ew
         if {$newhist(insttype) == "TOF"} {
             $np.dl1 config -text "Data range:\n(TOF)"
             $np.d1.lu config -text millisec
-            grid $np.dl2 -column 0 -row 9
+            grid $np.dl2 -column 0 -row 19
             catch {
                 set s $newhist(setnum)
@@ -754 +843 @@
                 $np.d1.m2 config -text $tmax
             }
-        } elseif {$newhist(insttype) == "CW"} {
+        } elseif {[lindex $newhist(insttype) 0] == "CW"} {
             $np.dl1 config -text "Data range:\n(2Theta)"
             $np.d1.lu config -text degrees
@@ -765 +854 @@
             $np.d1.m1 config -text 1.
             $np.d1.m2 config -text 200.
-            grid $np.dl2 -column 0 -row 9
+            grid $np.dl2 -column 0 -row 19
         } else {
             $np.dl1 config -text "No file\nselected"
@@ -782 +871 @@
         $np.b1 config -state normal
         grid $np.bank -column 2 -row 3 -columnspan 7 -sticky ew
-        grid $np.f6a -column 4 -row 8 -rowspan 2
-        grid $np.l3 -column 0 -row 8 -rowspan 2 
-        grid $np.e3 -column 1 -row 8 -rowspan 2 
-        grid $np.cb3 -column 2 -row 8 -sticky w
-        grid $np.cb4 -column 2 -row 9 -sticky w
+        grid $np.f6a -column 4 -row 18 -rowspan 3
+        grid $np.l3 -column 0 -row 18 -rowspan 3
+        grid $np.e3 -column 1 -row 18 -rowspan 3 
+        grid $np.cb3 -column 2 -row 18 -sticky w
+        grid $np.cb4 -column 2 -row 20 -sticky w
+        grid $np.cb5 -column 2 -row 19 -sticky w
      }
 }
@@ -839 +929 @@
                     [lindex $newhist(inst${s}ICONS) 0]}]
         }
-    } elseif {$newhist(insttype) == "CW"} {
+    } elseif {[lindex $newhist(insttype) 0] == "CW"} {
         if {$newhist(tmin) <= 0 } {
             $np.d1.e1 config -fg red
@@ -968 +1058 @@
     }
     file delete exptool.in exptool.out
+    # set the powpref warning (2 = required)
+    set expgui(needpowpref) 2
+    set msg "A histogram was added" 
+    if {[string first $msg $expgui(needpowpref_why)] == -1} {
+        append expgui(needpowpref_why) "\t$msg\n"
+    }
 }
 
@@ -1943 +2039 @@
     }
     file delete exptool.in exptool.out
+    # set the powpref warning (2 = required)
+    set expgui(needpowpref) 2
+    set msg "A phase was replaced"
+    if {[string first $msg $expgui(needpowpref_why)] == -1} {
+        append expgui(needpowpref_why) "\t$msg\n"
+    }
     destroy $top
 }
@@ -1997 +2099 @@
 set newhist(insttype) {}
 set newhist(dummy) 0
+set newhist(instfiletext) {}