Changeset 2125
- Timestamp:
- Jan 15, 2016 1:00:54 PM (7 years ago)
- Location:
- trunk
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/GSASIIimage.py
r2108 r2125 910 910 tax = np.where(tax < LRazm[0],tax+360.,tax) 911 911 if data['SampleAbs'][1]: 912 if ' PWDR' in data['type']:913 muR = muT*(1.+npsind(tax)**2/2.)/(npcosd(tay)) 912 if 'Cylind' in data['SampleShape']: 913 muR = muT*(1.+npsind(tax)**2/2.)/(npcosd(tay)) #adjust for additional thickness off sample normal 914 914 tabs = G2pwd.Absorb(data['SampleShape'],muR,tay) 915 elif ' SASD' in data['type']: #assumes flat plate sample normal to beam915 elif 'Fixed' in data['SampleShape']: #assumes flat plate sample normal to beam 916 916 tabs = G2pwd.Absorb('Fixed',muT,tay) 917 917 if 'log(q)' in data['binType']: -
trunk/GSASIIimgGUI.py
r2109 r2125 610 610 pass 611 611 obliqVal.SetValue('%.3f'%(data['Oblique'][0])) 612 613 def OnSampleShape(event): 614 data['SampleShape'] = samShape.GetValue() 615 if 'Cylind' in data['SampleShape']: 616 data['SampleAbs'][0] = 0.0 617 elif 'Fixed' in data['SampleShape']: 618 data['SampleAbs'][0] = 1.0 619 wx.CallLater(100,UpdateImageControls,G2frame,data,masks) 612 620 613 621 def OnSamAbs(event): … … 621 629 value = float(samabsVal.GetValue()) 622 630 minmax = [0.,2.] 623 if ' SASD' in data['type']:631 if 'Fixed' in data['SampleShape']: 624 632 minmax = [.05,1.0] 625 633 if minmax[0] <= value <= minmax[1]: … … 742 750 littleSizer.Add(outAzim,0,WACV) 743 751 dataSizer.Add(littleSizer,0,) 752 samplechoice = ['Cylinder','Fixed flat plate',] 753 dataSizer.Add(wx.StaticText(G2frame.dataDisplay,label='Select sample shape'),0,WACV) 754 samShape = wx.ComboBox(G2frame.dataDisplay,value=data['SampleShape'],choices=samplechoice, 755 style=wx.CB_READONLY|wx.CB_DROPDOWN) 756 samShape.Bind(wx.EVT_COMBOBOX,OnSampleShape) 757 dataSizer.Add(samShape,0,WACV) 758 #SampleShape - cylinder or flat plate choice? 744 759 littleSizer = wx.BoxSizer(wx.HORIZONTAL) 745 760 samabs = wx.CheckBox(parent=G2frame.dataDisplay,label='Apply sample absorption?') … … 747 762 samabs.Bind(wx.EVT_CHECKBOX, OnSamAbs) 748 763 samabs.SetValue(data['SampleAbs'][1]) 749 if ' PWDR' in data['type']:750 littleSizer.Add(wx.StaticText(G2frame.dataDisplay,label='mu /R (0.00-2.0) '),0,WACV)751 elif ' SASD' in data['type']:752 littleSizer.Add(wx.StaticText(G2frame.dataDisplay,label='transmission '),0,WACV) 764 if 'Cylind' in data['SampleShape']: #cylinder mu*R; flat plate transmission 765 littleSizer.Add(wx.StaticText(G2frame.dataDisplay,label='mu*R (0.00-2.0) '),0,WACV) 766 elif 'Fixed' in data['SampleShape']: 767 littleSizer.Add(wx.StaticText(G2frame.dataDisplay,label='transmission '),0,WACV) #for flat plate 753 768 samabsVal = wx.TextCtrl(parent=G2frame.dataDisplay,value='%.3f'%(data['SampleAbs'][0]),style=wx.TE_PROCESS_ENTER) 754 769 samabsVal.Bind(wx.EVT_TEXT_ENTER,OnSamAbsVal) 755 770 samabsVal.Bind(wx.EVT_KILL_FOCUS,OnSamAbsVal) 756 771 littleSizer.Add(samabsVal,0,WACV) 757 dataSizer.Add(littleSizer,0,) 772 dataSizer.Add(littleSizer,0,) 758 773 if 'PWDR' in data['type']: 759 774 littleSizer = wx.BoxSizer(wx.HORIZONTAL) -
trunk/imports/G2sfact.py
r2122 r2125 217 217 self.errors = ' Error reading line '+str(line+1) 218 218 if self.Super == 0: 219 h,k,l,Fo,sigFo,Tw = S[:4],S[4:8],S[8:12],S[12:20],S[20:28],S[28:32] 219 SH = S[:12] 220 SF = S[12:32] 221 h,k,l = SH.split() 222 Fo,sigFo,Tw = SF.split() 223 # h,k,l,Fo,sigFo,Tw = S[:4],S[4:8],S[8:12],S[12:20],S[20:28],S[28:32] 220 224 h,k,l = [int(h),int(k),int(l)] 221 225 elif self.Super == 1: 222 h,k,l,m1,Fo,sigFo,Tw = S[:4],S[4:8],S[8:12],S[12:16],S[16:24],S[24:32],S[32:36] 226 SH = S[:16] 227 SF = S[16:36] 228 h,k,l,m1 = SH.split() 229 Fo,sigFo,Tw = SF.split() 230 # h,k,l,m1,Fo,sigFo,Tw = S[:4],S[4:8],S[8:12],S[12:16],S[16:24],S[24:32],S[32:36] 223 231 h,k,l,m1 = [int(h),int(k),int(l),int(m1)] 224 232 Tw = Tw.strip()
Note: See TracChangeset
for help on using the changeset viewer.