Changeset 4972
- Timestamp:
- Jun 23, 2021 12:07:12 PM (20 months ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/GSASIIddataGUI.py
r4968 r4972 495 495 poSizer.Add(poVal,0,WACV) 496 496 poSizer.Add(wx.StaticText(DData,wx.ID_ANY,' Unique axis, H K L: '),0,WACV) 497 h,k,l = POData[3]497 h,k,l = POData[3] 498 498 poAxis = wx.TextCtrl(DData,wx.ID_ANY,'%3d %3d %3d'%(h,k,l),style=wx.TE_PROCESS_ENTER) 499 499 poAxis.Bind(wx.EVT_TEXT_ENTER,OnPOAxis) … … 845 845 Obj.SetLabel('Do new Le Bail extraction?') 846 846 UseList[G2frame.hist]['LeBail'] = not UseList[G2frame.hist]['LeBail'] 847 wx.CallLater(100,RepaintHistogramInfo,DData.GetScrollPos(wx.VERTICAL)) 848 847 849 def OnResetSize(event): 848 850 Obj = event.GetEventObject() … … 919 921 G2frame.SetStatusText('To reset Le Bail, cycle Le Bail check box.',1) 920 922 bottomSizer.Add(useBox,0,wx.TOP|wx.BOTTOM|wx.LEFT,5) 921 if G2frame.testSeqRefineMode() :923 if G2frame.testSeqRefineMode() and not UseList[G2frame.hist]['LeBail']: 922 924 bottomSizer.Add(wx.StaticText(DData,label=' Sequential Refinemment Options')) 923 925 parmChoice = [' ','X','XU','U','F','FX','FXU','FU'] … … 944 946 bottomSizer.Add(fixBox) 945 947 946 bottomSizer.Add(ScaleSizer(),0,wx.BOTTOM,5) 948 if not UseList[G2frame.hist]['LeBail'] or 'HKLF' in G2frame.hist[:4]: 949 bottomSizer.Add(ScaleSizer(),0,wx.BOTTOM,5) 947 950 948 951 if G2frame.hist[:4] == 'PWDR': … … 1003 1006 bottomSizer.Add(DispSizer()) 1004 1007 1005 poSizer = wx.BoxSizer(wx.VERTICAL) 1006 POData = UseList[G2frame.hist]['Pref.Ori.'] 1008 if not UseList[G2frame.hist]['LeBail']: 1009 poSizer = wx.BoxSizer(wx.VERTICAL) 1010 POData = UseList[G2frame.hist]['Pref.Ori.'] 1007 1011 # patch - add penalty items 1008 if len(POData) < 7:1009 POData.append(['',])1010 POData.append(0.1)1011 if not POData[6]:1012 POData[6] = ['',]1012 if len(POData) < 7: 1013 POData.append(['',]) 1014 POData.append(0.1) 1015 if not POData[6]: 1016 POData[6] = ['',] 1013 1017 # end patch 1014 poSizer.Add(PoTopSizer(POData)) 1015 if POData[0] == 'MD': 1016 poSizer.Add(MDDataSizer(POData)) 1017 else: #'SH' 1018 if POData[4]: #SH order > 0 1019 textJ = G2lat.textureIndex(POData[5]) 1020 poSizer.Add(wx.StaticText(DData,wx.ID_ANY,' Spherical harmonic coefficients: '+'Texture index: %.3f'%(textJ)) 1021 ,0,wx.TOP|wx.BOTTOM,5) 1022 poSizer.Add(SHDataSizer(POData),0,wx.TOP|wx.BOTTOM,5) 1023 poSizer.Add(SHPenalty(POData),0,wx.TOP|wx.BOTTOM,5) 1024 1025 bottomSizer.Add(poSizer,0,wx.TOP|wx.BOTTOM,5) 1026 bottomSizer.Add(ExtSizer('PWDR'),0,wx.TOP|wx.BOTTOM,5) 1027 if generalData['Type'] != 'magnetic': 1028 bottomSizer.Add(BabSizer(),0,wx.BOTTOM,5) 1018 poSizer.Add(PoTopSizer(POData)) 1019 if POData[0] == 'MD': 1020 poSizer.Add(MDDataSizer(POData)) 1021 else: #'SH' 1022 if POData[4]: #SH order > 0 1023 textJ = G2lat.textureIndex(POData[5]) 1024 poSizer.Add(wx.StaticText(DData,wx.ID_ANY,' Spherical harmonic coefficients: '+'Texture index: %.3f'%(textJ)) 1025 ,0,wx.TOP|wx.BOTTOM,5) 1026 poSizer.Add(SHDataSizer(POData),0,wx.TOP|wx.BOTTOM,5) 1027 poSizer.Add(SHPenalty(POData),0,wx.TOP|wx.BOTTOM,5) 1028 1029 bottomSizer.Add(poSizer,0,wx.TOP|wx.BOTTOM,5) 1030 bottomSizer.Add(ExtSizer('PWDR'),0,wx.TOP|wx.BOTTOM,5) 1031 if generalData['Type'] != 'magnetic': 1032 bottomSizer.Add(BabSizer(),0,wx.BOTTOM,5) 1033 else: #turn off PWDR intensity related paramters for LeBail refinement 1034 UseList[G2frame.hist]['Scale'][1] = False 1035 UseList[G2frame.hist]['Pref.Ori.'][2] = False 1036 UseList[G2frame.hist]['Extinction'][1] = False 1037 for item in UseList[G2frame.hist]['Babinet']: 1038 UseList[G2frame.hist]['Babinet'][item][1] = False 1039 G2G.G2MessageBox(G2frame,'Refinement flags for Phase fraction, Preferred orientation, Extinction & Babinet are now off', 1040 title='LeBail refinement flag notice') 1029 1041 elif G2frame.hist[:4] == 'HKLF': 1030 1042 bottomSizer.Add(ExtSizer('HKLF'),0,wx.BOTTOM,5) -
trunk/GSASIIstrMath.py
r4970 r4972 2599 2599 def GetIntensityCorr(refl,im,uniq,G,g,pfx,phfx,hfx,SGData,calcControls,parmDict): 2600 2600 'Needs a doc string' #need powder extinction! 2601 parmDict[phfx+'Scale'] = max(1.e-12,parmDict[phfx+'Scale']) 2602 parmDict[hfx+'Scale'] = max(1.e-12,parmDict[hfx+'Scale']) #put floor on phase fractionscale2601 parmDict[phfx+'Scale'] = max(1.e-12,parmDict[phfx+'Scale']) #put floor on phase fraction scale 2602 parmDict[hfx+'Scale'] = max(1.e-12,parmDict[hfx+'Scale']) #put floor on histogram scale 2603 2603 Icorr = parmDict[phfx+'Scale']*parmDict[hfx+'Scale']*refl[3+im] #scale*multiplicity 2604 2604 if 'X' in parmDict[hfx+'Type']:
Note: See TracChangeset
for help on using the changeset viewer.