Changeset 1319
- Timestamp:
- May 2, 2014 4:00:11 PM (9 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/GSASIIplot.py
r1312 r1319 2367 2367 Plot.plot(X,Y,'o',label=name) 2368 2368 if Page.fitvals: 2369 Plot.plot(X,fitvals) 2370 Plot.plot(X,fitvals,'*',label='Fit') 2369 Plot.plot(X,fitvals,label='Fit') 2371 2370 2372 2371 Plot.legend(loc='best') … … 2570 2569 Data['ring'].append([xpos,ypos]) 2571 2570 elif event.button == 3: 2572 G2frame.dataFrame.GetStatusBar().SetStatusText('Calibrating...', 1)2571 G2frame.dataFrame.GetStatusBar().SetStatusText('Calibrating...',0) 2573 2572 if G2img.ImageCalibrate(G2frame,Data): 2574 G2frame.dataFrame.GetStatusBar().SetStatusText('Calibration successful - Show ring picks to check', 1)2573 G2frame.dataFrame.GetStatusBar().SetStatusText('Calibration successful - Show ring picks to check',0) 2575 2574 print 'Calibration successful' 2576 2575 else: 2577 G2frame.dataFrame.GetStatusBar().SetStatusText('Calibration failed - Show ring picks to diagnose', 1)2576 G2frame.dataFrame.GetStatusBar().SetStatusText('Calibration failed - Show ring picks to diagnose',0) 2578 2577 print 'Calibration failed' 2579 2578 G2frame.ifGetRing = False -
trunk/GSASIIsasd.py
r1318 r1319 1001 1001 return (G*P/Rg**P)*np.exp(scsp.gammaln(P/2)) 1002 1002 1003 def SmearData(Ic,Q,slitLength): 1004 return Ic #for now 1005 1003 1006 ############################################################################### 1004 1007 #### Size distribution … … 1012 1015 'Cylinder diam':[CylinderDFF,CylinderDVol]} 1013 1016 Shape = data['Size']['Shape'][0] 1017 SlitLen = Sample.get('SlitLen',0.0) 1014 1018 Parms = data['Size']['Shape'][1:] 1015 1019 if data['Size']['logBins']: … … 1071 1075 1072 1076 def GetModelParms(): 1073 parmDict = {'Scale':Sample['Scale'][0] }1077 parmDict = {'Scale':Sample['Scale'][0],'SlitLen':Sample.get('SlitLen',0.0),} 1074 1078 varyList = [] 1075 1079 values = [] … … 1263 1267 matFrac = partData['Matrix']['VolFrac'] #[value,flag] 1264 1268 Scale = Sample['Scale'] #[value,flag] 1269 SlitLen = Sample.get('SlitLen',0.0) 1265 1270 Back = sasdData['Back'] 1266 1271 Q,Io,wt,Ic,Ib,Ifb = Profile[:6]
Note: See TracChangeset
for help on using the changeset viewer.