Changeset 303 for trunk/GSASIIpwdGUI.py

Timestamp:

Jun 20, 2011 2:37:07 PM (12 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:

• trunk/GSASIIpwdGUI.py (modified) (3 diffs)

trunk/GSASIIpwdGUI.py

@@ -790 +790 @@
         ibrav = bravaisSymb.index(controls[5])
         dmin = G2indx.getDmin(peaks)-0.005
-        Lhkl,M20,X20 = G2indx.refinePeaks(peaks,ibrav,A)
+        Lhkl,M20,X20,A = G2indx.refinePeaks(peaks,ibrav,A)
         controls[6:12] = G2lat.A2cell(A)
         controls[12] = G2lat.calc_V(A)
@@ -825 +825 @@
             return
         self.dataFrame.CopyCell.Enable(False)
+        self.dataFrame.RefineCell.Enable(False)
         OK,dmin,cells = G2indx.DoIndexPeaks(peaks,inst,controls,bravais)
         if OK:
@@ -839 +840 @@
                 else:
                     G2plt.PlotPatterns(self)
-        self.dataFrame.CopyCell.Enable(True)
-        self.dataFrame.IndexPeaks.Enable(True)
-        self.dataFrame.MakeNewPhase.Enable(True)
-        UpdateUnitCellsGrid(self,data)
+            self.dataFrame.CopyCell.Enable(True)
+            self.dataFrame.IndexPeaks.Enable(True)
+            self.dataFrame.MakeNewPhase.Enable(True)
+            UpdateUnitCellsGrid(self,data)
                 
     def CopyUnitCell(event):