Changeset 2905 for branch/2frame/GSASIIplot.py

Timestamp:

Jul 4, 2017 12:11:29 PM (5 years ago)

Author:

toby

Message:

use GPXtree in place of PatternTree?

File:

• branch/2frame/GSASIIplot.py (modified) (66 diffs)

branch/2frame/GSASIIplot.py

@@ -368 +368 @@
         '''
         self.allowZoomReset = False 
-        if pid: self.G2frame.PatternTree.SelectItem(pid)
+        if pid: self.G2frame.GPXtree.SelectItem(pid)
         self.allowZoomReset = True
         if plotDebug: print 'invoke',str(self).split('0x')[1],str(pid)
@@ -555 +555 @@
         G2frame.G2plotNB.status.SetStatusText('H = '+HKLtext,0)
                                  
-    Name = G2frame.PatternTree.GetItemText(G2frame.PatternId)
+    Name = G2frame.GPXtree.GetItemText(G2frame.PatternId)
     if not Title:
         Title = Name
@@ -809 +809 @@
         Draw('key')
             
-    Name = G2frame.PatternTree.GetItemText(G2frame.PatternId)
+    Name = G2frame.GPXtree.GetItemText(G2frame.PatternId)
     if Title and Title in G2frame.GetPhaseData(): #NB: save image as e.g. jpeg will fail if False; MyDir is unknown
         generalData = G2frame.GetPhaseData()[Title]['General']
@@ -1191 +1191 @@
     if not histogram.startswith('PWDR'): return
     pickId = G2frame.PickId
-    G2frame.PickId = G2frame.PatternId = G2gd.GetPatternTreeItemId(G2frame, G2frame.root, histogram)
-    treedata = G2frame.PatternTree.GetItemPyData(G2frame.PatternId)
+    G2frame.PickId = G2frame.PatternId = G2gd.GetGPXtreeItemId(G2frame, G2frame.root, histogram)
+    treedata = G2frame.GPXtree.GetItemPyData(G2frame.PatternId)
     PlotPatterns(G2frame,newPlot=True,plotType='PWDR',data=[treedata[0],refdata])
     wx.Yield() # force a plot update (needed on Windows?)
@@ -1203 +1203 @@
     '''
     if PatternName:
-        G2frame.PatternId = G2gd.GetPatternTreeItemId(G2frame, G2frame.root, PatternName)
+        G2frame.PatternId = G2gd.GetGPXtreeItemId(G2frame, G2frame.root, PatternName)
     if PickName == PatternName:
         G2frame.PickId = G2frame.PatternId
     elif PickName:
-        G2frame.PickId = G2gd.GetPatternTreeItemId(G2frame, G2frame.PatternId, PickName)
+        G2frame.PickId = G2gd.GetGPXtreeItemId(G2frame, G2frame.PatternId, PickName)
     # for now I am not sure how to regenerate G2frame.HKL
     G2frame.HKL = [] # TODO
@@ -1237 +1237 @@
 #patch
     if data is None:
-        data = G2frame.PatternTree.GetItemPyData(G2frame.PatternId)
+        data = G2frame.GPXtree.GetItemPyData(G2frame.PatternId)
     if 'Offset' not in data[0] and plotType in ['PWDR','SASD','REFD']:     #plot offset data
         Ymax = max(data[1][1])
         data[0].update({'Offset':[0.0,0.0],'delOffset':0.02*Ymax,'refOffset':-0.1*Ymax,
             'refDelt':0.1*Ymax,})
-        G2frame.PatternTree.SetItemPyData(G2frame.PickId,data)
+        G2frame.GPXtree.SetItemPyData(G2frame.PickId,data)
 #end patch
     def OnPlotKeyPress(event):
         try:        #one way to check if key stroke will work on plot
-            Parms,Parms2 = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,G2frame.PatternId, 'Instrument Parameters'))
+            Parms,Parms2 = G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame,G2frame.PatternId, 'Instrument Parameters'))
         except TypeError:
             G2frame.G2plotNB.status.SetStatusText('Select '+plottype+' pattern first',1)
@@ -1335 +1335 @@
             newPlot = True
         elif event.key == 'f' and not G2frame.SinglePlot:
-            choices = G2gd.GetPatternTreeDataNames(G2frame,plotType)
+            choices = G2gd.GetGPXtreeDataNames(G2frame,plotType)
             dlg = G2G.G2MultiChoiceDialog(G2frame.dataFrame,'Select dataset to plot', 
                 'Multidata plot selection',choices)
@@ -1373 +1373 @@
             Page.canvas.SetCursor(wx.CROSS_CURSOR)
             try:
-                Id = G2gd.GetPatternTreeItemId(G2frame,G2frame.PatternId, 'Instrument Parameters')
+                Id = G2gd.GetGPXtreeItemId(G2frame,G2frame.PatternId, 'Instrument Parameters')
                 if not Id: return
-                Parms,Parms2 = G2frame.PatternTree.GetItemPyData(Id)
+                Parms,Parms2 = G2frame.GPXtree.GetItemPyData(Id)
                 if G2frame.plotStyle['qPlot'] and 'PWDR' in plottype:
                     q = xpos
@@ -1422 +1422 @@
                 if G2frame.PickId:
                     found = []
-                    pickIdText = G2frame.PatternTree.GetItemText(G2frame.PickId)
+                    pickIdText = G2frame.GPXtree.GetItemText(G2frame.PickId)
                     if pickIdText in ['Index Peak List','Unit Cells List','Reflection Lists'] or \
                         'PWDR' in pickIdText:
