Changeset 1462 for trunk/GSASII.py
 Timestamp:
 Aug 15, 2014 12:45:04 PM (8 years ago)
 File:

 1 edited
Legend:
 Unmodified
 Added
 Removed

trunk/GSASII.py
r1461 r1462 980 980 elif 'T' in DataType: 981 981 names = ['Type','fltPath','2theta','difC','difA', 'difB','Zero','alpha','beta0','beta1', 982 'betaq','sig0','sig1','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 'betaq','sig0','sig1','sig2','sigq', 'X','Y','Azimuth',] 983 codes = [0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,] 984 984 azm = 0. 985 985 if 'INS 1DETAZM' in Iparm: … … 998 998 s = Iparm['INS 1PRCF 1'].split() 999 999 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, beta0, beta1 1001 1001 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]) #betaq, sig0, sig1, sig2, sigq, X, Y 1003 1003 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, beta0, beta1 1005 1005 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]) #betaq, sig0, sig1, sig2, sigq, X, Y 1007 1007 else: 1008 1008 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]) #betaq, sig0, sig1, sig2, sigq, X, Y 1010 1010 else: 1011 1011 s = Iparm['INS 1PRCF1 '].split() … … 1013 1013 s = Iparm['INS 1PRCF11'].split() 1014 1014 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, beta0, beta1 1016 1016 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]) #betaq, sig0, sig1, sig2, sigq, X, Y 1018 1018 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, beta0, beta1 1020 1020 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]) #betaq, sig0, sig1, sig2, sigq, X, Y 1022 1022 else: 1023 1023 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]) #betaq, sig0, sig1, sig2, sigq, X, Y 1025 1025 Inst1 = G2IO.makeInstDict(names,data,codes) 1026 1026 Inst2 = {} … … 1917 1917 self.logPlot = False 1918 1918 self.qPlot = False 1919 self.dPlot = False 1919 1920 self.sqPlot = False 1920 1921 self.SqrtPlot = False
Note: See TracChangeset
for help on using the changeset viewer.