Changeset 4183

Timestamp:

Oct 20, 2019 6:12:55 PM (4 years ago)

Author:

vondreele

Message:

moe mg.

Location:

trunk

Files:

• GSASIImath.py (modified) (2 diffs)
• GSASIIphsGUI.py (modified) (1 diff)

trunk/GSASIImath.py

@@ -1382 +1382 @@
         Sinv =np.vstack((Sinv,Sinv))
         SGT = np.vstack((SGT,SGT+.5))%1.
-    detSM = nl.det(SGMT)
     mst = Sinv[:,3,:3]
     epsinv = Sinv[:,3,3]
@@ -1394 +1393 @@
     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
-#    if SGData['SGGray']:
-#        MmodA = -np.sum(SGMT[nxs,:,nxs,:,:]*MmodA[:,:,:,nxs,:],axis=-1)*detSM[nxs,:,nxs,nxs]
-#        MmodB = -np.sum(SGMT[nxs,:,nxs,:,:]*MmodB[:,:,:,nxs,:],axis=-1)*detSM[nxs,:,nxs,nxs]
-#    else:
     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]
-    return MmodB,MmodA    #Ntau,Nops,Natm,,Mxyz; cos & sin parts; sum matches drawn atom moments
+    return MmodA,MmodB    #Ntau,Nops,Natm,,Mxyz; cos & sin parts; sum matches drawn atom moments
         
 def Modulation(H,HP,nWaves,Fmod,Xmod,Umod,glTau,glWt):

trunk/GSASIIphsGUI.py

@@ -9743 +9743 @@
         elif text == 'Wave Data' and data['General']['Modulated']:
             G2gd.SetDataMenuBar(G2frame,G2frame.dataWindow.WavesData)
+            G2plt.PlotStructure(G2frame,data,firstCall=True)
             UpdateWavesData()
-            wx.CallAfter(G2plt.PlotStructure,G2frame,data,firstCall=True)
         elif text == 'Dysnomia':
             G2gd.SetDataMenuBar(G2frame,G2frame.dataWindow.MEMMenu)