Changeset 992 for trunk/addcmds.tcl


Ignore:
Timestamp:
Jul 29, 2010 10:07:52 AM (10 years ago)
Author:
toby
Message:

changes for POWGEN: profile #<0; use data limits from prm file for TOF

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/addcmds.tcl

    r991 r992  
    695695        if {[llength $newhist(banklist)] == $newhist(instbanks)} {
    696696            set newhist(setnum) $newhist(banknum)
     697            # at Ashfia's request, override the bank header # with the
     698            # value from the instrument parameter file.
     699            catch {
     700                set s $newhist(setnum)
     701                foreach {x tmin tmax x} $newhist(inst${s}ITYP) {}
     702                if {$tmin > 0} {set newhist(2tLimit) $tmin}
     703            }
    697704        }
    698705    } else {
     
    13111318    frame [set cfr $top.canvas.fr]
    13121319    $top.canvas create window 0 0 -anchor nw -window $cfr
    1313     grid [label $top.top -text "Select banks to add" -bg beige] \
    1314             -column 0 -columnspan 3 -row 0 -sticky ew
     1320    grid [label $top.top \
     1321              -text "Select banks to add; set the\nuseful range of data, limiting\nthe # of reflections." -anchor w -justify left \
     1322              -bg beige] -column 0 -columnspan 3 -row 0 -sticky ew
    13151323    grid [frame $top.vartyp -bd 2 -relief groove] \
    13161324            -column 0 -columnspan 3 -row 1 -sticky ew
    13171325    grid [label $top.vartyp.top -text "Data limit units:"] -column 0 -row 0 -columnspan 3 -sticky w
    1318     grid [radiobutton $top.vartyp.cb3 -text "d-min" -variable newhist(LimitMode) \
     1326    grid [radiobutton $top.vartyp.cb3 -text "d-min\n(A)" -variable newhist(LimitMode) \
    13191327            -value 0] -column 0 -row 1 -sticky w
    13201328    grid [radiobutton $top.vartyp.cb4 -textvariable newhist(datalimlbl)  \
    13211329            -variable newhist(LimitMode) -anchor w -justify l \
    13221330            -value 1] -column 1 -row 1 -sticky w
    1323     grid [radiobutton $top.vartyp.cb5 -text "Q-max" -variable newhist(LimitMode) \
     1331    grid [radiobutton $top.vartyp.cb5 -text "Q-max\n(A-1)" -variable newhist(LimitMode) \
    13241332            -value 2] -column 2 -row 1 -sticky w
    13251333    set newhist(LimitMode) 1
     
    13351343        default {set newhist(datalimlbl) "2theta\nmax"}
    13361344    }
    1337     grid [label $cfr.t2 -textvariable newhist(datalimlbl)] -column 1 -row 0
     1345    grid [label $cfr.t2 -text "Upper\ndata limit"] -column 1 -row 0
    13381346    foreach i $newhist(banklist) {
    13391347        grid [checkbutton $cfr.c$i -text $i \
     
    13461354        if {$newhist(insttype) == "TOF"} {
    13471355            set newhist(tlimit$i) $newhist(tmin$i)
     1356            catch {
     1357                foreach {x tmin tmax x} $newhist(inst${i}ITYP) {}
     1358                if {$tmin > 0} {set newhist(tlimit$i) $tmin}
     1359            }
    13481360        } else {
    13491361            set newhist(tlimit$i) $newhist(tmax$i)
Note: See TracChangeset for help on using the changeset viewer.