Changeset 841


Ignore:
Timestamp:
Dec 4, 2009 5:12:57 PM (11 years ago)
Author:
toby
Message:

# on 2005/03/24 21:54:28, toby did:
add defs for function #5 (thanks RBVD)
fix # & labels for terms in Profile #4 (4/m -3R -3 -3m1)
fix bug in Set on change profile for multiple histograms/phases

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/gsascmds.tcl

    • Property rcs:date changed from 2004/09/28 22:34:07 to 2005/03/24 21:54:28
    • Property rcs:lines changed from +34 -9 to +16 -6
    • Property rcs:rev changed from 1.59 to 1.60
    r810 r841  
    518518    prof-T-4 {alp bet-0 bet-1 sig-1 sig-2 gam-2 g2ec gsf \
    519519            rstr rsta rsca eta}
     520    prof-T-5 {alp bet-0 bet-1 sig-0 sig-1 sig-2 gam-0 gam-1 \
     521            gam-2 gsf g1ec g2ec rstr rsta rsca D1 D2 D3 D4 D5 D6 }
    520522    prof-C-1 {GU GV GW asym F1 F2 }
    521523    prof-C-2 {GU GV GW LX LY trns asym shft GP stec ptec sfec \
     
    524526            L11 L22 L33 L12 L13 L23 }
    525527    prof-C-4 {GU GV GW GP LX ptec trns shft sfec S/L H/L eta}
     528    prof-C-5 {GU GV GW GP LX LY S/L H/L trns shft stec ptec sfec \
     529            D1 D2 D3 D4 D5 D6 }
    526530    prof-E-1 {A B C ds cds}
     531    prof-E-2 {A B C ds cds LX LY ptec stec}
    527532}
    528533
     
    555560
    556561proc Profile4Terms {laueaxis} {
     562# GSAS Laue classes by number vs spacegrp labeling
     563#   1    2    3    4     5      6     7       8     9      10     11     12   13  14
     564# 1bar, 2/m, mmm, 4/m, 4/mmm, 3bar, 3bar m, 3bar, 3barm1, 3bar1m, 6/m, 6/mmm, m 3, m3m
     565#                              R      R      H      H       H
     566# (R=Rhombohedral setting; H=Hexagonal setting)
    557567    switch -exact $laueaxis {
    558568        1bar {return \
     
    563573        2/mc {return "S400 S040 S004 S220 S202 S022 S130 S310 S112"}
    564574        mmm  {return "S400 S040 S004 S220 S202 S022"}
    565         4/m  {return "S400 S004 S220 S202"}
     575        4/m  {return "S400 S004 S220 S202 S310"}
    566576        4/mmm {return "S400 S004 S220 S202"}
    567         3barR     {return "S400 S220 S310 S211"}
     577        3barR     {return "S400 S220 S310 S301 S211"}
    568578        "3bar mR" {return "S400 S220 S310 S211"}
    569         3bar    {return "S400 S004 S202 S211"}
    570         3barm1 {return "S400 S004 S202"}
     579        3bar    {return "S400 S004 S202 S310 S211"}
     580        3barm1 {return "S400 S004 S202 S301"}
    571581        3bar1m  {return "S400 S004 S202 S211"}
    572582        6/m    {return "S400 S004 S202"}
     
    681691    pack [frame $w.d -bg beige] -side top -expand yes -fill both
    682692    pack [button $w.d.2 -text Set  \
    683             -command "SaveChangeProfileType $w.c $histlist $phaselist; destroy $w"\
     693              -command "SaveChangeProfileType $w.c [list $histlist] [list $phaselist]; destroy $w"\
    684694            ] -side left
    685695    pack [button $w.d.3 -text Quit \
Note: See TracChangeset for help on using the changeset viewer.