Changeset 1319

Timestamp:

May 2, 2014 4:00:11 PM (8 years ago)

Author:

vondreele

Message:

fix status line stuff in G2plot

Location:

trunk

Files:

• GSASIIplot.py (modified) (2 diffs)
• GSASIIsasd.py (modified) (4 diffs)

trunk/GSASIIplot.py

@@ -2367 +2367 @@
                 Plot.plot(X,Y,'o',label=name)
         if Page.fitvals:
-                Plot.plot(X,fitvals)
-                Plot.plot(X,fitvals,'*',label='Fit')
+                Plot.plot(X,fitvals,label='Fit')
             
         Plot.legend(loc='best')
@@ -2570 +2569 @@
                         Data['ring'].append([xpos,ypos])
                 elif event.button == 3:
-                    G2frame.dataFrame.GetStatusBar().SetStatusText('Calibrating...',1)
+                    G2frame.dataFrame.GetStatusBar().SetStatusText('Calibrating...',0)
                     if G2img.ImageCalibrate(G2frame,Data):
-                        G2frame.dataFrame.GetStatusBar().SetStatusText('Calibration successful - Show ring picks to check',1)
+                        G2frame.dataFrame.GetStatusBar().SetStatusText('Calibration successful - Show ring picks to check',0)
                         print 'Calibration successful'
                     else:
-                        G2frame.dataFrame.GetStatusBar().SetStatusText('Calibration failed - Show ring picks to diagnose',1)
+                        G2frame.dataFrame.GetStatusBar().SetStatusText('Calibration failed - Show ring picks to diagnose',0)
                         print 'Calibration failed'
                     G2frame.ifGetRing = False

trunk/GSASIIsasd.py

@@ -1001 +1001 @@
     return (G*P/Rg**P)*np.exp(scsp.gammaln(P/2))
     
+def SmearData(Ic,Q,slitLength):
+    return Ic   #for now
+    
 ###############################################################################
 #### Size distribution
@@ -1012 +1015 @@
         'Cylinder diam':[CylinderDFF,CylinderDVol]}
     Shape = data['Size']['Shape'][0]
+    SlitLen = Sample.get('SlitLen',0.0)
     Parms = data['Size']['Shape'][1:]
     if data['Size']['logBins']:
@@ -1071 +1075 @@
 
     def GetModelParms():
-        parmDict = {'Scale':Sample['Scale'][0]}
+        parmDict = {'Scale':Sample['Scale'][0],'SlitLen':Sample.get('SlitLen',0.0),}
         varyList = []
         values = []
@@ -1263 +1267 @@
     matFrac = partData['Matrix']['VolFrac'] #[value,flag]        
     Scale = Sample['Scale']     #[value,flag]
+    SlitLen = Sample.get('SlitLen',0.0)
     Back = sasdData['Back']
     Q,Io,wt,Ic,Ib,Ifb = Profile[:6]