Changeset 4651

Timestamp:

Nov 7, 2020 5:14:28 PM (3 years ago)

Author:

vondreele

Message:

problem with "generalized" mustrain for R3 now fixed.The S301 term should not have been present.

Location:

trunk

Files:

• GSASIIddataGUI.py (modified) (2 diffs)
• GSASIIspc.py (modified) (3 diffs)

trunk/GSASIIddataGUI.py

@@ -193 +193 @@
             cell = generalData['Cell'][1:7]
             vals = G2spc.Muiso2Shkl(muiso,SGData,cell)
-            nTerm = len(UseList[item]['Mustrain'][4])
-            for i in range(nTerm):
-                UseList[item]['Mustrain'][4][i] = vals[i]
+            UseList[item]['Mustrain'][4] = vals
         G2plt.PlotSizeStrainPO(G2frame,data,item)
         wx.CallLater(100,RepaintHistogramInfo,DData.GetScrollPos(wx.VERTICAL))
@@ -370 +368 @@
             UseList[G2frame.hist]['Mustrain'][5].append(False)
             onumb += 1
-        muMean = G2spc.MuShklMean(SGData,Amat,UseList[G2frame.hist]['Mustrain'][4])
+        muMean = G2spc.MuShklMean(SGData,Amat,UseList[G2frame.hist]['Mustrain'][4][:numb])
         parms = zip(Snames,UseList[G2frame.hist]['Mustrain'][5],range(numb))
         dataSizer = wx.FlexGridSizer(0,6,5,5)

trunk/GSASIIspc.py

@@ -3046 +3046 @@
     if laue in ['m3','m3m']:
         return ['S400','S220']
-    elif laue in ['6/m','6/mmm','3m1']:
+    elif laue in ['6/m','6/mmm','3m1','3']:
         return ['S400','S004','S202']
-    elif laue in ['31m','3']:
+    elif laue in ['31m',]:
         return ['S400','S004','S202','S301']
     elif laue in ['3R','3mR']:
@@ -3134 +3134 @@
         Strm.append(h**4+k**4+l**4)
         Strm.append(3.0*((h*k)**2+(h*l)**2+(k*l)**2))
-    elif laue in ['6/m','6/mmm','3m1']:
+    elif laue in ['6/m','6/mmm','3m1','3']:
         Strm.append(h**4+k**4+2.0*k*h**3+2.0*h*k**3+3.0*(h*k)**2)
         Strm.append(l**4)
         Strm.append(3.0*((h*l)**2+(k*l)**2+h*k*l**2))
-    elif laue in ['31m','3']:
+    elif laue in ['31m',]:
         Strm.append(h**4+k**4+2.0*k*h**3+2.0*h*k**3+3.0*(h*k)**2)
         Strm.append(l**4)
@@ -3241 +3241 @@
         S0 = [1000.,1000.,1000.]
     elif laue in ['31m','3','3m1']:
-        S0 = [1000.,1000.,1000.,1000.]
+        S0 = [1000.,1000.,1000.]
     elif laue in ['3R','3mR']:
         S0 = [1000.,1000.,1000.,1000.]