Changeset 4416 for trunk/GSASIIpwdGUI.py
 Timestamp:
 May 9, 2020 2:14:54 PM (3 years ago)
 File:

 1 edited
Legend:
 Unmodified
 Added
 Removed

trunk/GSASIIpwdGUI.py
r4410 r4416 4727 4727 if phaseId: #is phase deleted? 4728 4728 General = G2frame.GPXtree.GetItemPyData(phaseId)['General'] 4729 G,g = G2lat.cell2Gmat(General['Cell'][1:7]) 4730 GA,GB = G2lat.Gmat2AB(G) #Orthogonalization matricies 4731 SGData = General['SGData'] 4729 4732 if General.get('Modulated',False): 4730 4733 Super = 1 4734 Histograms = G2frame.GPXtree.GetItemPyData(phaseId)['Histograms'] 4735 histName = G2frame.GPXtree.GetItemText(G2frame.PatternId) 4736 histData = Histograms[histName] 4737 muStrData = histData['Mustrain'] 4738 sizeData = histData['Size'] 4731 4739 rowLabels = [] 4732 4740 if HKLF: … … 4744 4752 refList = np.array([refl[:11+Super] for refl in data[phaseName]]) 4745 4753 I100 = refList.T[8+Super]*np.array([refl[11+Super] for refl in data[phaseName]]) 4754 MuStr = G2pwd.getMustrain(refList.T[:3],G,SGData,muStrData) 4755 CrSize = G2pwd.getCrSize(refList.T[:3],G,GB,sizeData) 4746 4756 Imax = np.max(I100) 4747 4757 if Imax: 4748 4758 I100 *= 100.0/Imax 4749 4759 if 'C' in Inst['Type'][0]: 4750 refs = np.vstack((refList.T[:15+Super],I100 )).T4760 refs = np.vstack((refList.T[:15+Super],I100,MuStr,CrSize)).T 4751 4761 elif 'T' in Inst['Type'][0]: 4752 refs = np.vstack((refList.T[:18+Super],I100 )).T4762 refs = np.vstack((refList.T[:18+Super],I100,MuStr,CrSize)).T 4753 4763 rowLabels = [str(i) for i in range(len(refs))] 4754 4764 Types = (4+Super)*[wg.GRID_VALUE_LONG,]+4*[wg.GRID_VALUE_FLOAT+':10,4',]+ \ … … 4764 4774 else: 4765 4775 if 'C' in Inst['Type'][0]: 4766 colLabels = ['H','K','L','mul','d','pos','sig','gam','Fosq','Fcsq','phase','Icorr','Prfo','Trans','ExtP','I100' ]4767 Types += 4*[wg.GRID_VALUE_FLOAT+':10,3',]4776 colLabels = ['H','K','L','mul','d','pos','sig','gam','Fosq','Fcsq','phase','Icorr','Prfo','Trans','ExtP','I100','mustrain','Size'] 4777 Types += 6*[wg.GRID_VALUE_FLOAT+':10,3',] 4768 4778 elif 'T' in Inst['Type'][0]: 4769 colLabels = ['H','K','L','mul','d','pos','sig','gam','Fosq','Fcsq','phase','Icorr','alp','bet','wave','Prfo','Abs','Ext','I100' ]4770 Types += 7*[wg.GRID_VALUE_FLOAT+':10,3',]4779 colLabels = ['H','K','L','mul','d','pos','sig','gam','Fosq','Fcsq','phase','Icorr','alp','bet','wave','Prfo','Abs','Ext','I100','mustrain','Size'] 4780 Types += 9*[wg.GRID_VALUE_FLOAT+':10,3',] 4771 4781 if Super: 4772 4782 colLabels.insert(3,'M')
Note: See TracChangeset
for help on using the changeset viewer.