Changeset 2078
- Timestamp:
- Dec 3, 2015 9:32:46 AM (7 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/GSASIIstrMath.py
r2076 r2078 2987 2987 sumFo = 0 2988 2988 sumFo2 = 0 2989 sumFc2 = 0 2989 2990 sumdF = 0 2990 2991 sumdF2 = 0 … … 3013 3014 sumFo += Fo 3014 3015 sumFo2 += ref[5+im] 3016 sumFc2 += ref[7+im] 3015 3017 sumdF += abs(Fo-np.sqrt(ref[7+im])) 3016 3018 sumdF2 += abs(ref[5+im]-ref[7+im]) … … 3047 3049 sumFo += Fo 3048 3050 sumFo2 += ref[5+im] 3051 sumFc2 += ref[7+im] 3049 3052 sumdF += abs(Fo-Fc) 3050 3053 sumdF2 += abs(ref[5+im]-ref[7+im]) … … 3068 3071 else: #sp.gp.extinct 3069 3072 next += 1 3073 Scale = sumFo2/sumFc2 3074 if (Scale < 0.8 or Scale > 1.2) and phfx+'Scale' in varylist: 3075 print 'New scale:',Scale*parmDict[phfx+'Scale'] 3076 indx = varylist.index(phfx+'Scale') 3077 values[indx] = Scale*parmDict[phfx+'Scale'] 3070 3078 Histogram['Residuals']['Nobs'] = nobs 3071 3079 Histogram['Residuals']['sumwYo'] = sumwYo
Note: See TracChangeset
for help on using the changeset viewer.