Changeset 1945
- Timestamp:
- Jul 23, 2015 3:36:38 PM (8 years ago)
- Location:
- trunk
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/GSASII.py
r1934 r1945 705 705 refList = self.PatternTree.GetItemPyData( 706 706 G2gd.GetPatternTreeItemId(self,Id,'Reflection Lists')) 707 refList[generalData['Name']] = []707 refList[generalData['Name']] = {} 708 708 UseList[histoName] = SetDefaultDData('PWDR',histoName,NShkl=NShkl,NDij=NDij) 709 709 else: … … 3616 3616 self.PickIdText = None #force reload of PickId contents 3617 3617 self.PatternTree.DeleteChildren(self.root) 3618 if self.HKL: self.HKL = []3618 if len(self.HKL): self.HKL = [] 3619 3619 if self.G2plotNB.plotList: 3620 3620 self.G2plotNB.clear() -
trunk/GSASIIctrls.py
r1944 r1945 1267 1267 topSizer.Add( 1268 1268 wx.StaticText(self,wx.ID_ANY,title,size=(-1,35)), 1269 1,wx.ALL|wx.EXPAND|WACV, 1)1269 1,wx.ALL|wx.EXPAND|WACV,8) 1270 1270 if filterBox: 1271 1271 self.timer = wx.Timer() -
trunk/GSASIIlattice.py
r1820 r1945 1129 1129 import pytexture as ptx 1130 1130 if SGLaue in ['m3','m3m']: 1131 if phi.shape:1131 if 'float' in str(type(phi)): 1132 1132 Kcl = np.zeros_like(phi) 1133 1133 else: 1134 1134 Kcl = 0. 1135 1135 for j in range(0,L+1,4): 1136 im = j/4 +11137 if phi.shape:1138 pcrs = np.array([ptx.pyplmpsi(L,j,1,p)[0] for p in phi]).flatten()1136 im = j/4 1137 if 'float' in str(type(phi)): 1138 pcrs = ptx.pyplmpsi(L,j,len(phi),phi)[0] 1139 1139 else: 1140 1140 pcrs,dum = ptx.pyplmpsi(L,j,1,phi) 1141 Kcl += BOH['L='+str(L)][N-1][im -1]*pcrs*cosd(j*beta)1141 Kcl += BOH['L='+str(L)][N-1][im]*pcrs*cosd(j*beta) 1142 1142 else: 1143 if phi.shape:1144 pcrs = np.array([ptx.pyplmpsi(L,N,1,p)[0] for p in phi]).flatten()1143 if 'float' in str(type(phi)): 1144 pcrs = ptx.pyplmpsi(L,N,len(phi),phi)[0] 1145 1145 else: 1146 1146 pcrs,dum = ptx.pyplmpsi(L,N,1,phi) … … 1166 1166 psrs,dpdps = ptx.pyplmpsi(L,M,1,psi) 1167 1167 else: 1168 psrs = np.array([ptx.pyplmpsi(L,M,1,p) for p in psi]) 1169 psrs,dpdps = np.reshape(psrs.flatten(),(-1,2)).T 1168 psrs,dpdps = ptx.pyplmpsi(L,M,len(psi),psi) 1170 1169 psrs *= RSQ2PI 1171 1170 dpdps *= RSQ2PI -
trunk/GSASIIphsGUI.py
r1944 r1945 3918 3918 colorSel.Bind(wx.EVT_COMBOBOX,OnColorSel) 3919 3919 PTSizer.Add(colorSel,0,WACV) 3920 popLA = wx.Button(Texture,-1,"Make popLA file")3921 popLA.Bind(wx.EVT_BUTTON, OnpopLA)3922 3920 if 'Inverse' not in textureData['PlotType']: 3921 popLA = wx.Button(Texture,-1,"Make popLA file") 3922 popLA.Bind(wx.EVT_BUTTON, OnpopLA) 3923 3923 PTSizer.Add(popLA,0,WACV) 3924 3924 mainSizer.Add(PTSizer,0,WACV) -
trunk/GSASIIpwdGUI.py
r1933 r1945 1313 1313 try: 1314 1314 keys.remove('Source') 1315 except ListError:1315 except ValueError: 1316 1316 pass 1317 1317 flags = dict(zip(keys,[data[key][2] for key in keys])) … … 3214 3214 im = data[1].get('Super',0) 3215 3215 else: 3216 if 'T' in data[phaseName] ['Type']:3216 if 'T' in data[phaseName].get('Type',''): 3217 3217 it = 3 3218 3218 im = data[phaseName].get('Super',0)
Note: See TracChangeset
for help on using the changeset viewer.