Changeset 4183


Ignore:
Timestamp:
Oct 20, 2019 6:12:55 PM (3 years ago)
Author:
vondreele
Message:

moe mg.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIImath.py

    r4182 r4183  
    13821382        Sinv =np.vstack((Sinv,Sinv))
    13831383        SGT = np.vstack((SGT,SGT+.5))%1.
    1384     detSM = nl.det(SGMT)
    13851384    mst = Sinv[:,3,:3]
    13861385    epsinv = Sinv[:,3,3]
     
    13941393    MmodA = np.sum(Am[nxs,nxs,:,:,:]*pcos[:,:,:,nxs,nxs],axis=3)    #cos term
    13951394    MmodB = np.sum(Bm[nxs,nxs,:,:,:]*psin[:,:,:,nxs,nxs],axis=3)    #sin term
    1396 #    if SGData['SGGray']:
    1397 #        MmodA = -np.sum(SGMT[nxs,:,nxs,:,:]*MmodA[:,:,:,nxs,:],axis=-1)*detSM[nxs,:,nxs,nxs]
    1398 #        MmodB = -np.sum(SGMT[nxs,:,nxs,:,:]*MmodB[:,:,:,nxs,:],axis=-1)*detSM[nxs,:,nxs,nxs]
    1399 #    else:
    14001395    MmodA = np.sum(SGMT[nxs,:,nxs,:,:]*MmodA[:,:,:,nxs,:],axis=-1)*SGData['MagMom'][nxs,:,nxs,nxs]
    14011396    MmodB = np.sum(SGMT[nxs,:,nxs,:,:]*MmodB[:,:,:,nxs,:],axis=-1)*SGData['MagMom'][nxs,:,nxs,nxs]
    1402     return MmodB,MmodA    #Ntau,Nops,Natm,,Mxyz; cos & sin parts; sum matches drawn atom moments
     1397    return MmodA,MmodB    #Ntau,Nops,Natm,,Mxyz; cos & sin parts; sum matches drawn atom moments
    14031398       
    14041399def Modulation(H,HP,nWaves,Fmod,Xmod,Umod,glTau,glWt):
  • trunk/GSASIIphsGUI.py

    r4175 r4183  
    97439743        elif text == 'Wave Data' and data['General']['Modulated']:
    97449744            G2gd.SetDataMenuBar(G2frame,G2frame.dataWindow.WavesData)
     9745            G2plt.PlotStructure(G2frame,data,firstCall=True)
    97459746            UpdateWavesData()
    9746             wx.CallAfter(G2plt.PlotStructure,G2frame,data,firstCall=True)
    97479747        elif text == 'Dysnomia':
    97489748            G2gd.SetDataMenuBar(G2frame,G2frame.dataWindow.MEMMenu)
Note: See TracChangeset for help on using the changeset viewer.