@@ -1546 +1546 @@
 
         try:
-            Parms,Parms2 = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,G2frame.PatternId, 'Instrument Parameters'))
+            Parms,Parms2 = G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame,G2frame.PatternId, 'Instrument Parameters'))
         except TypeError:
             return
@@ -1570 +1570 @@
         PatternId = G2frame.PatternId
         PickId = G2frame.PickId
-        if G2frame.PatternTree.GetItemText(PickId) == 'Peak List':
+        if G2frame.GPXtree.GetItemText(PickId) == 'Peak List':
             if ind.all() != [0] and ObsLine[0].get_label() in str(pick):    #picked a data point, add a new peak
-                data = G2frame.PatternTree.GetItemPyData(G2frame.PickId)
+                data = G2frame.GPXtree.GetItemPyData(G2frame.PickId)
                 XY = G2mth.setPeakparms(Parms,Parms2,xy[0],xy[1])
                 data['peaks'].append(XY)
@@ -1588 +1588 @@
                 G2frame.cid = Page.canvas.mpl_connect('motion_notify_event', OnDragLine)
                 pick.set_linestyle('--') # back to dashed
-        elif G2frame.PatternTree.GetItemText(PickId) == 'Limits':
+        elif G2frame.GPXtree.GetItemText(PickId) == 'Limits':
             if ind.all() != [0]:                                    #picked a data point
-                LimitId = G2gd.GetPatternTreeItemId(G2frame,PatternId, 'Limits')
-                data = G2frame.PatternTree.GetItemPyData(LimitId)
+                LimitId = G2gd.GetGPXtreeItemId(G2frame,PatternId, 'Limits')
+                data = G2frame.GPXtree.GetItemPyData(LimitId)
                 if G2frame.plotStyle['qPlot']:                              #qplot - convert back to 2-theta
                     xy[0] = G2lat.Dsp2pos(Parms,2*np.pi/xy[0])
@@ -1607 +1607 @@
                     if mouse.button==3:
                         data[1][1] = max(xy[0],data[1][0])
-                G2frame.PatternTree.SetItemPyData(LimitId,data)
+                G2frame.GPXtree.SetItemPyData(LimitId,data)
                 G2pdG.UpdateLimitsGrid(G2frame,data,plottype)
                 wx.CallAfter(PlotPatterns,G2frame,plotType=plottype)
@@ -1621 +1621 @@
                 pick.set_linestyle('--') # back to dashed
                 
-        elif G2frame.PatternTree.GetItemText(PickId) == 'Models':
+        elif G2frame.GPXtree.GetItemText(PickId) == 'Models':
             if ind.all() != [0]:                                    #picked a data point
-                LimitId = G2gd.GetPatternTreeItemId(G2frame,PatternId, 'Limits')
-                data = G2frame.PatternTree.GetItemPyData(LimitId)
+                LimitId = G2gd.GetGPXtreeItemId(G2frame,PatternId, 'Limits')
+                data = G2frame.GPXtree.GetItemPyData(LimitId)
                 if mouse.button==1:
                     data[1][0] = min(xy[0],data[1][1])
                 if mouse.button==3:
                     data[1][1] = max(xy[0],data[1][0])
-                G2frame.PatternTree.SetItemPyData(LimitId,data)
+                G2frame.GPXtree.SetItemPyData(LimitId,data)
                 wx.CallAfter(PlotPatterns,G2frame,plotType=plottype)
             else:                                                   #picked a limit line
                 G2frame.itemPicked = pick
-        elif (G2frame.PatternTree.GetItemText(PickId) == 'Reflection Lists' or
-                'PWDR' in G2frame.PatternTree.GetItemText(PickId)
+        elif (G2frame.GPXtree.GetItemText(PickId) == 'Reflection Lists' or
+                'PWDR' in G2frame.GPXtree.GetItemText(PickId)
                 ):
             G2frame.itemPicked = pick
@@ -1664 +1664 @@
                 G2frame.cid = Page.canvas.mpl_connect('motion_notify_event', OnDragTickmarks)
             
-        elif G2frame.PatternTree.GetItemText(PickId) == 'Background':
+        elif G2frame.GPXtree.GetItemText(PickId) == 'Background':
             # selected a fixed background point. Can move it or delete it.
             for mode,id in G2frame.dataFrame.wxID_BackPts.iteritems(): # what menu is selected?
@@ -1672 +1672 @@
             if pick.get_marker() == 'D':
                 # find the closest point
-                backDict = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,G2frame.PatternId, 'Background'))[1]
+                backDict = G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame,G2frame.PatternId, 'Background'))[1]
                 d2 = [(x-xy[0])**2+(y-xy[1])**2 for x,y in backDict['FixedPoints']]
                 G2frame.fixPtMarker = d2.index(min(d2))
@@ -1708 +1708 @@
         
         PickId = G2frame.PickId                             # points to item in tree
-        if G2frame.PatternTree.GetItemText(PickId) == 'Background' and event.xdata:
+        if G2frame.GPXtree.GetItemText(PickId) == 'Background' and event.xdata:
             if Page.toolbar._active:    # prevent ops. if a toolbar zoom button pressed
                 return 
@@ -1714 +1714 @@
             if G2frame.SubBack or G2frame.Weight or G2frame.Contour or not G2frame.SinglePlot:
                 return
-            backDict = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,G2frame.PatternId, 'Background'))[1]
+            backDict = G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame,G2frame.PatternId, 'Background'))[1]
             if 'FixedPoints' not in backDict: backDict['FixedPoints'] = []
             try:
