Changeset 394 for trunk/addcmds.tcl

Timestamp:

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

Author:

toby

Message:

# on 2001/05/23 20:06:32, toby did:
Use TOF-min for default when reading TOF banks
for TOF banks default inst parameter set to match the TOF bank
add definition for gsas environment variable (lc) before running exptool

File:

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

trunk/addcmds.tcl

@@ -247 +247 @@
     grid [radiobutton $np.cb3 -text "D-min" -variable newhist(LimitMode) \
             -value 0] -column 2 -row 5 -sticky w
-    grid [radiobutton $np.cb4 -text "TOF/2-Theta Max" -variable newhist(LimitMode)\
+    grid [radiobutton $np.cb4 -text "TOF-min\n2-Theta Max" \
+            -variable newhist(LimitMode) -anchor w -justify l \
             -value 1] -column 2 -row 6 -sticky w
     
@@ -400 +401 @@
             lappend newhist(banklist) $num
             # compute last point
+            set tmin 0
             set tmax 0
             catch {
                 scan $line "BANK%d%d%d%s%f%f" num nchan nrec rest start step
+                set tmin [expr $start/100.]
                 set tmax [expr ($start + $step*($nchan-1))/100.]
             }
+            set newhist(tmin$num) $tmin
             set newhist(tmax$num) $tmax
         }
@@ -451 +455 @@
     global newhist
     set num $newhist(banknum)
-    set newhist(2tLimit) $newhist(tmax$num)
+    if {$newhist(insttype) == "TOF"} {
+        set newhist(2tLimit) $newhist(tmin$num)
+        if {[llength $newhist(banklist)] == $newhist(instbanks)} {
+            set newhist(setnum) $newhist(banknum)
+        }
+    } else {
+        set newhist(2tLimit) $newhist(tmax$num)
+    }
     set newhist(LimitMode) 1
+
 }
 
@@ -509 +521 @@
             set newhist(instbanks) \
                     [string trim [string range $line 12 end]]
+        }
+        # scan for the INS   BANK line
+        if {[string first "INS   HTYPE" $line] == 0} {
+            if {[string index [lindex $line 2] 2] == "T"} {
+                set newhist(insttype) TOF
+            } elseif {[string index [lindex $line 2] 2] == "E"} {
+                set newhist(insttype) ED
+            } else {
+                set newhist(insttype) CW
+            }
         }
     }
@@ -880 +902 @@
     # needed in UNIX
     set env(ATOMDATA) [file join $expgui(gsasdir) data atmdata.dat]
+    set env(gsas) [file nativename $expgui(gsasdir)]
     # needed in Windows
     set env(GSAS) [file nativename $expgui(gsasdir)]
@@ -1575 +1598 @@
     # needed in UNIX
     set env(ATOMDATA) [file join $expgui(gsasdir) data atmdata.dat]
+    set env(gsas) [file nativename $expgui(gsasdir)]
     # needed in Windows
     set env(GSAS) [file nativename $expgui(gsasdir)]
@@ -1662 +1686 @@
     }
 }
+# default
+set newhist(insttype) CW