Changeset 1874
- Timestamp:
- Jun 1, 2015 11:31:55 AM (8 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/GSASIIpwd.py
r1759 r1874 1514 1514 head = 13*' ' 1515 1515 for name in names: 1516 head += name.center(10)+'esd'.center(10) 1516 if name in ['alp','bet']: 1517 head += name.center(8)+'esd'.center(8) 1518 else: 1519 head += name.center(10)+'esd'.center(10) 1517 1520 print head 1518 1521 if 'C' in dataType: 1519 1522 ptfmt = {'pos':"%10.5f",'int':"%10.1f",'sig':"%10.3f",'gam':"%10.3f"} 1520 1523 else: 1521 ptfmt = {'pos':"%10.2f",'int':"%10.4f",'alp':"% 10.3f",'bet':"%10.5f",'sig':"%10.3f",'gam':"%10.3f"}1524 ptfmt = {'pos':"%10.2f",'int':"%10.4f",'alp':"%8.3f",'bet':"%8.5f",'sig':"%10.3f",'gam':"%10.3f"} 1522 1525 for i,peak in enumerate(Peaks): 1523 1526 ptstr = ':' -
trunk/GSASIIstrMath.py
r1864 r1874 1403 1403 exb = 1.0 1404 1404 if xfac > -1.: 1405 exb = 1./ (1.+xfac)1405 exb = 1./np.sqrt(1.+xfac) 1406 1406 exl = 1.0 1407 1407 if 0 < xfac <= 1.: … … 1430 1430 dbde = -500.*flv2 1431 1431 if xfac > -1.: 1432 dbde = - flv2/(1.+xfac)**31432 dbde = -0.5*flv2/np.sqrt(1.+xfac)**3 1433 1433 dlde = 0. 1434 1434 if 0 < xfac <= 1.: … … 1440 1440 1441 1441 return dbde*sth2+dlde*(1.-sth2) 1442 1443 1444 # delt = 0.011445 # parmDict[phfx+'Extinction'] += delt1446 # plus = GetPwdrExt(refl,im,pfx,phfx,hfx,calcControls,parmDict)1447 # parmDict[phfx+'Extinction'] -= 2.*delt1448 # minus = GetPwdrExt(refl,im,pfx,phfx,hfx,calcControls,parmDict)1449 # parmDict[phfx+'Extinction'] += delt1450 # return (plus-minus)/(2.*delt)1451 1442 1452 1443 def GetIntensityCorr(refl,im,uniq,G,g,pfx,phfx,hfx,SGData,calcControls,parmDict):
Note: See TracChangeset
for help on using the changeset viewer.