-                Parms,Parms2 = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,G2frame.PatternId, 'Instrument Parameters'))
+                Parms,Parms2 = G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame,G2frame.PatternId, 'Instrument Parameters'))
             except TypeError:
                 return
@@ -1745 +1745 @@
         if G2frame.itemPicked is None: return
         if DifLine[0] is G2frame.itemPicked:   # respond to dragging of the difference curve
-            data = G2frame.PatternTree.GetItemPyData(PickId)
+            data = G2frame.GPXtree.GetItemPyData(PickId)
             ypos = event.ydata
             Pattern[0]['delOffset'] = -ypos
@@ -1751 +1751 @@
             wx.CallAfter(PlotPatterns,G2frame,plotType=plottype)
             return
-        Parms,Parms2 = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,G2frame.PatternId, 'Instrument Parameters'))
+        Parms,Parms2 = G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame,G2frame.PatternId, 'Instrument Parameters'))
         xpos = event.xdata
-        if G2frame.PatternTree.GetItemText(PickId) in ['Peak List','Limits'] and xpos:
+        if G2frame.GPXtree.GetItemText(PickId) in ['Peak List','Limits'] and xpos:
             lines = []
             for line in G2frame.Lines: 
@@ -1763 +1763 @@
             nxcl = len(exclLines)
             if  lineNo in [0,1] or lineNo in exclLines:
-                LimitId = G2gd.GetPatternTreeItemId(G2frame,G2frame.PatternId, 'Limits')
-                limits = G2frame.PatternTree.GetItemPyData(LimitId)
+                LimitId = G2gd.GetGPXtreeItemId(G2frame,G2frame.PatternId, 'Limits')
+                limits = G2frame.GPXtree.GetItemPyData(LimitId)
                 id = lineNo/2+1
                 id2 = lineNo%2
@@ -1777 +1777 @@
                 limits[1][0] = min(max(limits[0][0],limits[1][0]),limits[1][1])
                 limits[1][1] = max(min(limits[0][1],limits[1][1]),limits[1][0])
-                if G2frame.PatternTree.GetItemText(G2frame.PickId) == 'Limits':
+                if G2frame.GPXtree.GetItemText(G2frame.PickId) == 'Limits':
                     G2pdG.UpdateLimitsGrid(G2frame,limits,plottype)
             elif lineNo > 1+nxcl:
-                PeakId = G2gd.GetPatternTreeItemId(G2frame,G2frame.PatternId, 'Peak List')
-                peaks = G2frame.PatternTree.GetItemPyData(PeakId)
+                PeakId = G2gd.GetGPXtreeItemId(G2frame,G2frame.PatternId, 'Peak List')
+                peaks = G2frame.GPXtree.GetItemPyData(PeakId)
                 if event.button == 3:
                     del peaks['peaks'][lineNo-2-nxcl]
@@ -1793 +1793 @@
                     peaks['sigDict'] = {}        #no longer valid
                 G2pdG.UpdatePeakGrid(G2frame,peaks)
-        elif G2frame.PatternTree.GetItemText(PickId) in ['Models',] and xpos:
+        elif G2frame.GPXtree.GetItemText(PickId) in ['Models',] and xpos:
             lines = []
             for line in G2frame.Lines: 
@@ -1802 +1802 @@
                 lineNo = -1
             if  lineNo in [0,1]:
-                LimitId = G2gd.GetPatternTreeItemId(G2frame,G2frame.PatternId, 'Limits')
-                data = G2frame.PatternTree.GetItemPyData(LimitId)
+                LimitId = G2gd.GetGPXtreeItemId(G2frame,G2frame.PatternId, 'Limits')
+                data = G2frame.GPXtree.GetItemPyData(LimitId)
                 data[1][lineNo] = xpos
                 data[1][0] = min(max(data[0][0],data[1][0]),data[1][1])
                 data[1][1] = max(min(data[0][1],data[1][1]),data[1][0])
-        elif (G2frame.PatternTree.GetItemText(PickId) == 'Reflection Lists' or \
-            'PWDR' in G2frame.PatternTree.GetItemText(PickId)) and xpos:
-            Id = G2gd.GetPatternTreeItemId(G2frame,PatternId,'Reflection Lists')
+        elif (G2frame.GPXtree.GetItemText(PickId) == 'Reflection Lists' or \
+            'PWDR' in G2frame.GPXtree.GetItemText(PickId)) and xpos:
+            Id = G2gd.GetGPXtreeItemId(G2frame,PatternId,'Reflection Lists')
 #            GSASIIpath.IPyBreak()
             if Id:     
-                #Phases = G2frame.PatternTree.GetItemPyData(Id)
+                #Phases = G2frame.GPXtree.GetItemPyData(Id)
                 pick = str(G2frame.itemPicked).split('(',1)[1][:-1]
                 if 'line' not in pick:       #avoid data points, etc.
-                    data = G2frame.PatternTree.GetItemPyData(G2frame.PatternId)
+                    data = G2frame.GPXtree.GetItemPyData(G2frame.PatternId)
                     num = Page.phaseList.index(pick)
                     if num:
@@ -1840 +1840 @@
         Page.canvas.mpl_connect('button_release_event', OnRelease)
         Page.canvas.mpl_connect('button_press_event',OnPress)
-    if 'PWDR' in G2frame.PatternTree.GetItemText(G2frame.PickId):
+    if 'PWDR' in G2frame.GPXtree.GetItemText(G2frame.PickId):
         Histograms,Phases = G2frame.GetUsedHistogramsAndPhasesfromTree()
         refColors=['b','r','c','g','m','k']
         Page.phaseColors = {p:refColors[i%len(refColors)] for i,p in enumerate(Phases)}
