Changeset 1778
- Timestamp:
- Apr 6, 2015 1:33:00 PM (8 years ago)
- Location:
- trunk
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/GSASIIIO.py
r1770 r1778 1041 1041 else: 1042 1042 for i,azm in enumerate(azms[:-1]): 1043 Azms.append(G2img.meanAzm(azm,azms[i+1])) 1043 if azm > 360. and azms[i+1] > 360.: 1044 Azms.append(G2img.meanAzm(azm%360.,azms[i+1]%360.)) 1045 else: 1046 Azms.append(G2img.meanAzm(azm,azms[i+1])) 1044 1047 for i,azm in enumerate(azms[:-1]): 1045 1048 Aname = name+" Azm= %.2f"%(Azms[i]) … … 1058 1061 Sample['Chi'] = data['GonioAngles'][1] 1059 1062 Sample['Phi'] = data['GonioAngles'][2] 1063 Sample['Azimuth'] = Azms[i] #put here too 1060 1064 if 'PWDR' in Aname: 1061 1065 parms = ['PXC',data['wavelength'],0.0,0.99,1.0,-0.10,0.4,0.30,1.0,0.0001,Azms[i]] #set polarization for synchrotron radiation! -
trunk/GSASIIddataGUI.py
r1776 r1778 665 665 if dlg.ShowModal() == wx.ID_OK: 666 666 POData[6] = [hkls[i] for i in dlg.GetSelections()] 667 if not POData[6]: 668 POData[6] = [''] 667 669 else: 668 670 return … … 796 798 wx.CallLater(100,UpdateDData,G2frame,DData,data,hist) 797 799 800 DData.DestroyChildren() 798 801 if DData.GetSizer(): 799 802 DData.GetSizer().Clear(True) … … 898 901 mainSizer.Add(HstrainSizer()) 899 902 900 #texture 'Pref. Ori.':['MD',1.0,False,[0,0,1],0,[]] last two for 'SH' are SHorder & coeff901 903 poSizer = wx.BoxSizer(wx.VERTICAL) 902 904 POData = UseList[hist]['Pref.Ori.'] -
trunk/GSASIIgrid.py
r1776 r1778 1823 1823 self.TextureEdit = wx.Menu(title='') 1824 1824 self.TextureMenu.Append(menu=self.TextureEdit, title='Texture') 1825 # self.TextureEdit.Append(id=wxID_REFINETEXTURE, kind=wx.ITEM_NORMAL,text='Refine texture', 1826 # help='Refine the texture coefficients from sequential Pawley results') 1827 # N.B. Binding is now commented out 1825 self.TextureEdit.Append(id=wxID_REFINETEXTURE, kind=wx.ITEM_NORMAL,text='Refine texture', 1826 help='Refine the texture coefficients from sequential results') 1828 1827 self.TextureEdit.Append(id=wxID_CLEARTEXTURE, kind=wx.ITEM_NORMAL,text='Clear texture', 1829 1828 help='Clear the texture coefficients' ) … … 2501 2500 else: 2502 2501 sampleParmDict = {'Temperature':[],'Pressure':[],'Time':[], 2503 'FreePrm1':[],'FreePrm2':[],'FreePrm3':[],} 2502 'FreePrm1':[],'FreePrm2':[],'FreePrm3':[],'Omega':[], 2503 'Chi':[],'Phi':[],'Azimuth':[],} 2504 2504 Controls = G2frame.PatternTree.GetItemPyData( 2505 2505 GetPatternTreeItemId(G2frame,G2frame.root, 'Controls')) -
trunk/GSASIImapvars.py
r1676 r1778 380 380 381 381 # check for errors: 382 if debug: 383 print 'indepVarList',indepVarList 384 print 'depVarList',depVarList 385 print 'multdepVarList',multdepVarList 382 386 inboth = set(indepVarList).intersection(set(depVarList)) 383 387 if len(inboth) > 0: -
trunk/GSASIIphsGUI.py
r1776 r1778 240 240 """ 241 241 # UpdateGeneral execution starts here 242 General.DestroyChildren() 242 243 phaseTypes = ['nuclear','modulated','magnetic','macromolecular'] 243 244 SetupGeneral() … … 3611 3612 3612 3613 # UpdateTexture executable starts here 3614 Texture.DestroyChildren() 3613 3615 G2frame.dataFrame.SetStatusText('') 3614 3616 generalData = data['General'] … … 5868 5870 5869 5871 def OnTextureRefine(event): 5870 print 'refine texture maybe from C[i,j] in seq. result? not yet' 5871 event.Skip() 5872 print 'refine texture from C[i,j] in seq. result' 5872 5873 5873 5874 def OnTextureClear(event): 5874 5875 print 'clear texture? - does nothing' 5875 event.Skip()5876 5876 5877 5877 def FillSelectPageMenu(TabSelectionIdDict, menuBar): … … 6048 6048 # Texture 6049 6049 FillSelectPageMenu(TabSelectionIdDict, G2frame.dataFrame.TextureMenu) 6050 #G2frame.dataFrame.Bind(wx.EVT_MENU, OnTextureRefine, id=G2gd.wxID_REFINETEXTURE)6050 G2frame.dataFrame.Bind(wx.EVT_MENU, OnTextureRefine, id=G2gd.wxID_REFINETEXTURE) 6051 6051 G2frame.dataFrame.Bind(wx.EVT_MENU, OnTextureClear, id=G2gd.wxID_CLEARTEXTURE) 6052 6052 # Pawley reflections -
trunk/GSASIIpwdGUI.py
r1776 r1778 81 81 'FreePrm1':0.,'FreePrm2':0.,'FreePrm3':0., 82 82 'Gonio. radius':200.0, 83 'Omega':0.0,'Chi':0.0,'Phi':0.0, 83 'Omega':0.0,'Chi':0.0,'Phi':0.0,'Azimuth':0.0, 84 84 #SASD items 85 85 'Materials':[{'Name':'vacuum','VolFrac':1.0,},{'Name':'vacuum','VolFrac':0.0,}], … … 117 117 parms.append(['Chi','Goniometer chi:',[10,3]]) 118 118 parms.append(['Phi','Goniometer phi:',[10,3]]) 119 parms.append(['Azimuth','Detector azimuth',[10,3]]) 119 120 parms.append(['Time','Clock time (s)',[12,3]]) 120 121 parms.append(['Temperature','Sample temperature (K): ',[10,3]])
Note: See TracChangeset
for help on using the changeset viewer.