Changeset 5077
- Timestamp:
- Nov 13, 2021 8:47:59 AM (7 months ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/GSASIIplot.py
r5076 r5077 3590 3590 picker=True,pickradius=3.,clip_on=Clip_on,label=incCptn('obs')) 3591 3591 if G2frame.SinglePlot or G2frame.plusPlot: 3592 Plot.plot(X,Z,colors[1],picker=False,label=incCptn('calc') )3592 Plot.plot(X,Z,colors[1],picker=False,label=incCptn('calc'),linewidth=1.5) 3593 3593 if G2frame.plusPlot: 3594 Plot.plot(X,W,colors[2],picker=False,label=incCptn('bkg') ) #background3594 Plot.plot(X,W,colors[2],picker=False,label=incCptn('bkg'),linewidth=1.5) #background 3595 3595 elif plottype in ['SASD','REFD']: 3596 3596 try: … … 3612 3612 Plot.plot(X,YB,marker=pP,color=colors[0],linewidth=lW, 3613 3613 picker=True,pickradius=3.,clip_on=Clip_on,label=incCptn('obs')) 3614 Plot.plot(X,W,colors[1],picker=False,label=incCptn('bkg') ) #const. background3615 Plot.plot(X,ZB,colors[2],picker=False,label=incCptn('calc') )3614 Plot.plot(X,W,colors[1],picker=False,label=incCptn('bkg'),linewidth=1.5) #const. background 3615 Plot.plot(X,ZB,colors[2],picker=False,label=incCptn('calc'),linewidth=1.5) 3616 3616 else: # not logPlot 3617 3617 ymax = 1. … … 3623 3623 picker=False,clip_on=Clip_on,label=incCptn('obs-bkg')) #Io-Ib 3624 3624 if np.any(Z): #only if there is a calc pattern 3625 CalcLine = Plot.plot(X,(Z-W)/ymax,colors[1],picker=False,label=incCptn('calc-bkg')) #Ic-Ib 3625 CalcLine = Plot.plot(X,(Z-W)/ymax,colors[1],picker=False, 3626 label=incCptn('calc-bkg'),linewidth=1.5) #Ic-Ib 3626 3627 else: 3627 3628 Plot.plot(X,YB,color=colors[0],marker=pP,linewidth=lW, 3628 3629 picker=True,pickradius=3.,clip_on=Clip_on,label=incCptn('obs')) 3629 Plot.plot(X,ZB,colors[2],picker=False,label=incCptn('calc') )3630 Plot.plot(X,ZB,colors[2],picker=False,label=incCptn('calc'),linewidth=1.5) 3630 3631 else: 3631 3632 if 'PWDR' in plottype: 3632 3633 ObsLine = Plot.plot(Xum,Y/ymax,color=colors[0],marker=pP,linewidth=lW, 3633 3634 picker=True,pickradius=3.,clip_on=Clip_on,label=incCptn('obs')) #Io 3634 CalcLine = Plot.plot(X,Z/ymax,colors[1],picker=False,label=incCptn('calc') ) #Ic3635 CalcLine = Plot.plot(X,Z/ymax,colors[1],picker=False,label=incCptn('calc'),linewidth=1.5) #Ic 3635 3636 else: 3636 3637 Plot.plot(X,YB,color=colors[0],marker=pP,linewidth=lW, 3637 3638 picker=True,pickradius=3.,clip_on=Clip_on,label=incCptn('obs')) 3638 Plot.plot(X,ZB,colors[2],picker=False,label=incCptn('calc') )3639 Plot.plot(X,ZB,colors[2],picker=False,label=incCptn('calc'),linewidth=1.5) 3639 3640 if 'PWDR' in plottype and (G2frame.SinglePlot and G2frame.plusPlot): 3640 BackLine = Plot.plot(X,W/ymax,colors[2],picker=False,label=incCptn('bkg') ) #Ib3641 BackLine = Plot.plot(X,W/ymax,colors[2],picker=False,label=incCptn('bkg'),linewidth=1.5) #Ib 3641 3642 if not G2frame.Weight and np.any(Z): 3642 DifLine = Plot.plot(X,D/ymax,colors[3], 3643 DifLine = Plot.plot(X,D/ymax,colors[3],linewidth=1.5, 3643 3644 picker=True,pickradius=1.,label=incCptn('diff')) #Io-Ic 3644 3645 Plot.axhline(0.,color='k',label='_zero') … … 3683 3684 try: 3684 3685 Plot.semilogy(X,Y,color=mcolors.cmap(icolor), # >=3.3 3685 picker=False,nonpositive='mask')3686 picker=False,nonpositive='mask',linewidth=1.5) 3686 3687 except: 3687 3688 Plot.semilogy(X,Y,color=mcolors.cmap(icolor), 3688 3689 picker=False,nonposy='mask') 3689 3690 elif plottype in ['SASD','REFD']: 3690 3691 try: 3691 3692 Plot.semilogy(X,Y,color=mcolors.cmap(icolor), 3692 picker=False,nonpositive='mask')3693 picker=False,nonpositive='mask',linewidth=1.5) 3693 3694 except: 3694 3695 Plot.semilogy(X,Y,color=mcolors.cmap(icolor), 3695 3696 picker=False,nonposy='mask') 3696 3697 else: 3697 3698 if 'PWDR' in plottype: … … 3700 3701 try: 3701 3702 Plot.loglog(X,Y,mcolors.cmap(icolor), 3702 picker=False,nonpositive='mask')3703 picker=False,nonpositive='mask',linewidth=1.5) 3703 3704 except: 3704 3705 Plot.loglog(X,Y,mcolors.cmap(icolor), 3705 3706 picker=False,nonposy='mask') 3706 3707 Plot.set_ylim(bottom=np.min(np.trim_zeros(Y))/2.,top=np.max(Y)*2.) 3707 3708
Note: See TracChangeset
for help on using the changeset viewer.