-        Phases = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,G2frame.PatternId,'Reflection Lists'))
+        Phases = G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame,G2frame.PatternId,'Reflection Lists'))
         Page.phaseList = sorted(Phases.keys()) # define an order for phases (once!)
         G2frame.dataWindow.Bind(wx.EVT_MENU, onMoveDiffCurve, id=G2frame.dataWindow.moveDiffCurve.GetId())
@@ -1852 +1852 @@
         G2frame.dataWindow.moveTickLoc.Enable(False)
         G2frame.dataWindow.moveTickSpc.Enable(False)
-    elif G2frame.PatternTree.GetItemText(G2frame.PickId) == 'Peak List':
+    elif G2frame.GPXtree.GetItemText(G2frame.PickId) == 'Peak List':
         G2frame.dataFrame.Bind(wx.EVT_MENU, onMovePeak, id=G2frame.dataWindow.movePeak.GetId())
     # save information needed to reload from tree and redraw
-    kwargs={'PatternName':G2frame.PatternTree.GetItemText(G2frame.PatternId)}
+    kwargs={'PatternName':G2frame.GPXtree.GetItemText(G2frame.PatternId)}
     if G2frame.PickId:
-        kwargs['PickName'] = G2frame.PatternTree.GetItemText(G2frame.PickId)
+        kwargs['PickName'] = G2frame.GPXtree.GetItemText(G2frame.PickId)
     #G2frame.G2plotNB.RegisterRedrawRoutine('Powder Patterns',ReplotPattern,
     G2frame.G2plotNB.RegisterRedrawRoutine(G2frame.G2plotNB.lastRaisedPlotTab,ReplotPattern,
@@ -1916 +1916 @@
     exclLines = []
     if G2frame.SinglePlot and PatternId:
-        Pattern = G2frame.PatternTree.GetItemPyData(PatternId)
-        Pattern.append(G2frame.PatternTree.GetItemText(PatternId))
+        Pattern = G2frame.GPXtree.GetItemPyData(PatternId)
+        Pattern.append(G2frame.GPXtree.GetItemText(PatternId))
         PlotList = [Pattern,]
-        Parms,Parms2 = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,
+        Parms,Parms2 = G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame,
             G2frame.PatternId, 'Instrument Parameters'))
-        Sample = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,G2frame.PatternId, 'Sample Parameters'))
+        Sample = G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame,G2frame.PatternId, 'Sample Parameters'))
         ParmList = [Parms,]
         SampleList = [Sample,]
@@ -1931 +1931 @@
         SampleList = []
         if G2frame.selections is None:
-            choices = G2gd.GetPatternTreeDataNames(G2frame,plotType)
+            choices = G2gd.GetGPXtreeDataNames(G2frame,plotType)
         else:
             choices = G2frame.selections
         for item in choices:
-            id = G2gd.GetPatternTreeItemId(G2frame,G2frame.root, item)
-            Pattern = G2frame.PatternTree.GetItemPyData(id)
+            id = G2gd.GetGPXtreeItemId(G2frame,G2frame.root, item)
+            Pattern = G2frame.GPXtree.GetItemPyData(id)
             if len(Pattern) < 3:                    # put name on end if needed
-                Pattern.append(G2frame.PatternTree.GetItemText(id))
+                Pattern.append(G2frame.GPXtree.GetItemText(id))
             if 'Offset' not in Pattern[0]:     #plot offset data
                 Ymax = max(Pattern[1][1])
                 Pattern[0].update({'Offset':[0.0,0.0],'delOffset':0.02*Ymax,'refOffset':-0.1*Ymax,'refDelt':0.1*Ymax,})
             PlotList.append(Pattern)
-            ParmList.append(G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,
+            ParmList.append(G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame,
                 id,'Instrument Parameters'))[0])
-            SampleList.append(G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,
+            SampleList.append(G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame,
                 id, 'Sample Parameters')))
     lenX = 0
@@ -2011 +2011 @@
         xye = ma.array(ma.getdata(Pattern[1]))
         if PickId:
-            ifpicked = Pattern[2] == G2frame.PatternTree.GetItemText(PatternId)
-            LimitId = G2gd.GetPatternTreeItemId(G2frame,G2frame.PatternId,'Limits')
-            limits = G2frame.PatternTree.GetItemPyData(LimitId)
+            ifpicked = Pattern[2] == G2frame.GPXtree.GetItemText(PatternId)
+            LimitId = G2gd.GetGPXtreeItemId(G2frame,G2frame.PatternId,'Limits')
+            limits = G2frame.GPXtree.GetItemPyData(LimitId)
             excls = limits[2:]
             for excl in excls:
@@ -2042 +2042 @@
                 Y = xye[1]*Sample['Scale'][0]*(1.05)**(offsetY*N)
         if LimitId and ifpicked:
-            limits = np.array(G2frame.PatternTree.GetItemPyData(LimitId))
+            limits = np.array(G2frame.GPXtree.GetItemPyData(LimitId))
             lims = limits[1]
             if G2frame.plotStyle['qPlot'] and 'PWDR' in plottype:
@@ -2169 +2169 @@
                 Page.canvas.SetToolTipString('')
                 if PickId:
-                    if G2frame.PatternTree.GetItemText(PickId) == 'Peak List':
+                    if G2frame.GPXtree.GetItemText(PickId) == 'Peak List':
                         tip = 'On data point: Pick peak - L or R MB. On line: L-move, R-delete'
                         Page.canvas.SetToolTipString(tip)
-                        data = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,PatternId, 'Peak List'))
+                        data = G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame,PatternId, 'Peak List'))
                         selectedPeaks = list(set(
                             [row for row,col in G2frame.reflGrid.GetSelectedCells()] +
@@ -2190 +2190 @@
                             if Ni == N+1:
                                 Lines[-1].set_lw(Lines[-1].get_lw()+1)
-                    if G2frame.PatternTree.GetItemText(PickId) == 'Limits':
+                    if G2frame.GPXtree.GetItemText(PickId) == 'Limits':
                         tip = 'On data point: Lower limit - L MB; Upper limit - R MB. On limit: MB down to move'
                         Page.canvas.SetToolTipString(tip)
-                        data = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,PatternId, 'Limits'))
+                        data = G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame,PatternId, 'Limits'))
                         
             else:   #not picked
@@ -2211 +2211 @@
                     Plot.set_ylim(bottom=np.min(np.trim_zeros(Y))/2.,top=np.max(Y)*2.)
     if PickId and not G2frame.Contour:
-        Parms,Parms2 = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,PatternId, 'Instrument Parameters'))
-        if G2frame.PatternTree.GetItemText(PickId) in ['Index Peak List','Unit Cells List']:
-            peaks = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,PatternId, 'Index Peak List'))
+        Parms,Parms2 = G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame,PatternId, 'Instrument Parameters'))
+        if G2frame.GPXtree.GetItemText(PickId) in ['Index Peak List','Unit Cells List']:
+            peaks = G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame,PatternId, 'Index Peak List'))
             if not len(peaks): return # are there any peaks?
             for peak in peaks[0]:
@@ -2233 +2233 @@
                 else:
                     Plot.axvline(hkl[-2],color=clr,dashes=(5,5))
-        elif G2frame.PatternTree.GetItemText(PickId) in ['Reflection Lists'] or \
-            'PWDR' in G2frame.PatternTree.GetItemText(PickId):
-            Phases = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,PatternId,'Reflection Lists'))
+        elif G2frame.GPXtree.GetItemText(PickId) in ['Reflection Lists'] or \
+            'PWDR' in G2frame.GPXtree.GetItemText(PickId):
+            Phases = G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame,PatternId,'Reflection Lists'))
             l = GSASIIpath.GetConfigValue('Tick_length',8.0)
             w = GSASIIpath.GetConfigValue('Tick_width',1.)
@@ -2268 +2268 @@
     else:
         G2frame.Lines = Lines
-    if PickId and G2frame.PatternTree.GetItemText(PickId) == 'Background':
+    if PickId and G2frame.GPXtree.GetItemText(PickId) == 'Background':
         # plot fixed background points
-        backDict = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,G2frame.PatternId, 'Background'))[1]
+        backDict = G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame,G2frame.PatternId, 'Background'))[1]
         try:
-            Parms,Parms2 = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,G2frame.PatternId, 'Instrument Parameters'))
+            Parms,Parms2 = G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame,G2frame.PatternId, 'Instrument Parameters'))
         except TypeError:
             Parms = None
@@ -2310 +2310 @@
     # and sqrt(-ve) in np.where usage               
 #    G2frame.Pwdr = True
-    if 'PWDR' in G2frame.PatternTree.GetItemText(G2frame.PickId):
+    if 'PWDR' in G2frame.GPXtree.GetItemText(G2frame.PickId):
         if len(Page.tickDict.keys()) == 1:
             G2frame.dataWindow.moveTickLoc.Enable(True)
@@ -2326 +2326 @@
     'Produces normal probability plot for a powder or single crystal histogram'
     if PatternName:
-        G2frame.PatternId = G2gd.GetPatternTreeItemId(G2frame, G2frame.root, PatternName)
+        G2frame.PatternId = G2gd.GetGPXtreeItemId(G2frame, G2frame.root, PatternName)
     new,plotNum,Page,Plot,lim = G2frame.G2plotNB.FindPlotTab('Error analysis','mpl')
     if new:
@@ -2335 +2335 @@
                                            PlotDeltSig,(
                                                G2frame,kind,
-                                               G2frame.PatternTree.GetItemText(G2frame.PatternId))
+                                               G2frame.GPXtree.GetItemText(G2frame.PatternId))
                                            )
     Page.Choice = None
     PatternId = G2frame.PatternId
-    Pattern = G2frame.PatternTree.GetItemPyData(PatternId)
-    Pattern.append(G2frame.PatternTree.GetItemText(PatternId))
+    Pattern = G2frame.GPXtree.GetItemPyData(PatternId)
+    Pattern.append(G2frame.GPXtree.GetItemText(PatternId))
     wtFactor = Pattern[0]['wtFactor']
     if kind == 'PWDR':
-        limits = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,PatternId, 'Limits'))[1]
+        limits = G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame,PatternId, 'Limits'))[1]
         xye = np.array(Pattern[1])
         xmin = np.searchsorted(xye[0],limits[0])
@@ -2446 +2446 @@
             G2frame.Waterfall = not G2frame.Waterfall
         elif event.key == 'f' and not G2frame.SinglePlot:
-            choices = G2gd.GetPatternTreeDataNames(G2frame,'PDF ')
+            choices = G2gd.GetGPXtreeDataNames(G2frame,'PDF ')
             dlg = G2G.G2MultiChoiceDialog(G2frame.dataFrame,'Select dataset to plot', 
                 'Multidata plot selection',choices)
@@ -2596 +2596 @@
     PatternId = G2frame.PatternId
     if not PatternId:  return
-    pId = G2gd.GetPatternTreeItemId(G2frame,PatternId, 'PDF Controls')
+    pId = G2gd.GetGPXtreeItemId(G2frame,PatternId, 'PDF Controls')
     if not pId:  return
-    PDFdata = G2frame.PatternTree.GetItemPyData(pId)
+    PDFdata = G2frame.GPXtree.GetItemPyData(pId)
     numbDen = 0.
     if 'ElList' in PDFdata:
@@ -2610 +2610 @@
         PlotList = []
         if G2frame.PDFselections is None:
-            choices = G2gd.GetPatternTreeDataNames(G2frame,'PDF ')
+            choices = G2gd.GetGPXtreeDataNames(G2frame,'PDF ')
         else:
             choices = G2frame.PDFselections
         for item in choices:
-            Pid = G2gd.GetPatternTreeItemId(G2frame,G2frame.root,item)
-            Id = G2gd.GetPatternTreeItemId(G2frame,Pid,'PDF Controls')
-            Pattern = G2frame.PatternTree.GetItemPyData(Id)
+            Pid = G2gd.GetGPXtreeItemId(G2frame,G2frame.root,item)
+            Id = G2gd.GetGPXtreeItemId(G2frame,Pid,'PDF Controls')
+            Pattern = G2frame.GPXtree.GetItemPyData(Id)
             if Pattern:
                 PlotList.append(Pattern[plotType])
@@ -3155 +3155 @@
     Page.Choice = None
     PatternId = G2frame.PatternId
-    data = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,PatternId, 'Models'))
+    data = G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame,PatternId, 'Models'))
     Bins,Dbins,BinMag = data['Size']['Distribution']
     Plot.set_title('Size Distribution')
@@ -3185 +3185 @@
             Page.canvas.SetCursor(wx.CROSS_CURSOR)
             G2frame.G2plotNB.status.SetStatusText('2-theta =%9.3f '%(xpos,),1)
-            if G2frame.PickId and G2frame.PatternTree.GetItemText(G2frame.PickId) in ['Index Peak List','Unit Cells List']:
+            if G2frame.PickId and G2frame.GPXtree.GetItemText(G2frame.PickId) in ['Index Peak List','Unit Cells List']:
                 found = []
                 if len(G2frame.HKL):
@@ -3204 +3204 @@
     Plot.set_xlabel(r'$\mathsf{2\theta}$',fontsize=14)
     PatternId = G2frame.PatternId
-    peaks = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,PatternId, 'Index Peak List'))[0]
+    peaks = G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame,PatternId, 'Index Peak List'))[0]
     for peak in peaks:
         Plot.axvline(peak[0],color='b')
@@ -3232 +3232 @@
 #    gamFW2 = lambda s,g: math.sqrt(s**2+(0.4654996*g)**2)+.5345004*g  #Ubaldo Bafile - private communication
     if PatternName:
-        G2frame.PatternId = G2gd.GetPatternTreeItemId(G2frame, G2frame.root, PatternName)
+        G2frame.PatternId = G2gd.GetGPXtreeItemId(G2frame, G2frame.root, PatternName)
     PatternId = G2frame.PatternId
-    limitID = G2gd.GetPatternTreeItemId(G2frame,PatternId, 'Limits')
+    limitID = G2gd.GetGPXtreeItemId(G2frame,PatternId, 'Limits')
     if limitID:
-        limits = G2frame.PatternTree.GetItemPyData(limitID)[:2]
+        limits = G2frame.GPXtree.GetItemPyData(limitID)[:2]
     else:
         return
-    Parms,Parms2 = G2frame.PatternTree.GetItemPyData( \
-        G2gd.GetPatternTreeItemId(G2frame,PatternId, 'Instrument Parameters'))
+    Parms,Parms2 = G2frame.GPXtree.GetItemPyData( \
+        G2gd.GetGPXtreeItemId(G2frame,PatternId, 'Instrument Parameters'))
     if 'PKS' in Parms['Type'][0]:
         return
@@ -3248 +3248 @@
         lam = G2mth.getWave(Parms)
     try:  # PATCH: deal with older peak lists, before changed to dict to implement TOF
-        peaks = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,PatternId, 'Peak List'))['peaks']
+        peaks = G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame,PatternId, 'Peak List'))['peaks']
     except TypeError:
         print "Your peak list needs reformatting...",
-        item = G2gd.GetPatternTreeItemId(G2frame,PatternId, 'Peak List')
-        G2frame.PatternTree.SelectItem(item)  
-        item = G2gd.GetPatternTreeItemId(G2frame,PatternId, 'Instrument Parameters')
-        G2frame.PatternTree.SelectItem(item)
+        item = G2gd.GetGPXtreeItemId(G2frame,PatternId, 'Peak List')
+        G2frame.GPXtree.SelectItem(item)  
+        item = G2gd.GetGPXtreeItemId(G2frame,PatternId, 'Instrument Parameters')
+        G2frame.GPXtree.SelectItem(item)
         print "done"
         return
@@ -3264 +3264 @@
     # save information needed to reload from tree and redraw
     G2frame.G2plotNB.RegisterRedrawRoutine(G2frame.G2plotNB.lastRaisedPlotTab,
-            PlotPeakWidths,(G2frame,G2frame.PatternTree.GetItemText(G2frame.PatternId))
+            PlotPeakWidths,(G2frame,G2frame.GPXtree.GetItemText(G2frame.PatternId))
             )
 
