Changeset 2090

Timestamp:

Dec 11, 2015 3:06:27 PM (6 years ago)

Author:

vondreele

Message:

eliminate duplicate index cells - much shorter list

Location:

trunk

Files:

• GSASIIindex.py (modified) (2 diffs)
• GSASIIpwdGUI.py (modified) (1 diff)

trunk/GSASIIindex.py

@@ -870 +870 @@
     print "%s %.4f %s %d %s %d" % ('Zero =',zero,'Nc/No max =',ncno,' Max Nc =',ncno*Nobs)
     cells = []
+    lastcell = np.zeros(7)
     for ibrav in range(14):
         begin = time.time()
@@ -917 +918 @@
                                     V = G2lat.calc_V(A)
                                     if M20 >= 2.0:
-                                        print "%10.3f %3d %3d %10.5f %10.5f %10.5f %10.3f %10.3f %10.3f %10.2f %10.2f" % (M20,X20,Nc,a,b,c,alp,bet,gam,V,V1)
-                                        cells.append([M20,X20,ibrav,a,b,c,alp,bet,gam,V,False,False])
+                                        cell = [M20,X20,ibrav,a,b,c,alp,bet,gam,V,False,False]
+                                        newcell = np.array(cell[3:10])
+                                        if not np.allclose(newcell,lastcell):
+                                            print "%10.3f %3d %3d %10.5f %10.5f %10.5f %10.3f %10.3f %10.3f %10.2f %10.2f"  \
+                                                %(M20,X20,Nc,a,b,c,alp,bet,gam,V,V1)
+                                            cells.append(cell)
+                                        lastcell = np.array(cell[3:10])
                             if not GoOn:
                                 break

trunk/GSASIIpwdGUI.py

@@ -2794 +2794 @@
                     UnitCellsTable.SetValue(i,c,False)
                 UnitCellsTable.SetValue(r,c,True)
-                gridDisplay.Refresh()
+                gridDisplay.ForceRefresh()
                 cells[r][-2] = True
                 ibrav = cells[r][2]