Ignore:
Timestamp:
Apr 8, 2015 10:13:30 AM (7 years ago)
Author:
vondreele
Message:

fix bug from old Pref.Ori. not having penalty items
Implement colors for bad items in Reflection Lists; Prfo < 0 for PWDR
red Fc for abs(Fo-Fc)/sig > 10 & yellow if > 3.
Implement user selected rejection scheme for HKLF; set mul < 0. Get calculated but not used in least squares

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIstrMath.py

    r1777 r1781  
    27042704                        ref[7+im] = parmDict[phfx+'Scale']*ref[9+im]*ref[11+im]  #correct Fc^2 for extinction
    27052705                        ref[8+im] = ref[5+im]/(parmDict[phfx+'Scale']*ref[11+im])
    2706                         if w*ref[5+im] >= calcControls['minF/sig']:
     2706                        if w*ref[5+im] >= calcControls['minF/sig'] and ref[3+im] > 0:  #min cutoff & user rejection
    27072707                            Fo = np.sqrt(ref[5+im])
    27082708                            sumFo += Fo
     
    27222722                        Fc = np.sqrt(ref[7+im])
    27232723                        w = 2.0*Fo/ref[6+im]
    2724                         if w*Fo >= calcControls['minF/sig']:
     2724                        if w*Fo >= calcControls['minF/sig'] and ref[3+im] > 0:  #min cutoff & user rejection
    27252725                            sumFo += Fo
    27262726                            sumFo2 += ref[5+im]
Note: See TracChangeset for help on using the changeset viewer.