-    TreeItemText = G2frame.PatternTree.GetItemText(G2frame.PatternId)
+    TreeItemText = G2frame.GPXtree.GetItemText(G2frame.PatternId)
     G2frame.G2plotNB.status.SetStatusText('histogram: '+TreeItemText,1)
     Page.Choice = None
@@ -3571 +3571 @@
             Plot.set_ylabel('MRD',fontsize=14)
     elif plotType in ['Inv. pole figure',]:
-        Id = G2gd.GetPatternTreeItemId(G2frame,G2frame.root,hist)
-        rId = G2gd.GetPatternTreeItemId(G2frame,Id,'Reflection Lists')
-        RefData = G2frame.PatternTree.GetItemPyData(rId)[phase]
+        Id = G2gd.GetGPXtreeItemId(G2frame,G2frame.root,hist)
+        rId = G2gd.GetGPXtreeItemId(G2frame,Id,'Reflection Lists')
+        RefData = G2frame.GPXtree.GetItemPyData(rId)[phase]
         Type = RefData['Type']
         Refs = RefData['RefList'].T
@@ -4358 +4358 @@
     :param wx.Frame G2frame: The main GSAS-II tree "window"
     '''
-    Masks = G2frame.PatternTree.GetItemPyData(
-        G2gd.GetPatternTreeItemId(G2frame,G2frame.Image, 'Masks'))
+    Masks = G2frame.GPXtree.GetItemPyData(
+        G2gd.GetGPXtreeItemId(G2frame,G2frame.Image, 'Masks'))
     if G2frame.MaskKey == 'f':
         new,plotNum,Page,Plot,lim = G2frame.G2plotNB.FindPlotTab('2D Powder Image','mpl',newImage=False)
@@ -4396 +4396 @@
     '''
     G2frame.GetStatusBar().SetStatusText('Add strain ring active - LB pick d-zero value',0)
-    G2frame.PickId = G2gd.GetPatternTreeItemId(G2frame,G2frame.Image, 'Stress/Strain')
-    data = G2frame.PatternTree.GetItemPyData(G2frame.PickId)
+    G2frame.PickId = G2gd.GetGPXtreeItemId(G2frame,G2frame.Image, 'Stress/Strain')
+    data = G2frame.GPXtree.GetItemPyData(G2frame.PickId)
     return data
 
@@ -4467 +4467 @@
     global Data,Masks,StrSta  # RVD: these are needed for multiple image controls/masks 
     colors=['b','g','r','c','m','k'] 
-    Data = G2frame.PatternTree.GetItemPyData(
-        G2gd.GetPatternTreeItemId(G2frame,G2frame.Image, 'Image Controls'))
+    Data = G2frame.GPXtree.GetItemPyData(
+        G2gd.GetGPXtreeItemId(G2frame,G2frame.Image, 'Image Controls'))
 # patch
     if 'invert_x' not in Data:
@@ -4474 +4474 @@
         Data['invert_y'] = True
 # end patch
-    Masks = G2frame.PatternTree.GetItemPyData(
-        G2gd.GetPatternTreeItemId(G2frame,G2frame.Image, 'Masks'))
+    Masks = G2frame.GPXtree.GetItemPyData(
+        G2gd.GetGPXtreeItemId(G2frame,G2frame.Image, 'Masks'))
     try:    #may be absent
-        StrSta = G2frame.PatternTree.GetItemPyData(
-            G2gd.GetPatternTreeItemId(G2frame,G2frame.Image, 'Stress/Strain'))
+        StrSta = G2frame.GPXtree.GetItemPyData(
+            G2gd.GetGPXtreeItemId(G2frame,G2frame.Image, 'Stress/Strain'))
     except TypeError:   #is missing
         StrSta = {}
@@ -4492 +4492 @@
             scalex = 1000./pixelSize[0]         #microns --> 1/mm
             scaley = 1000./pixelSize[1]
-            if item and G2frame.PatternTree.GetItemText(G2frame.PickId) == 'Image Controls':
+            if item and G2frame.GPXtree.GetItemText(G2frame.PickId) == 'Image Controls':
                 if 'Text' in str(item):
                     Page.canvas.SetToolTipString('%8.3f %8.3fmm'%(event.xdata,event.ydata))
@@ -4526 +4526 @@
     def OnImPlotKeyPress(event):
         try:
-            treeItem = G2frame.PatternTree.GetItemText(G2frame.PickId)
+            treeItem = G2frame.GPXtree.GetItemText(G2frame.PickId)
         except TypeError:
             return
@@ -4792 +4792 @@
 
         if G2frame.itemPicked is not None: return
-        if G2frame.PatternTree.GetItemText(G2frame.PickId) == 'Image Controls':
+        if G2frame.GPXtree.GetItemText(G2frame.PickId) == 'Image Controls':
             G2frame.itemPicked = pick = event.artist
             G2frame.mousePicked = event.mouseevent
@@ -4804 +4804 @@
             G2frame.cid = Page.canvas.mpl_connect('motion_notify_event', OnDragIntBound)
             pick.set_linestyle(saveLinestyle) # back to original
-        elif G2frame.PatternTree.GetItemText(G2frame.PickId) == 'Masks':
+        elif G2frame.GPXtree.GetItemText(G2frame.PickId) == 'Masks':
             # prepare to animate dragging of mask
             G2frame.itemPicked = pick = event.artist
