Changeset 4185 for trunk

Timestamp:

Oct 21, 2019 3:17:29 PM (6 years ago)

Author:

vondreele

Message:

mag math again

Location:

trunk

Files:

• GSASIImath.py (modified) (1 diff)
• GSASIIplot.py (modified) (1 diff)
• GSASIIstrMath.py (modified) (1 diff)

trunk/GSASIImath.py ¶

@@ -1391 +1391 @@
     psin = np.sin(twopi*phase)
     pcos = np.cos(twopi*phase)
-    MmodA = np.sum(Am[nxs,nxs,:,:,:]*pcos[:,:,:,nxs,nxs],axis=3)    #cos term
-    MmodB = np.sum(Bm[nxs,nxs,:,:,:]*psin[:,:,:,nxs,nxs],axis=3)    #sin term
+    MmodA = np.sum(Am[nxs,nxs,:,:,:]*pcos[:,:,:,nxs,nxs],axis=3)/2.    #cos term
+    MmodB = np.sum(Bm[nxs,nxs,:,:,:]*psin[:,:,:,nxs,nxs],axis=3)/2.    #sin term
     MmodA = np.sum(SGMT[nxs,:,nxs,:,:]*MmodA[:,:,:,nxs,:],axis=-1)*SGData['MagMom'][nxs,:,nxs,nxs]
     MmodB = np.sum(SGMT[nxs,:,nxs,:,:]*MmodB[:,:,:,nxs,:],axis=-1)*SGData['MagMom'][nxs,:,nxs,nxs]

trunk/GSASIIplot.py ¶

@@ -5041 +5041 @@
     def OnMotion(event):
         xpos = event.xdata
-        if Xmin<xpos<Xmax:                                        #avoid out of frame mouse position
+        if xpos and Xmin<xpos<Xmax:                                        #avoid out of frame mouse position
             ypos = event.ydata
-            if Ymin<ypos<Ymax:
+            if ypos and Ymin<ypos<Ymax:
                 Xwd = Xmax-Xmin
                 Ywd = Ymax-Ymin

trunk/GSASIIstrMath.py ¶

@@ -1642 +1642 @@
 #do integration
             
-            fas = np.sum(glWt*fass,axis=1)/2.
-            fbs = np.sum(glWt*fbss,axis=1)/2.
+            fas = np.sum(glWt*fass,axis=1)
+            fbs = np.sum(glWt*fbss,axis=1)
             
             if SGData['SGInv']: