Changeset 3906 for trunk/GSASIIplot.py
 Timestamp:
 Apr 16, 2019 9:39:40 PM (3 years ago)
 File:

 1 edited
Legend:
 Unmodified
 Added
 Removed

trunk/GSASIIplot.py
r3900 r3906 2751 2751 PlotList = [Pattern,] 2752 2752 PId = G2gd.GetGPXtreeItemId(G2frame,G2frame.PatternId, 'Background') 2753 Pattern[0]['BackFile'] = ['',1.0 ]2753 Pattern[0]['BackFile'] = ['',1.0,False] 2754 2754 if PId: 2755 Pattern[0]['BackFile'] = G2frame.GPXtree.GetItemPyData(PId)[1].get('background PWDR',['',1.0 ])2755 Pattern[0]['BackFile'] = G2frame.GPXtree.GetItemPyData(PId)[1].get('background PWDR',['',1.0,False]) 2756 2756 Parms,Parms2 = G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame, 2757 2757 G2frame.PatternId, 'Instrument Parameters')) … … 2786 2786 Page.plotStyle.update({'Offset':[0.0,0.0],'delOffset':0.02*Ymax,'refOffset':0.1*Ymax,'refDelt':0.1*Ymax,}) 2787 2787 PId = G2gd.GetGPXtreeItemId(G2frame,G2frame.PatternId, 'Background') 2788 Pattern[0]['BackFile'] = ['',1.0 ]2788 Pattern[0]['BackFile'] = ['',1.0,False] 2789 2789 if PId: 2790 Pattern[0]['BackFile'] = G2frame.GPXtree.GetItemPyData(PId)[1].get('background PWDR',['',1.0 ])2790 Pattern[0]['BackFile'] = G2frame.GPXtree.GetItemPyData(PId)[1].get('background PWDR',['',1.0,False]) 2791 2791 PlotList.append(Pattern) 2792 2792 ParmList.append(G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame, … … 2805 2805 for ip,Pattern in enumerate(PlotList): 2806 2806 xye = Pattern[1] 2807 bxye = G2pdG.GetFileBackground(G2frame,xye,Pattern)2807 #bxye = G2pdG.GetFileBackground(G2frame,xye,Pattern) 2808 2808 if xye[1] is None: continue 2809 if Ymax is None: Ymax = max(xye[1] +bxye)2810 Ymax = max(Ymax,max(xye[1] +bxye))2809 if Ymax is None: Ymax = max(xye[1]) 2810 Ymax = max(Ymax,max(xye[1])) 2811 2811 if Ymax is None: return # nothing to plot 2812 2812 offsetX = Page.plotStyle['Offset'][1] … … 2880 2880 xye = np.array(ma.getdata(Pattern[1])) # strips mask 2881 2881 xye0 = Pattern[1][0] # keeps mask 2882 bxye = G2pdG.GetFileBackground(G2frame,xye,Pattern)2882 #bxye = G2pdG.GetFileBackground(G2frame,xye,Pattern) 2883 2883 if PickId: 2884 2884 ifpicked = Pattern[2] == G2frame.GPXtree.GetItemText(PatternId) … … 2953 2953 if Page.plotStyle['sqrtPlot']: 2954 2954 olderr = np.seterr(invalid='ignore') #get around sqrt(ve) error 2955 Y = np.where(xye[1] +bxye>=0.,np.sqrt(xye[1]+bxye),np.sqrt(xye[1]bxye))+bxye+NoffY*Ymax/100.02955 Y = np.where(xye[1]>=0.,np.sqrt(xye[1]),np.sqrt(xye[1]))+NoffY*Ymax/100.0 2956 2956 np.seterr(invalid=olderr['invalid']) 2957 2957 elif 'PWDR' in plottype and G2frame.SinglePlot and not ( 2958 2958 Page.plotStyle['logPlot'] or Page.plotStyle['sqrtPlot'] or G2frame.Contour): 2959 Y = xye[1]*multArray+ bxye+NoffY*Ymax/100.02959 Y = xye[1]*multArray+NoffY*Ymax/100.0 2960 2960 else: 2961 Y = xye[1]+ bxye+NoffY*Ymax/100.02961 Y = xye[1]+NoffY*Ymax/100.0 2962 2962 elif plottype in ['SASD','REFD']: 2963 2963 if plottype == 'SASD':
Note: See TracChangeset
for help on using the changeset viewer.