Changeset 270 for trunk/GSASIIpwdGUI.py


Ignore:
Timestamp:
Apr 21, 2011 3:25:59 PM (11 years ago)
Author:
vondreele
Message:
 
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIpwdGUI.py

    r265 r270  
    1414import cPickle
    1515import GSASIIpath
    16 import GSASIIpeak as G2pk
     16import GSASIIpwd as G2pwd
    1717import GSASIIlattice as G2lat
    1818import GSASIIspc as G2spc
     
    7676        inst = self.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(self,PatternId, 'Instrument Parameters'))
    7777        data = self.PatternTree.GetItemPyData(PatternId)[1]
    78         OK,smin,Rwp,runtime,GoOn = G2pk.DoPeakFit(peaks,background,limits,inst,data)
     78        OK,smin,Rwp,runtime,GoOn = G2pwd.DoPeakFit(peaks,background,limits,inst,data)
    7979        UpdatePeakGrid(self,peaks)
    8080        G2plt.PlotPatterns(self)
     
    112112        while GoOn:
    113113            osmin = smin
    114             OK,smin,Rwp,runtime,GoOn = G2pk.DoPeakFit(peaks,background,limits,inst,data)
     114            OK,smin,Rwp,runtime,GoOn = G2pwd.DoPeakFit(peaks,background,limits,inst,data)
    115115            UpdatePeakGrid(self,peaks)
    116116            if not OK:
     
    13621362        inst = self.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(self,powId,'Instrument Parameters'))
    13631363        inst = dict(zip(inst[3],inst[1]))
    1364         auxPlot = G2pk.CalcPDF(data,inst,xydata)
     1364        auxPlot = G2pwd.CalcPDF(data,inst,xydata)
    13651365        PDFId = G2gd.GetPatternTreeItemId(self,self.root,'PDF '+powName[4:])
    13661366        self.PatternTree.SetItemPyData(G2gd.GetPatternTreeItemId(self,PDFId,'I(Q)'+powName[4:]),xydata['IofQ'])
     
    14291429    ElList = data['ElList']
    14301430    Abs = G2lat.CellAbsorption(ElList,data['Form Vol'])
    1431     Trans = G2pk.Transmission(data['Geometry'],Abs*data['Pack'],data['Diam'])
     1431    Trans = G2pwd.Transmission(data['Geometry'],Abs*data['Pack'],data['Diam'])
    14321432    elemSizer = wx.FlexGridSizer(3,3,5,1)
    14331433    for El in ElList:
Note: See TracChangeset for help on using the changeset viewer.