Changeset 1490
- Timestamp:
- Sep 9, 2014 4:33:26 PM (8 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/GSASIIstrIO.py
r1489 r1490 1858 1858 controlDict[pfx+'EType'] = extType 1859 1859 controlDict[pfx+'EApprox'] = extApprox 1860 controlDict[pfx+'Tbar'] = extParms['Tbar'] 1861 controlDict[pfx+'Cos2TM'] = extParms['Cos2TM'] 1860 if 'C' in inst['Type'][0]: 1861 controlDict[pfx+'Tbar'] = extParms['Tbar'] 1862 controlDict[pfx+'Cos2TM'] = extParms['Cos2TM'] 1862 1863 if 'Primary' in extType: 1863 1864 Ekey = ['Ep',] … … 1883 1884 print >>pFile,' Scale factor : %10.4f'%(hapData['Scale'][0]),' Refine?',hapData['Scale'][1] 1884 1885 if extType != 'None': 1885 print >>pFile,' Extinction Type: %15s'%(extType),' approx: %10s'%(extApprox) ,' tbar: %6.3f'%(extParms['Tbar'])1886 print >>pFile,' Extinction Type: %15s'%(extType),' approx: %10s'%(extApprox) 1886 1887 text = ' Parameters :' 1887 1888 for eKey in Ekey: -
trunk/GSASIIstrMath.py
r1489 r1490 2014 2014 depDerivDict[var][iref] = w*dFdvDict[var][iref]*parmDict[phfx+'Scale']*ref[11] #*dervCor 2015 2015 if phfx+'Scale' in varylist: 2016 dMdvh[varylist.index(phfx+'Scale')][iref] = w*ref[9]*ref[11] # *dervCor2016 dMdvh[varylist.index(phfx+'Scale')][iref] = w*ref[9]*ref[11] #OK? *dervCor 2017 2017 elif phfx+'Scale' in dependentVars: 2018 depDerivDict[phfx+'Scale'][iref] = w*ref[9]*ref[11] # *dervCor2018 depDerivDict[phfx+'Scale'][iref] = w*ref[9]*ref[11] #OK? *dervCor 2019 2019 for item in ['Ep','Es','Eg']: 2020 2020 if phfx+item in varylist and dervDict: 2021 dMdvh[varylist.index(phfx+item)][iref] = w*dervDict[phfx+item]/ref[11] # /dervCor2021 dMdvh[varylist.index(phfx+item)][iref] = w*dervDict[phfx+item]/ref[11] #OK? /dervCor 2022 2022 elif phfx+item in dependentVars and dervDict: 2023 depDerivDict[phfx+item][iref] = w*dervDict[phfx+item]/ref[11] # /dervCor2023 depDerivDict[phfx+item][iref] = w*dervDict[phfx+item]/ref[11] #OK? /dervCor 2024 2024 for item in ['BabA','BabU']: 2025 2025 if phfx+item in varylist: … … 2043 2043 depDerivDict[var][iref] = w*dFdvDict[var][iref]*parmDict[phfx+'Scale']*dervCor #*ref[11] 2044 2044 if phfx+'Scale' in varylist: 2045 dMdvh[varylist.index(phfx+'Scale')][iref] = w*ref[9]* dervCor #*ref[11]2045 dMdvh[varylist.index(phfx+'Scale')][iref] = w*ref[9]*ref[11] #*dervCor 2046 2046 elif phfx+'Scale' in dependentVars: 2047 depDerivDict[phfx+'Scale'][iref] = w*ref[9]* dervCor #*ref[11]2047 depDerivDict[phfx+'Scale'][iref] = w*ref[9]*ref[11] #*dervCor 2048 2048 for item in ['Ep','Es','Eg']: 2049 2049 if phfx+item in varylist and dervDict:
Note: See TracChangeset
for help on using the changeset viewer.