Changeset 1683

Timestamp:

Feb 28, 2015 6:24:48 PM (8 years ago)

Author:

vondreele

Message:

further fixes to FindMolecule? - remove SymOp? stuff; not needed & caused memory errors

File:

• trunk/GSASIImath.py (modified) (4 diffs)

trunk/GSASIImath.py

@@ -209 +209 @@
     def getNeighbors(atom,radius):
         neighList = []  
-        Dx = IARS[1]-np.array(atom[cx:cx+3])
+        Dx = UAtoms-np.array(atom[cx:cx+3])
         dist = ma.masked_less(np.sqrt(np.sum(np.inner(Amat,Dx)**2,axis=0)),0.5) #gets rid of disorder "bonds" < 0.5A
-        sumR = IARS[2]+radius
+        sumR = Radii+radius
         return set(ma.nonzero(ma.masked_greater(dist-factor*sumR,0.))[0])                #get indices of bonded atoms
 
@@ -233 +233 @@
     Indx = range(nAtom)
     UAtoms = []
-    SymOp = []
     Radii = []
     for atom in atomData:
         UAtoms.append(np.array(atom[cx:cx+3]))
         Radii.append(radii[atomTypes.index(atom[ct])])
-        SymOp += [[1,0,unit],]
     UAtoms = np.array(UAtoms)
     Radii = np.array(Radii)
@@ -244 +242 @@
         UAtoms = np.concatenate((UAtoms,(np.inner(Op[0],UAtoms[:nAtom]).T+Op[1])))
         Radii = np.concatenate((Radii,Radii[:nAtom]))
-        SymOp += [[nOp,0,unit] for symop in SymOp]
         Indx += Indx[:nAtom]
     for icen,cen in enumerate(SGData['SGCen'][1:]):
         UAtoms = np.concatenate((UAtoms,(UAtoms+cen)))
         Radii = np.concatenate((Radii,Radii))
-        SymOp += [[symop[0],icen+1,unit] for symop in SymOp]
         Indx += Indx[:nAtom]
     if SGData['SGInv']:
         UAtoms = np.concatenate((UAtoms,-UAtoms))
         Radii = np.concatenate((Radii,Radii))
-        SymOp += [[-symop[0],symop[1],unit] for symop in SymOp]
         Indx += Indx
     UAtoms %= 1.
@@ -262 +257 @@
             UAtoms = np.concatenate((UAtoms,UAtoms[:mAtoms]+unit))
             Radii = np.concatenate((Radii,Radii[:mAtoms]))
-            SymOp += [[symop[0],symop[1],unit] for symop in SymOp[:mAtoms]]                        
             Indx += Indx[:mAtoms]
     UAtoms = np.array(UAtoms)
     Radii = np.array(Radii)
-    IARS = [Indx,UAtoms,Radii,SymOp]
     newAtoms = [atomData[ind],]
     atomData[ind] = None