Changeset 1483
- Timestamp:
- Sep 2, 2014 4:45:58 PM (8 years ago)
- Location:
- trunk
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/GSASII.py
r1466 r1483 2839 2839 peaks = data[phase] 2840 2840 file.write("%s %s %s \n" % (name,phase,' Reflection List')) 2841 file.write('%s \n'%(' h k l m d-space 2-theta wid F**2')) 2842 for peak in peaks: 2841 if 'T' in peaks.get('Type','PXC'): 2842 file.write('%s \n'%(' h k l m d-space TOF wid F**2')) 2843 else: 2844 file.write('%s \n'%(' h k l m d-space 2-theta wid F**2')) 2845 for peak in peaks['RefList']: 2843 2846 FWHM = G2pwd.getgamFW(peak[7],peak[6])/50. #to get delta-2-theta in deg. 2844 file.write(" %3d %3d %3d %3d %10.5f %10.5f %10.5f %10.3f \n" % \ 2845 (int(peak[0]),int(peak[1]),int(peak[2]),int(peak[3]),peak[4],peak[5],FWHM,peak[8])) 2847 if 'T' in peaks.get('Type','PXC'): 2848 file.write(" %3d %3d %3d %3d %10.5f %10.2f %10.5f %10.3f \n" % \ 2849 (int(peak[0]),int(peak[1]),int(peak[2]),int(peak[3]),peak[4],peak[5],FWHM,peak[8])) 2850 else: 2851 file.write(" %3d %3d %3d %3d %10.5f %10.5f %10.5f %10.3f \n" % \ 2852 (int(peak[0]),int(peak[1]),int(peak[2]),int(peak[3]),peak[4],peak[5],FWHM,peak[8])) 2846 2853 item2, cookie2 = self.PatternTree.GetNextChild(item, cookie2) 2847 2854 item, cookie = self.PatternTree.GetNextChild(self.root, cookie) -
trunk/GSASIIddataGUI.py
r1480 r1483 262 262 try: 263 263 value = float(Obj.GetValue()) 264 if 0 .1<= value <= 1:264 if 0 <= value <= 1: 265 265 UseList[hist][name][1][2] = value 266 266 else: -
trunk/GSASIIstrIO.py
r1478 r1483 1825 1825 Uniq.append(uniq) 1826 1826 Phi.append(phi) 1827 Histogram['Reflection Lists'][phase] = {'RefList':np.array(refList),'FF':{} }1827 Histogram['Reflection Lists'][phase] = {'RefList':np.array(refList),'FF':{},'Type':inst['Type'][0]} 1828 1828 elif 'HKLF' in histogram: 1829 1829 inst = Histogram['Instrument Parameters'][0] … … 2069 2069 for item in ['Mustrain','Size']: 2070 2070 hapData[item][1][2] = parmDict[pfx+item+';mx'] 2071 hapData[item][1][2] = min(1.,max(0. 1,hapData[item][1][2]))2071 hapData[item][1][2] = min(1.,max(0.,hapData[item][1][2])) 2072 2072 if pfx+item+';mx' in sigDict: 2073 2073 SizeMuStrSig[pfx+item][0][2] = sigDict[pfx+item+';mx'] -
trunk/testDeriv.py
r1456 r1483 50 50 def _init_ctrls(self, parent): 51 51 wx.Frame.__init__(self, name='testDeriv', parent=parent, 52 size=wx.Size( 750, 250),style=wx.DEFAULT_FRAME_STYLE, title='Test Jacobian Derivatives')52 size=wx.Size(800, 250),style=wx.DEFAULT_FRAME_STYLE, title='Test Jacobian Derivatives') 53 53 self.testDerivMenu = wx.MenuBar() 54 54 self.File = wx.Menu(title='') … … 142 142 self.testDerivPanel.SetSizer(mainSizer) 143 143 Size = mainSizer.Fit(self.testDerivPanel) 144 Size[0] = 750144 Size[0] = 800 145 145 Size[1] = max(Size[1],290) + 35 146 146 self.testDerivPanel.SetScrollbars(10,10,Size[0]/10-4,Size[1]/10-1)
Note: See TracChangeset
for help on using the changeset viewer.