Changeset 738 for trunk/GSASIImath.py

Timestamp:

Aug 26, 2012 12:54:17 PM (11 years ago)

Author:

vondreele

Message:

put wx.BusyCursor? in various places

File:

• trunk/GSASIImath.py (modified) (1 diff)

trunk/GSASIImath.py

@@ -938 +938 @@
         rho[rMM[0]:rMP[0],rMM[1]:rMP[1],rMM[2]:rMP[2]] = peakFunc(x1,rX,rY,rZ,rhoPeak,res,SGData['SGLaue'])
         rho = np.roll(np.roll(np.roll(rho,-rMI[2],axis=2),-rMI[1],axis=1),-rMI[0],axis=0)
-    if SGData['SGInv']:                 #check origin location & fix it if needed - centrosymmetric only
-        Ocheck = np.zeros_like(rho)
-        for ipeak in peaks:
-            for opeak in peaks:           
-                dx = ((opeak-ipeak)*incre)%incre
-                if np.any(dx):      #avoid self vector
-                    Ocheck[dx[0],dx[1],dx[2]] += 1
-        dxMax = np.unravel_index(np.argmax(Ocheck),rho.shape)
-        print 'Inversion at:',dxMax,' shift by ;',dxMax-mapHalf,' map size:',rho.shape
-        rho = np.roll(np.roll(np.roll(rho,dxMax[2],axis=2),dxMax[1],axis=1),dxMax[0],axis=0)
-        for peak in peaks:
-            peak = (peak-(dxMax+mapHalf)/incre)%1.0
+#    if SGData['SGInv']:                 #check origin location & fix it if needed - centrosymmetric only
+#        Ocheck = np.zeros_like(rho)
+#        for ipeak in peaks:
+#            for opeak in peaks:           
+#                dx = ((opeak-ipeak)*incre)%incre
+#                if np.any(dx):      #avoid self vector
+#                    Ocheck[dx[0],dx[1],dx[2]] += 1
+#        dxMax = np.unravel_index(np.argmax(Ocheck),rho.shape)
+#        print 'Inversion at:',dxMax,' shift by ;',dxMax-mapHalf,' map size:',rho.shape
+#        rho = np.roll(np.roll(np.roll(rho,dxMax[2],axis=2),dxMax[1],axis=1),dxMax[0],axis=0)
+#        for peak in peaks:
+#            peak = (peak-(dxMax+mapHalf)/incre)%1.0
         
     return np.array(peaks),np.array([mags,]).T,np.array([dzeros,]).T