Changeset 1025
- Timestamp:
- Aug 12, 2013 11:22:30 AM (9 years ago)
- Location:
- trunk
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/GSASIIplot.py
r1017 r1025 391 391 ''' 392 392 global HKL 393 394 # def OnKeyBox(event):395 # if G2frame.G2plotNB.nb.GetSelection() == G2frame.G2plotNB.plotList.index('Powder Patterns'):396 # event.key = cb.GetValue()[0]397 # cb.SetValue(' key press')398 # wx.CallAfter(OnPlotKeyPress,event)399 #400 393 global exclLines 401 394 def OnPlotKeyPress(event): … … 622 615 else: 623 616 data[id][id2] = xpos 617 if id > 1 and data[id][0] > data[id][1]: 618 data[id].reverse() 624 619 G2frame.PatternTree.SetItemPyData(LimitId,data) 625 620 if G2frame.PatternTree.GetItemText(G2frame.PickId) == 'Limits': … … 758 753 ifpicked = False 759 754 LimitId = 0 760 xye = ma.array( Pattern[1])755 xye = ma.array(ma.getdata(Pattern[1])) 761 756 if PickId: 762 757 ifpicked = Pattern[2] == G2frame.PatternTree.GetItemText(PatternId) -
trunk/GSASIIstrIO.py
r1021 r1025 283 283 except ValueError: 284 284 PWDRdata['wtFactor'] = 1.0 #patch 285 PWDRdata['Data'] = ma.array( datum[1][1]) #masked powder data arrays285 PWDRdata['Data'] = ma.array(ma.getdata(datum[1][1])) #masked powder data arrays/clear previous masks 286 286 PWDRdata[data[2][0]] = data[2][1] #Limits & excluded regions (if any) 287 287 PWDRdata[data[3][0]] = data[3][1] #Background -
trunk/GSASIIstrMath.py
r1017 r1025 1316 1316 elif not iBeg-iFin: #peak above high limit - done 1317 1317 break 1318 yc[iBeg:iFin] += refl[13]*refl[9]*G2pwd.getFCJVoigt3(refl[5],refl[6],refl[7],shl,x[iBeg:iFin]) #>90% of time spent here 1318 1319 print refl[5],ma.count(x[iBeg:iFin]),iFin-iBeg,refl[13],refl[9] 1320 yc[iBeg:iFin] += refl[13]*refl[9]*G2pwd.getFCJVoigt3(refl[5],refl[6],refl[7],shl,ma.getdata(x[iBeg:iFin])) #>90% of time spent here 1319 1321 if Ka2: 1320 1322 pos2 = refl[5]+lamRatio*tand(refl[5]/2.0) # + 360/pi * Dlam/lam * tan(th) … … 1326 1328 elif not iBeg-iFin: #peak above high limit - done 1327 1329 return yc,yb 1328 yc[iBeg:iFin] += refl[13]*refl[9]*kRatio*G2pwd.getFCJVoigt3(pos2,refl[6],refl[7],shl, x[iBeg:iFin]) #and here1330 yc[iBeg:iFin] += refl[13]*refl[9]*kRatio*G2pwd.getFCJVoigt3(pos2,refl[6],refl[7],shl,ma.getdata(x[iBeg:iFin])) #and here 1329 1331 elif 'T' in calcControls[hfx+'histType']: 1330 1332 print 'TOF Undefined at present' … … 1434 1436 lenBF = iFin-iBeg 1435 1437 dMdpk = np.zeros(shape=(6,lenBF)) 1436 dMdipk = G2pwd.getdFCJVoigt3(refl[5],refl[6],refl[7],shl, x[iBeg:iFin])1438 dMdipk = G2pwd.getdFCJVoigt3(refl[5],refl[6],refl[7],shl,ma.getdata(x[iBeg:iFin])) 1437 1439 for i in range(5): 1438 1440 dMdpk[i] += 100.*cw[iBeg:iFin]*refl[13]*refl[9]*dMdipk[i] … … 1445 1447 lenBF2 = iFin2-iBeg2 1446 1448 dMdpk2 = np.zeros(shape=(6,lenBF2)) 1447 dMdipk2 = G2pwd.getdFCJVoigt3(pos2,refl[6],refl[7],shl, x[iBeg2:iFin2])1449 dMdipk2 = G2pwd.getdFCJVoigt3(pos2,refl[6],refl[7],shl,ma.getdata(x[iBeg2:iFin2])) 1448 1450 for i in range(5): 1449 1451 dMdpk2[i] = 100.*cw[iBeg2:iFin2]*refl[13]*refl[9]*kRatio*dMdipk2[i]
Note: See TracChangeset
for help on using the changeset viewer.