@@ -4839 +4839 @@
         '''
         try:
-            treeItem = G2frame.PatternTree.GetItemText(G2frame.PickId)
+            treeItem = G2frame.GPXtree.GetItemText(G2frame.PickId)
         except TypeError:
             return
@@ -5079 +5079 @@
         Page.canvas.mpl_connect('button_release_event', OnImRelease)
     Page.Choice = None
-    Title = G2frame.PatternTree.GetItemText(G2frame.Image)[4:]
+    Title = G2frame.GPXtree.GetItemText(G2frame.Image)[4:]
     G2frame.G2plotNB.status.DestroyChildren()
     if G2frame.logPlot:
@@ -5085 +5085 @@
     Plot.set_title(Title)
     try:
-        if G2frame.PatternTree.GetItemText(G2frame.PickId) in ['Image Controls',]:
+        if G2frame.GPXtree.GetItemText(G2frame.PickId) in ['Image Controls',]:
             Page.Choice = (' key press','l: log(I) on','d: set dmin','x: flip x','y: flip y',)
             if G2frame.logPlot:
                 Page.Choice[1] = 'l: log(I) off'
             Page.keyPress = OnImPlotKeyPress
-        elif G2frame.PatternTree.GetItemText(G2frame.PickId) in ['Masks',]:
+        elif G2frame.GPXtree.GetItemText(G2frame.PickId) in ['Masks',]:
             Page.Choice = [' key press','l: log(I) on','a: arc mask','r: ring mask',
                 'p: polygon mask','f: frame mask',
@@ -5099 +5099 @@
                 Page.Choice[1] = 'l: log(I) off'
             Page.keyPress = OnImPlotKeyPress
-        elif G2frame.PatternTree.GetItemText(G2frame.PickId) in ['Stress/Strain',]:
+        elif G2frame.GPXtree.GetItemText(G2frame.PickId) in ['Stress/Strain',]:
             Page.Choice = (' key press','a: add new ring',)
             Page.keyPress = OnImPlotKeyPress
     except TypeError:
         pass
-    size,imagefile,imagetag = G2frame.PatternTree.GetImageLoc(G2frame.Image)
+    size,imagefile,imagetag = G2frame.GPXtree.GetImageLoc(G2frame.Image)
 
     imScale = 1
@@ -5142 +5142 @@
             
         Plot.plot(xcent,ycent,'x')
-        #G2frame.PatternTree.GetItemText(item)
+        #G2frame.GPXtree.GetItemText(item)
         if Data['showLines']: # draw integration range arc/circles/lines
             LRAzim = Data['LRazimuth']                  #NB: integers
@@ -5185 +5185 @@
                 Plot.plot([arcxI[ind],arcxO[ind]],[arcyI[ind],arcyO[ind]],color='k',dashes=(5,5))
                     
-        if G2frame.PickId and G2frame.PatternTree.GetItemText(G2frame.PickId) in ['Image Controls',]:
+        if G2frame.PickId and G2frame.GPXtree.GetItemText(G2frame.PickId) in ['Image Controls',]:
             for xring,yring in Data['ring']:
                 Plot.plot(xring,yring,'r+',picker=3)
@@ -5199 +5199 @@
                     Plot.add_artist(Ellipse([cent[0],cent[1]],2*width,2*height,phi,ec=col,fc='none'))
                     Plot.text(cent[0],cent[1],'+',color=col,ha='center',va='center')
-        if G2frame.PickId and G2frame.PatternTree.GetItemText(G2frame.PickId) in ['Stress/Strain',]:
+        if G2frame.PickId and G2frame.GPXtree.GetItemText(G2frame.PickId) in ['Stress/Strain',]:
             for N,ring in enumerate(StrSta['d-zero']):
                 if 'ImxyCalc' in ring:
@@ -5327 +5327 @@
     Page.Choice = None
         
-    Data = G2frame.PatternTree.GetItemPyData(
-        G2gd.GetPatternTreeItemId(G2frame,G2frame.Image, 'Image Controls'))
+    Data = G2frame.GPXtree.GetItemPyData(
+        G2gd.GetGPXtreeItemId(G2frame,G2frame.Image, 'Image Controls'))
     image = G2frame.Integrate[0]
     xsc = G2frame.Integrate[1]
@@ -5334 +5334 @@
     Imin,Imax = Data['range'][1]
     acolor = mpl.cm.get_cmap(Data['color'])
-    Plot.set_title(G2frame.PatternTree.GetItemText(G2frame.Image)[4:])
+    Plot.set_title(G2frame.GPXtree.GetItemText(G2frame.Image)[4:])
     Plot.set_ylabel('azimuth',fontsize=12)
     Plot.set_xlabel('2-theta',fontsize=12)
@@ -5381 +5381 @@
         Page.views = False
     Page.Choice = None
-    Data = G2frame.PatternTree.GetItemPyData(
-        G2gd.GetPatternTreeItemId(G2frame,G2frame.Image, 'Image Controls'))
+    Data = G2frame.GPXtree.GetItemPyData(
+        G2gd.GetGPXtreeItemId(G2frame,G2frame.Image, 'Image Controls'))
     Imin,Imax = Data['range'][1]
     step = (Imax-Imin)/5.
     V = np.arange(Imin,Imax,step)
     acolor = mpl.cm.get_cmap(Data['color'])
-    Plot.set_title(G2frame.PatternTree.GetItemText(G2frame.Image)[4:])
+    Plot.set_title(G2frame.GPXtree.GetItemText(G2frame.Image)[4:])
     Plot.set_xlabel('azimuth',fontsize=12)
     Plot.set_ylabel('2-theta',fontsize=12)