Changeset 1462 for trunk/GSASII.py


Ignore:
Timestamp:
Aug 15, 2014 12:45:04 PM (8 years ago)
Author:
vondreele
Message:

add sig-2 to TOF profile coeff.
new d-spacing plot option

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASII.py

    r1461 r1462  
    980980            elif 'T' in DataType:
    981981                names = ['Type','fltPath','2-theta','difC','difA', 'difB','Zero','alpha','beta-0','beta-1',
    982                     'beta-q','sig-0','sig-1','sig-q','X', 'Y','Azimuth',]
    983                 codes = [0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,]
     982                    'beta-q','sig-0','sig-1','sig-2','sig-q', 'X','Y','Azimuth',]
     983                codes = [0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,]
    984984                azm = 0.
    985985                if 'INS  1DETAZM' in Iparm:
     
    998998                    s = Iparm['INS  1PRCF 1'].split()
    999999                    if abs(pfType) == 1:
    1000                         data.extend([G2IO.sfloat(s[1]),G2IO.sfloat(s[2]),G2IO.sfloat(s[3])])
     1000                        data.extend([G2IO.sfloat(s[1]),G2IO.sfloat(s[2]),G2IO.sfloat(s[3])]) #alpha, beta-0, beta-1
    10011001                        s = Iparm['INS  1PRCF 2'].split()
    1002                         data.extend([0.0,0.0,G2IO.sfloat(s[1]),0.0,0.0,0.0,azm])
     1002                        data.extend([0.0,0.0,G2IO.sfloat(s[1]),G2IO.sfloat(s[2]),0.0,0.0,0.0,azm])    #beta-q, sig-0, sig-1, sig-2, sig-q, X, Y
    10031003                    elif abs(pfType) in [3,4,5]:
    1004                         data.extend([G2IO.sfloat(s[0]),G2IO.sfloat(s[1]),G2IO.sfloat(s[2])])
     1004                        data.extend([G2IO.sfloat(s[0]),G2IO.sfloat(s[1]),G2IO.sfloat(s[2])]) #alpha, beta-0, beta-1
    10051005                        if abs(pfType) == 4:
    1006                             data.extend([0.0,0.0,G2IO.sfloat(s[3]),0.0,0.0,0.0,azm])
     1006                            data.extend([0.0,0.0,G2IO.sfloat(s[3]),0.0,0.0,0.0,0.0,azm])    #beta-q, sig-0, sig-1, sig-2, sig-q, X, Y
    10071007                        else:
    10081008                            s = Iparm['INS  1PRCF 2'].split()
    1009                             data.extend([0.0,0.0,G2IO.sfloat(s[0]),0.0,0.0,0.0,azm])                       
     1009                            data.extend([0.0,0.0,G2IO.sfloat(s[0]),G2IO.sfloat(s[1]),0.0,0.0,0.0,azm])    #beta-q, sig-0, sig-1, sig-2, sig-q, X, Y                       
    10101010                else:
    10111011                    s = Iparm['INS  1PRCF1 '].split()
     
    10131013                    s = Iparm['INS  1PRCF11'].split()
    10141014                    if abs(pfType) == 1:
    1015                         data.extend([G2IO.sfloat(s[1]),G2IO.sfloat(s[2]),G2IO.sfloat(s[3])])
     1015                        data.extend([G2IO.sfloat(s[1]),G2IO.sfloat(s[2]),G2IO.sfloat(s[3])]) #alpha, beta-0, beta-1
    10161016                        s = Iparm['INS  1PRCF12'].split()
    1017                         data.extend([0.0,0.0,G2IO.sfloat(s[1]),0.0,0.0,0.0,azm])
     1017                        data.extend([0.0,0.0,G2IO.sfloat(s[1]),G2IO.sfloat(s[2]),0.0,0.0,0.0,azm])    #beta-q, sig-0, sig-1, sig-2, sig-q, X, Y
    10181018                    elif abs(pfType) in [3,4,5]:
    1019                         data.extend([G2IO.sfloat(s[0]),G2IO.sfloat(s[1]),G2IO.sfloat(s[2])])
     1019                        data.extend([G2IO.sfloat(s[0]),G2IO.sfloat(s[1]),G2IO.sfloat(s[2])]) #alpha, beta-0, beta-1
    10201020                        if abs(pfType) == 4:
    1021                             data.extend([0.0,0.0,G2IO.sfloat(s[3]),0.0,0.0,0.0,azm])
     1021                            data.extend([0.0,0.0,G2IO.sfloat(s[3]),0.0,0.0,0.0,0.0,azm])    #beta-q, sig-0, sig-1, sig-2, sig-q, X, Y
    10221022                        else:
    10231023                            s = Iparm['INS  1PRCF12'].split()
    1024                             data.extend([0.0,0.0,G2IO.sfloat(s[0]),0.0,0.0,0.0,azm])                       
     1024                            data.extend([0.0,0.0,G2IO.sfloat(s[0]),G2IO.sfloat(s[1]),0.0,0.0,0.0,azm])    #beta-q, sig-0, sig-1, sig-2, sig-q, X, Y                       
    10251025                Inst1 = G2IO.makeInstDict(names,data,codes)
    10261026                Inst2 = {}
     
    19171917        self.logPlot = False
    19181918        self.qPlot = False
     1919        self.dPlot = False
    19191920        self.sqPlot = False
    19201921        self.SqrtPlot = False
Note: See TracChangeset for help on using the changeset viewer.