Changeset 1790 for trunk/GSASIIphsGUI.py
- Timestamp:
- Apr 15, 2015 4:20:11 PM (7 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/GSASIIphsGUI.py
r1785 r1790 3516 3516 ################################################################################ 3517 3517 3518 def UpdateTexture(): 3518 def UpdateTexture(): 3519 3519 3520 def SetSHCoef(): 3520 3521 cofNames = G2lat.GenSHCoeff(SGData['SGLaue'],SamSym[textureData['Model']],textureData['Order']) … … 5927 5928 histNames = [] 5928 5929 refData = {} 5929 SamAngs = {}5930 Gangls = {} 5930 5931 for name in Histograms.keys(): 5931 5932 if 'PWDR' in name: … … 5934 5935 histNames.append(name) 5935 5936 Id = G2gd.GetPatternTreeItemId(G2frame,G2frame.root,name) 5937 Inst = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,Id,'Instrument Parameters')) 5936 5938 Sample = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,Id,'Sample Parameters')) 5937 SamAngs[name] = copy.copy([Sample[item] for item in['Omega','Chi','Phi','Azimuth']])5939 Gangls[name] = copy.copy([Sample[item] for item in['Phi','Chi','Omega','Azimuth']]) 5938 5940 RefDict = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,Id,'Reflection Lists'))[phaseName] 5939 5941 Refs = RefDict['RefList'].T #np.array! 5940 if 'T' in RefDict['Type']: it = 3 #TOF offset for alp, bet, wave5941 5942 if RefDict['Super']: im = 1 #(3+1) offset for m 5942 refData[name] = np.column_stack((Refs[0],Refs[1],Refs[2],Refs[8+im],Refs[12+im+it])) 5943 Error = G2mth.FitTexture(General,SamAngs,refData) 5943 if 'T' in RefDict['Type']: 5944 it = 3 #TOF offset for alp, bet, wave 5945 tth = np.ones_like(Refs[0])*Inst[0]['2-theta'][0] 5946 refData[name] = np.column_stack((Refs[0],Refs[1],Refs[2],tth,Refs[8+im],Refs[12+im+it],np.zeros_like(Refs[0]))) 5947 else: # xray - typical caked 2D image data 5948 refData[name] = np.column_stack((Refs[0],Refs[1],Refs[2],Refs[5+im],Refs[8+im],Refs[12+im+it],np.zeros_like(Refs[0]))) 5949 Error = G2mth.FitTexture(General,Gangls,refData) 5944 5950 if Error: 5945 5951 wx.MessageBox(Error,caption='Fit Texture Error',style=wx.ICON_EXCLAMATION) 5946 G2ddG.UpdateDData(G2frame,DData,data) 5952 UpdateTexture() 5953 G2plt.PlotTexture(G2frame,data,Start=False) 5947 5954 5948 5955 def OnTextureClear(event):
Note: See TracChangeset
for help on using the changeset viewer.