Changeset 1374
- Timestamp:
- Jun 5, 2014 3:07:57 PM (9 years ago)
- Location:
- trunk
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/GSASIIimage.py
r1371 r1374 534 534 if data['DetDepthRef']: 535 535 varyList.append('dep') 536 FitDetector(rings,varyList,parmDict)536 chisq = FitDetector(rings,varyList,parmDict) 537 537 data['distance'] = parmDict['dist'] 538 538 data['center'] = [parmDict['det-X'],parmDict['det-Y']] … … 540 540 data['tilt'] = parmDict['tilt'] 541 541 data['DetDepth'] = parmDict['dep'] 542 data['chisq'] = chisq 542 543 N = len(data['ellipses']) 543 544 data['ellipses'] = [] #clear away individual ellipse fits … … 716 717 data['tilt'] = parmDict['tilt'] 717 718 data['DetDepth'] = parmDict['dep'] 719 data['chisq'] = chisq 718 720 elcent,phi,radii = ellipse = GetEllipse(dsp,data) 719 721 print fmt2%('fitted ellipse: ',elcent[0],elcent[1],phi,radii[0],radii[1],chisq,len(rings)) -
trunk/GSASIIimgGUI.py
r1331 r1374 247 247 keys = ['type','wavelength','calibrant','distance','center', 248 248 'tilt','rotation','azmthOff','fullIntegrate','LRazimuth', 249 'IOtth','outAzimuths','invert_x','invert_y','DetDepth'] 249 'IOtth','outAzimuths','invert_x','invert_y','DetDepth', 250 'calibskip','pixLimit','cutoff','calibdmin','chisq', 251 'binType','SampleShape','PolaVal','SampleAbs','dark image','background image'] 250 252 for key in keys: 251 if key in ['rotation']: 252 File.write(key+':'+str(data[key])+'\n') 253 else: 254 File.write(key+':'+str(data[key])+'\n') 253 if key not in data: #uncalibrated! 254 continue 255 File.write(key+':'+str(data[key])+'\n') 255 256 File.close() 256 257 finally: … … 259 260 def OnLoadControls(event): 260 261 cntlList = ['wavelength','distance','tilt','invert_x','invert_y','type', 261 'fullIntegrate','outAzimuths','LRazimuth','IOtth','azmthOff','DetDepth'] 262 'fullIntegrate','outAzimuths','LRazimuth','IOtth','azmthOff','DetDepth', 263 'calibskip','pixLimit','cutoff','calibdmin','chisq', 264 'PolaVal','SampleAbs','dark image','background image'] 262 265 dlg = wx.FileDialog(G2frame, 'Choose image controls file', '.', '', 263 266 'image control files (*.imctrl)|*.imctrl',wx.OPEN|wx.CHANGE_DIR) … … 273 276 continue 274 277 [key,val] = S[:-1].split(':') 275 if key in ['type','calibrant', ]:278 if key in ['type','calibrant','binType','SampleShape',]: #strings 276 279 save[key] = val 277 280 elif key in ['rotation']: … … 931 934 G2frame.dataFrame.Bind(wx.EVT_MENU, OnRecalibrate, id=G2gd.wxID_IMRECALIBRATE) 932 935 G2frame.dataFrame.Bind(wx.EVT_MENU, OnClearCalib, id=G2gd.wxID_IMCLEARCALIB) 933 if not data['rings']:936 if 'chisq' not in data: 934 937 G2frame.dataFrame.ImageEdit.Enable(id=G2gd.wxID_IMRECALIBRATE,enable=False) 935 938 G2frame.dataFrame.Bind(wx.EVT_MENU, OnIntegrate, id=G2gd.wxID_IMINTEGRATE) -
trunk/GSASIIsasd.py
r1373 r1374 476 476 '''Computes structure factor for not dilute monodisperse hard sphere with a 477 477 square well potential interaction. 478 Refs.: SHARMA,SHARMA, PHYSICA 89A,(1977),21 2478 Refs.: SHARMA,SHARMA, PHYSICA 89A,(1977),213- 479 479 480 480 :param float Q: Q value array (A-1) … … 1372 1372 Dist.append([]) 1373 1373 Ic[Ibeg:Ifin] += Back[0] 1374 slitLen = Sample ['SlitLen']1374 slitLen = Sample.get('SlitLen',0.) 1375 1375 if slitLen: 1376 1376 Ic[Ibeg:Ifin] = SmearData(Ic,Q,slitLen,Back[0])[Ibeg:Ifin]
Note: See TracChangeset
for help on using the changeset viewer.