Changeset 1250

Timestamp:

Mar 14, 2014 12:36:02 PM (10 years ago)

Author:

vondreele

Message:

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

Location:

trunk

Files:

• GSASIIplot.py (modified) (1 diff)
• GSASIIpwdGUI.py (modified) (1 diff)
• GSASIIsasd.py (modified) (1 diff)

trunk/GSASIIplot.py

@@ -1414 +1414 @@
             Page.canvas.SetCursor(wx.CROSS_CURSOR)
             try:
-                G2frame.G2plotNB.status.SetStatusText('diameter =%9.3g f(D) =%9.3f'%(ypos,xpos),1)                   
+                G2frame.G2plotNB.status.SetStatusText('diameter =%9.3f f(D) =%9.3g'%(xpos,ypos),1)                   
             except TypeError:
                 G2frame.G2plotNB.status.SetStatusText('Select Strain pattern first',1)

trunk/GSASIIpwdGUI.py

@@ -85 +85 @@
     return {'Back':[0.0,False],'Size':{'MinDiam':50,'MaxDiam':10000,'Nbins':100,
         'logBins':True,'Method':'MaxEnt','Distribution':[],
-        'Shape':['Spheroid',1.0],'MaxEnt':{'Niter':100,'Precision':0.01,'Sky':-6},
+        'Shape':['Spheroid',1.0],'MaxEnt':{'Niter':100,'Precision':0.01,'Sky':-3},
         'IPG':{'Niter':100,'Approach':0.8},'Reg':{},},            
         'Unified':{'Levels':[],},            

trunk/GSASIIsasd.py

@@ -733 +733 @@
     Ibeg = np.searchsorted(Q,Qmin)
     Ifin = np.searchsorted(Q,Qmax)
-    if Back[1]:
-        Ib = Back[0]
-        Ic[Ibeg:Ifin] = Back[0]
     Gmat = G_matrix(Q[Ibeg:Ifin],Bins,Contrast,shapes[Shape][0],shapes[Shape][1],args=Parms)
     chisq,BinMag,Ic[Ibeg:Ifin] = MaxEnt_SB(Scale*Io[Ibeg:Ifin]-Back[0],
         Scale/np.sqrt(wtFactor*wt[Ibeg:Ifin]),BinsBack,
         data['Size']['MaxEnt']['Niter'],Gmat,report=True)
+    if Back[1]:
+        Ib = Back[0]
+        Ic[Ibeg:Ifin] += Back[0]
     print ' Final chi^2: %.3f'%(chisq)
     Vols = shapes[Shape][1](Bins,Parms)