Changeset 303 for trunk/GSASIIpwdGUI.py


Ignore:
Timestamp:
Jun 20, 2011 2:37:07 PM (11 years ago)
Author:
vondreele
Message:

Allow reading of xye (Topas style) files
Begin implementation of spherical harmonics texture
Refactor indexing; replace cell refinement from peak positions

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIpwdGUI.py

    r300 r303  
    790790        ibrav = bravaisSymb.index(controls[5])
    791791        dmin = G2indx.getDmin(peaks)-0.005
    792         Lhkl,M20,X20 = G2indx.refinePeaks(peaks,ibrav,A)
     792        Lhkl,M20,X20,A = G2indx.refinePeaks(peaks,ibrav,A)
    793793        controls[6:12] = G2lat.A2cell(A)
    794794        controls[12] = G2lat.calc_V(A)
     
    825825            return
    826826        self.dataFrame.CopyCell.Enable(False)
     827        self.dataFrame.RefineCell.Enable(False)
    827828        OK,dmin,cells = G2indx.DoIndexPeaks(peaks,inst,controls,bravais)
    828829        if OK:
     
    839840                else:
    840841                    G2plt.PlotPatterns(self)
    841         self.dataFrame.CopyCell.Enable(True)
    842         self.dataFrame.IndexPeaks.Enable(True)
    843         self.dataFrame.MakeNewPhase.Enable(True)
    844         UpdateUnitCellsGrid(self,data)
     842            self.dataFrame.CopyCell.Enable(True)
     843            self.dataFrame.IndexPeaks.Enable(True)
     844            self.dataFrame.MakeNewPhase.Enable(True)
     845            UpdateUnitCellsGrid(self,data)
    845846               
    846847    def CopyUnitCell(event):
Note: See TracChangeset for help on using the changeset viewer.