Changeset 2700 for trunk/GSASIIpwdGUI.py


Ignore:
Timestamp:
Feb 11, 2017 10:02:44 AM (5 years ago)
Author:
vondreele
Message:

fix issues withh single/multiscan Bruker raw files
recover Temperature from Bruker multiscan files
fix issues with SetItemPyData? for SeqData? in various places

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIpwdGUI.py

    r2698 r2700  
    537537            SeqResult = {}
    538538            Id = G2frame.PatternTree.AppendItem(parent=G2frame.root,text='Sequential peak fit results')
    539             G2frame.PatternTree.SetItemPyData(Id,SeqResult)
    540539        SeqResult = {'SeqPseudoVars':{},'SeqParFitEqList':[]}
    541540        Reverse = False
     
    592591            dlg.Destroy()
    593592        SeqResult['histNames'] = histList
     593        G2frame.PatternTree.SetItemPyData(Id,SeqResult)
    594594        G2frame.G2plotNB.Delete('Sequential refinement')    #clear away probably invalid plot
    595595        G2frame.PatternTree.SelectItem(Id)
     
    770770        '''
    771771        event.Skip()
    772         c =  event.GetRow(),event.GetCol()[1]
     772        c =  event.GetRow(),event.GetCol()
    773773        if c < 0: # replot except whan a column is selected
    774774            wx.CallAfter(G2plt.PlotPatterns,G2frame,plotType='PWDR')
     
    40334033                SeqResult = {}
    40344034                Id = G2frame.PatternTree.AppendItem(parent=G2frame.root,text='Sequential SASD results')
    4035                 G2frame.PatternTree.SetItemPyData(Id,SeqResult)
    40364035            SeqResult['histNames'] = choices
    40374036            SeqResult = {'SeqPseudoVars':{},'SeqParFitEqList':[]}
     
    40634062                if not GoOn:
    40644063                    break
    4065                 Id =  G2gd.GetPatternTreeItemId(G2frame,G2frame.root,name)
     4064                sId =  G2gd.GetPatternTreeItemId(G2frame,G2frame.root,name)
    40664065                if i and CopyForward:
    4067                     G2frame.PatternTree.SetItemPyData(G2gd.GetPatternTreeItemId(G2frame,Id, 'Models'),JModel)
     4066                    G2frame.PatternTree.SetItemPyData(G2gd.GetPatternTreeItemId(G2frame,sId, 'Models'),JModel)
    40684067                IProfDict,IProfile = G2frame.PatternTree.GetItemPyData(Id)[:2]
    4069                 IModel = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,Id, 'Models'))
    4070                 ISample = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,Id, 'Sample Parameters'))
    4071                 ILimits = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,Id, 'Limits'))
     4068                IModel = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,sId, 'Models'))
     4069                ISample = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,sId, 'Sample Parameters'))
     4070                ILimits = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,sId, 'Limits'))
    40724071                IfOK,result,varyList,sig,Rvals,covMatrix,parmDict,Msg = G2sasd.ModelFit(IProfile,IProfDict,ILimits,ISample,IModel)
    40734072                JModel = copy.deepcopy(IModel)
     
    40804079                    break
    40814080                else:
    4082                     G2frame.PatternTree.SetItemPyData(G2gd.GetPatternTreeItemId(G2frame,Id, 'Models'),copy.deepcopy(IModel))
     4081                    G2frame.PatternTree.SetItemPyData(G2gd.GetPatternTreeItemId(G2frame,sId, 'Models'),copy.deepcopy(IModel))
    40834082               
    40844083                G2sasd.ModelFxn(IProfile,IProfDict,ILimits,ISample,IModel)
     
    40904089        finally:
    40914090            wx.EndBusyCursor()   
     4091        G2frame.PatternTree.SetItemPyData(Id,SeqResult)
    40924092        G2frame.PatternTree.SelectItem(Id)
    40934093       
     
    53825382                    SeqResult = {}
    53835383                    Id = G2frame.PatternTree.AppendItem(parent=G2frame.root,text='Sequential PDF peak fit results')
    5384                     G2frame.PatternTree.SetItemPyData(Id,SeqResult)
    53855384                SeqResult = {'SeqPseudoVars':{},'SeqParFitEqList':[]}
    53865385                items = dlg.GetSelections()
     
    54005399            dlg.Destroy()
    54015400        G2plt.PlotISFG(G2frame,data,peaks=newpeaks,newPlot=False)
     5401        G2frame.PatternTree.SetItemPyData(Id,SeqResult)
    54025402        G2frame.PatternTree.SelectItem(Id)
    54035403        print 'All PDFs peak fitted - results in Sequential PDF peak fit results'
Note: See TracChangeset for help on using the changeset viewer.