Changeset 4489


Ignore:
Timestamp:
Jun 16, 2020 10:23:33 AM (16 months ago)
Author:
vondreele
Message:

further fixup of incommensurate mag moment drawings. Now correct.

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIImath.py

    r4488 r4489  
    18021802                drawatom[dcx:dcx+3] = X
    18031803            if generalData['Type'] == 'magnetic':
    1804                 M = G2spc.ApplyStringOpsMom(opr,SGData,atmom+mom)
     1804                M = G2spc.ApplyStringOpsMom(opr,SGData,SSGData,atmom+mom)
    18051805                drawatom[dcx+3:dcx+6] = M
    18061806    return drawAtoms,Fade
  • trunk/GSASIIphsGUI.py

    r4487 r4489  
    38093809                opr = oldatom[8]
    38103810                mom = np.array(atom[7:10])
    3811                 Mom = G2spc.ApplyStringOpsMom(opr,SGData,mom)
     3811                if generalData['Super']:
     3812                    SSGData = generalData['SSGData']
     3813                    Mom = G2spc.ApplyStringOpsMom(opr,SGData,SSGData,mom)
     3814                else:
     3815                    Mom = G2spc.ApplyStringOpsMom(opr,SGData,None,mom)
    38123816                if atom[12] == 'A':                   
    38133817                    X,U = G2spc.ApplyStringOps(opr,SGData,atom[3:6],atom[14:20])
  • trunk/GSASIIspc.py

    r4488 r4489  
    35673567        return newX
    35683568       
    3569 def ApplyStringOpsMom(A,SGData,Mom):
     3569def ApplyStringOpsMom(A,SGData,SSGData,Mom):
    35703570    '''Applies string operations to modulated magnetic moment components used in drawing
    35713571    '''
     
    35843584    M,T = SGOps[nA]
    35853585    newMom = np.inner(Mom,M).T*SGData['MagMom'][NA+nC]
     3586    if SSGData is not None:
     3587        if SSGData['SSGCen'][iAx//100][3]:     #flip spin for BNS centered atoms
     3588            newMom *= -1.
    35863589    return newMom
    35873590       
Note: See TracChangeset for help on using the changeset viewer.