Changeset 1945

Timestamp:

Jul 23, 2015 3:36:38 PM (7 years ago)

Author:

vondreele

Message:

fix another new histo in new phase error
some cleanup in texture calculations - unneeded list generation

Location:

trunk

Files:

• GSASII.py (modified) (2 diffs)
• GSASIIctrls.py (modified) (1 diff)
• GSASIIlattice.py (modified) (2 diffs)
• GSASIIphsGUI.py (modified) (1 diff)
• GSASIIpwdGUI.py (modified) (2 diffs)

trunk/GSASII.py

@@ -705 +705 @@
                     refList = self.PatternTree.GetItemPyData(
                         G2gd.GetPatternTreeItemId(self,Id,'Reflection Lists'))
-                    refList[generalData['Name']] = []
+                    refList[generalData['Name']] = {}
                     UseList[histoName] = SetDefaultDData('PWDR',histoName,NShkl=NShkl,NDij=NDij)
                 else:
@@ -3616 +3616 @@
                     self.PickIdText = None  #force reload of PickId contents
                     self.PatternTree.DeleteChildren(self.root)
-                    if self.HKL: self.HKL = []
+                    if len(self.HKL): self.HKL = []
                     if self.G2plotNB.plotList:
                         self.G2plotNB.clear()

trunk/GSASIIctrls.py

@@ -1267 +1267 @@
         topSizer.Add(
             wx.StaticText(self,wx.ID_ANY,title,size=(-1,35)),
-            1,wx.ALL|wx.EXPAND|WACV,1)
+            1,wx.ALL|wx.EXPAND|WACV,8)
         if filterBox:
             self.timer = wx.Timer()

trunk/GSASIIlattice.py

@@ -1129 +1129 @@
     import pytexture as ptx
     if SGLaue in ['m3','m3m']:
-        if phi.shape:
+        if 'float' in str(type(phi)):
             Kcl = np.zeros_like(phi)
         else:
             Kcl = 0.
         for j in range(0,L+1,4):
-            im = j/4+1
-            if phi.shape:
-                pcrs = np.array([ptx.pyplmpsi(L,j,1,p)[0] for p in phi]).flatten()
+            im = j/4
+            if 'float' in str(type(phi)):
+                pcrs = ptx.pyplmpsi(L,j,len(phi),phi)[0]
             else:
                 pcrs,dum = ptx.pyplmpsi(L,j,1,phi)
-            Kcl += BOH['L='+str(L)][N-1][im-1]*pcrs*cosd(j*beta)        
+            Kcl += BOH['L='+str(L)][N-1][im]*pcrs*cosd(j*beta)        
     else:
-        if phi.shape:
-            pcrs = np.array([ptx.pyplmpsi(L,N,1,p)[0] for p in phi]).flatten()
+        if 'float' in str(type(phi)):
+            pcrs = ptx.pyplmpsi(L,N,len(phi),phi)[0]
         else:
             pcrs,dum = ptx.pyplmpsi(L,N,1,phi)
@@ -1166 +1166 @@
         psrs,dpdps = ptx.pyplmpsi(L,M,1,psi)
     else:
-        psrs = np.array([ptx.pyplmpsi(L,M,1,p) for p in psi])
-        psrs,dpdps = np.reshape(psrs.flatten(),(-1,2)).T
+        psrs,dpdps = ptx.pyplmpsi(L,M,len(psi),psi)
     psrs *= RSQ2PI
     dpdps *= RSQ2PI

trunk/GSASIIphsGUI.py

@@ -3918 +3918 @@
             colorSel.Bind(wx.EVT_COMBOBOX,OnColorSel)
             PTSizer.Add(colorSel,0,WACV)
-            popLA = wx.Button(Texture,-1,"Make popLA file")
-            popLA.Bind(wx.EVT_BUTTON, OnpopLA)
             if 'Inverse' not in textureData['PlotType']:
+                popLA = wx.Button(Texture,-1,"Make popLA file")
+                popLA.Bind(wx.EVT_BUTTON, OnpopLA)
                 PTSizer.Add(popLA,0,WACV)
         mainSizer.Add(PTSizer,0,WACV)

trunk/GSASIIpwdGUI.py

@@ -1313 +1313 @@
         try:
             keys.remove('Source')
-        except ListError:
+        except ValueError:
             pass
         flags = dict(zip(keys,[data[key][2] for key in keys]))
@@ -3214 +3214 @@
             im = data[1].get('Super',0)
         else:
-            if 'T' in data[phaseName]['Type']:
+            if 'T' in data[phaseName].get('Type',''):
                 it = 3
             im = data[phaseName].get('Super',0)