Changeset 4981


Ignore:
Timestamp:
Jun 28, 2021 1:28:09 PM (3 months ago)
Author:
vondreele
Message:

modify mag str fctr math.
fix bug in PlotCovariance? - labels needed to be str

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIplot.py

    r4974 r4981  
    68446844        imgAx = Img.axes
    68456845        ytics = imgAx.get_yticks()
    6846         ylabs = [Page.varyList[int(i)] for i in ytics[:-1]]
     6846        ylabs = [str(Page.varyList[int(i)]) for i in ytics[:-1]]
    68476847        imgAx.set_yticklabels(ylabs)
    68486848        Page.figure.colorbar(Img)
  • trunk/GSASIIstrMath.py

    r4972 r4981  
    15321532            mXYZ = np.hstack((mXYZ,mXYZ))
    15331533
    1534         MmodA,MmodB = G2mth.MagMod(glTau,mXYZ,modQ,MSSdata,SGData,SSGData)  #Ntau,Nops,Natm,Mxyz cos,sim parts sum matches drawing
     1534        MmodA,MmodB = G2mth.MagMod(glTau,mXYZ,modQ,MSSdata,SGData,SSGData)  #Ntau,Nops,Natm,Mxyz cos,sin parts sum matches drawing
    15351535       
    15361536        if not SGData['SGGray']:    #for fixed Mx,My,Mz
     
    16211621#  calc mag. structure factors; Nref,Ntau,Nops,Natm,Mxyz                           
    16221622            fams = TMcorr[:,nxs,nxs,:,nxs]*np.array([np.where(H[3,i]!=0,(MmodA*cosm[i,nxs,:,:,nxs]+   
    1623                 H[3,i]*MmodB*sinm[i,nxs,:,:,nxs]),0.) for i in range(mRef)])          #Nref,Ntau,Nops,Natm,Mxyz
     1623                H[3,i]*MmodB*sinm[i,nxs,:,:,nxs]),0.) for i in range(mRef)])/2.          #Nref,Ntau,Nops,Natm,Mxyz
    16241624                       
    16251625            fbms = TMcorr[:,nxs,nxs,:,nxs]*np.array([np.where(H[3,i]!=0,(MmodA*sinm[i,nxs,:,:,nxs]+   
    1626                 H[3,i]*MmodB*cosm[i,nxs,:,:,nxs]),0.) for i in range(mRef)])          #Nref,Ntau,Nops,Natm,Mxyz
     1626                H[3,i]*MmodB*cosm[i,nxs,:,:,nxs]),0.) for i in range(mRef)])/2.          #Nref,Ntau,Nops,Natm,Mxyz
    16271627
    16281628            if not SGData['SGGray']:           
Note: See TracChangeset for help on using the changeset viewer.