Changeset 3433

Timestamp:

Jun 13, 2018 12:58:28 PM (5 years ago)

Author:

vondreele

Message:

objectScanIgnore additions
put in phase fro mag reflections
better checkMagextc

Location:

trunk

Files:

• GSASIIIO.py (modified) (2 diffs)
• GSASIIspc.py (modified) (2 diffs)
• GSASIIstrMath.py (modified) (1 diff)

trunk/GSASIIIO.py

@@ -31 +31 @@
 import math
 import numpy as np
+import numpy.ma as ma
+
 import copy
 import platform
@@ -564 +566 @@
     return
 
-objectScanIgnore = [int,bool,float,str,np.float64,np.int64,np.ndarray,G2obj.G2VarObj]
+objectScanIgnore = [int,bool,float,str,np.float64,np.int32,np.int64,np.ndarray,G2obj.G2VarObj,ma.MaskedArray]
 if '2' in platform.python_version_tuple()[0]:
     objectScanIgnore += [unicode,long,]

trunk/GSASIIspc.py

@@ -29 +29 @@
 npcosd = lambda x: np.cos(x*np.pi/180.)
 nxs = np.newaxis
+twopi = 2.0*np.pi
 DEBUG = False
     
@@ -1979 +1980 @@
 def checkMagextc(HKL,SGData):
     Ops = SGData['SGOps']
-    Spn = SGData['SpnFlp'][:len(Ops)]
     OpM = np.array([op[0] for op in Ops])
     OpT = np.array([op[1] for op in Ops])
+    if SGData['SGInv']:
+        OpM = np.vstack((OpM,-OpM))
+        OpT = np.vstack((OpT,-OpT))%1.
+    Spn = SGData['SpnFlp'][:len(OpM)]
     Mag = np.array([nl.det(opm) for opm in OpM])*Spn
-    HKLS = np.array([HKL,-HKL])     #Freidel's Law
-    DHKL = np.reshape(np.inner(HKLS,OpM)*Mag[nxs,:,nxs],(-1,3))
-    PHKL = np.reshape(np.inner(HKLS,OpT),(-1,))
-    for dhkl,phkl in zip(DHKL,PHKL)[1:]:    #skip identity
+    DHKL = np.reshape(np.inner(HKL,OpM),(-1,3))
+    PHKL = np.reshape(np.cos(twopi*np.inner(HKL,OpT))*Mag,(-1,))[:,nxs,nxs]*OpM
+    Ftest = np.random.rand(3)
+    Psum = np.zeros(3)
+    for dhkl,phkl in zip(DHKL,PHKL):
         if not np.allclose(dhkl,HKL):
             continue
         else:
-            print(dhkl,HKL,phkl)
-            if phkl%1.:
-                return False
-    return True
+            Psum += np.inner(Ftest,phkl)
+    if np.allclose(Psum,np.zeros(3)):
+        return False
+    else:
+        if np.inner(HKL,Psum):
+            return False
+        return True
     
 def checkSSextc(HKL,SSGData):

trunk/GSASIIstrMath.py

@@ -1040 +1040 @@
         refl.T[9] = np.sum(fams**2,axis=0)+np.sum(fbms**2,axis=0)
         refl.T[7] = np.copy(refl.T[9])                
-        refl.T[10] = 0.0    #atan2d(fbs[0],fas[0]) - what is phase for mag refl?
+        refl.T[10] = atan2d(fbms[0],fams[0]) #- what is phase for mag refl?
 #        if 'P' in calcControls[hfx+'histType']:     #PXC, PNC & PNT: F^2 = A[0]^2 + A[1]^2 + B[0]^2 + B[1]^2
 #            refl.T[9] = np.sum(fas**2,axis=0)+np.sum(fbs**2,axis=0) #add fam**2 & fbm**2 here