Changeset 2715 for trunk/GSASIIgrid.py


Ignore:
Timestamp:
Feb 18, 2017 4:22:21 PM (5 years ago)
Author:
vondreele
Message:

put histogram numbers in sorted order for View LS parms
remove some commented lines from G2pwdrGUI
force seq refinement to skip unused phases in each histogram - hap parameters are ignored & seq results table shows blanks for them
seq plot plot skips blanks - leaves blank spots in any parameter line

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIgrid.py

    r2711 r2715  
    14981498        self.globVars.sort()
    14991499        self.hisNames = [':'.join(item) for item in splitNames if not item[0]]
    1500         self.hisNums = [' ',]+list(set([item.split(':')[1] for item in self.hisNames]))
    1501         if '' in self.hisNums: self.hisNums.remove('')
     1500        self.hisNums = list(set([int(item.split(':')[1]) for item in self.hisNames]))
     1501        self.hisNums.sort()
     1502        self.hisNums = [' ',]+[str(item) for item in self.hisNums]
    15021503        self.hisVars = list(set([' ',]+[item[2] for item in splitNames if not item[0]]))
    15031504        self.hisVars.sort()
    1504         self.hisNums.sort()
    15051505        self.phasNames = [':'.join(item) for item in splitNames if not item[1] and 'is' not in item[2]]
    15061506        self.phasNums = [' ',]+list(set([item.split(':')[0] for item in self.phasNames]))
     
    16141614        subSizer.Add(wx.StaticText(self.panel,wx.ID_ANY,'value'),0,wx.ALIGN_RIGHT)
    16151615        explainRefine = False
    1616         time0 = time.time()
    16171616        for name in choiceDict[self.parmChoice]:
    16181617            # skip entries without numerical values
     
    16451644            subSizer.Add(wx.StaticText(self.panel,wx.ID_ANY,value),0,wx.ALIGN_RIGHT)
    16461645
    1647         print time.time()-time0
    16481646        mainSizer.Add(subSizer,0)
    16491647        if explainRefine:
Note: See TracChangeset for help on using the changeset viewer.