Changeset 2076
- Timestamp:
- Dec 1, 2015 4:06:06 PM (7 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/GSASIIindex.py
r2056 r2076 300 300 return chi 301 301 302 if 'C' in Inst['Type'][0]: 302 if 'T' in Inst['Type'][0]: 303 difC = Inst['difC'][1] 304 else: 303 305 wave = G2mth.getWave(Inst) 304 else:305 difC = Inst['difC'][1]306 306 SGData = G2spc.SpcGroup(controls[13])[1] 307 307 SSGData = G2spc.SSpcGroup(SGData,ssopt['ssSymb'])[1] … … 317 317 dmin = getDmin(peaks)-0.005 318 318 Peaks = np.copy(np.array(peaks).T) 319 if 'C' in Inst['Type'][0]: 319 if 'T' in Inst['Type'][0]: 320 result = so.brute(TSSfunc,ranges,finish=so.fmin_cg, 321 args=(peaks,dmin,Inst,SGData,SSGData,ssopt['ModVec'],Vref,ssopt['maxH'],A,difC,Z,dlg)) 322 else: 320 323 result = so.brute(ZSSfunc,ranges,finish=so.fmin_cg, 321 324 args=(peaks,dmin,Inst,SGData,SSGData,ssopt['ModVec'],Vref,ssopt['maxH'],A,wave,Z,dlg)) 322 else:323 result = so.brute(TSSfunc,ranges,finish=so.fmin_cg,324 args=(peaks,dmin,Inst,SGData,SSGData,ssopt['ModVec'],Vref,ssopt['maxH'],A,difC,Z,dlg))325 325 return Val2Vec(ssopt['ModVec'],Vref,result) 326 326 -
trunk/GSASIIstrMath.py
r2075 r2076 999 999 if 'NC' in calcControls[hfx+'histType']: 1000 1000 FP,FPP = G2el.BlenResCW(Tdata,BLtables,parmDict[hfx+'Lam']) 1001 el se:1001 elif 'X' in calcControls[hfx+'histType']: 1002 1002 FP = np.array([FFtables[El][hfx+'FP'] for El in Tdata]) 1003 1003 FPP = np.array([FFtables[El][hfx+'FPP'] for El in Tdata])
Note: See TracChangeset
for help on using the changeset viewer.