Changeset 1250


Ignore:
Timestamp:
Mar 14, 2014 12:36:02 PM (8 years ago)
Author:
vondreele
Message:

fix cursor position in SAS size plot
sky default = -3
fix background handling in SASD

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIplot.py

    r1248 r1250  
    14141414            Page.canvas.SetCursor(wx.CROSS_CURSOR)
    14151415            try:
    1416                 G2frame.G2plotNB.status.SetStatusText('diameter =%9.3g f(D) =%9.3f'%(ypos,xpos),1)                   
     1416                G2frame.G2plotNB.status.SetStatusText('diameter =%9.3f f(D) =%9.3g'%(xpos,ypos),1)                   
    14171417            except TypeError:
    14181418                G2frame.G2plotNB.status.SetStatusText('Select Strain pattern first',1)
  • trunk/GSASIIpwdGUI.py

    r1249 r1250  
    8585    return {'Back':[0.0,False],'Size':{'MinDiam':50,'MaxDiam':10000,'Nbins':100,
    8686        'logBins':True,'Method':'MaxEnt','Distribution':[],
    87         'Shape':['Spheroid',1.0],'MaxEnt':{'Niter':100,'Precision':0.01,'Sky':-6},
     87        'Shape':['Spheroid',1.0],'MaxEnt':{'Niter':100,'Precision':0.01,'Sky':-3},
    8888        'IPG':{'Niter':100,'Approach':0.8},'Reg':{},},           
    8989        'Unified':{'Levels':[],},           
  • trunk/GSASIIsasd.py

    r1249 r1250  
    733733    Ibeg = np.searchsorted(Q,Qmin)
    734734    Ifin = np.searchsorted(Q,Qmax)
    735     if Back[1]:
    736         Ib = Back[0]
    737         Ic[Ibeg:Ifin] = Back[0]
    738735    Gmat = G_matrix(Q[Ibeg:Ifin],Bins,Contrast,shapes[Shape][0],shapes[Shape][1],args=Parms)
    739736    chisq,BinMag,Ic[Ibeg:Ifin] = MaxEnt_SB(Scale*Io[Ibeg:Ifin]-Back[0],
    740737        Scale/np.sqrt(wtFactor*wt[Ibeg:Ifin]),BinsBack,
    741738        data['Size']['MaxEnt']['Niter'],Gmat,report=True)
     739    if Back[1]:
     740        Ib = Back[0]
     741        Ic[Ibeg:Ifin] += Back[0]
    742742    print ' Final chi^2: %.3f'%(chisq)
    743743    Vols = shapes[Shape][1](Bins,Parms)
Note: See TracChangeset for help on using the changeset viewer.