Changeset 4981

Timestamp:

Jun 28, 2021 1:28:09 PM (21 months ago)

Author:

vondreele

Message:

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

Location:

trunk

Files:

• GSASIIplot.py (modified) (1 diff)
• GSASIIstrMath.py (modified) (2 diffs)

trunk/GSASIIplot.py

@@ -6844 +6844 @@
         imgAx = Img.axes
         ytics = imgAx.get_yticks()
-        ylabs = [Page.varyList[int(i)] for i in ytics[:-1]]
+        ylabs = [str(Page.varyList[int(i)]) for i in ytics[:-1]]
         imgAx.set_yticklabels(ylabs)
         Page.figure.colorbar(Img)

trunk/GSASIIstrMath.py

@@ -1532 +1532 @@
             mXYZ = np.hstack((mXYZ,mXYZ))
 
-        MmodA,MmodB = G2mth.MagMod(glTau,mXYZ,modQ,MSSdata,SGData,SSGData)  #Ntau,Nops,Natm,Mxyz cos,sim parts sum matches drawing
+        MmodA,MmodB = G2mth.MagMod(glTau,mXYZ,modQ,MSSdata,SGData,SSGData)  #Ntau,Nops,Natm,Mxyz cos,sin parts sum matches drawing
         
         if not SGData['SGGray']:    #for fixed Mx,My,Mz
@@ -1621 +1621 @@
 #  calc mag. structure factors; Nref,Ntau,Nops,Natm,Mxyz                            
             fams = TMcorr[:,nxs,nxs,:,nxs]*np.array([np.where(H[3,i]!=0,(MmodA*cosm[i,nxs,:,:,nxs]+    
-                H[3,i]*MmodB*sinm[i,nxs,:,:,nxs]),0.) for i in range(mRef)])          #Nref,Ntau,Nops,Natm,Mxyz
+                H[3,i]*MmodB*sinm[i,nxs,:,:,nxs]),0.) for i in range(mRef)])/2.          #Nref,Ntau,Nops,Natm,Mxyz
                         
             fbms = TMcorr[:,nxs,nxs,:,nxs]*np.array([np.where(H[3,i]!=0,(MmodA*sinm[i,nxs,:,:,nxs]+    
-                H[3,i]*MmodB*cosm[i,nxs,:,:,nxs]),0.) for i in range(mRef)])          #Nref,Ntau,Nops,Natm,Mxyz
+                H[3,i]*MmodB*cosm[i,nxs,:,:,nxs]),0.) for i in range(mRef)])/2.          #Nref,Ntau,Nops,Natm,Mxyz
 
             if not SGData['SGGray']: