Changeset 838

Timestamp:

Jan 23, 2013 10:15:09 AM (9 years ago)

Author:

vondreele

Message:

fixed single crystal refinement - implement wtFactor
Hessian & Jacobian F & F2 refinements all work

File:

• trunk/GSASIIstruct.py (modified) (5 diffs)

trunk/GSASIIstruct.py

@@ -3288 +3288 @@
                     if calcControls['F**2']:
                         if ref[5]/ref[6] >= calcControls['minF/sig']:
+                            w = wtFactor/ref[6]
                             for j,var in enumerate(varylist):
                                 if var in dFdvDict:
-                                    dMdvh[j][iref] = dFdvDict[var][iref]/ref[6]
+                                    dMdvh[j][iref] = w*dFdvDict[var][iref]
                             if phfx+'Scale' in varylist:
-                                dMdvh[varylist.index(phfx+'Scale')][iref] = ref[9]/ref[6]
+                                dMdvh[varylist.index(phfx+'Scale')][iref] = w*ref[9]
                     else:
                         Fo = np.sqrt(ref[5])
@@ -3298 +3299 @@
                         sig = ref[6]/(2.0*Fo)
                         if Fo/sig >= calcControls['minF/sig']:
+                            w = wtFactor/sig
                             for j,var in enumerate(varylist):
                                 if var in dFdvDict:
-                                    dMdvh[j][iref] = dFdvDict[var][iref]/ref[6]
+                                    dMdvh[j][iref] = w*dFdvDict[var][iref]
                             if phfx+'Scale' in varylist:
-                                dMdvh[varylist.index(phfx+'Scale')][iref] = ref[9]/ref[6]                            
+                                dMdvh[varylist.index(phfx+'Scale')][iref] = w*ref[9]                            
         else:
             continue        #skip non-histogram entries
@@ -3373 +3375 @@
                     if calcControls['F**2']:
                         if ref[5]/ref[6] >= calcControls['minF/sig']:
-                            wdf[iref] = (ref[5]-ref[7])/ref[6]
+                            w =  wtFactor/ref[6]
+                            wdf[iref] = w*(ref[5]-ref[7])
                             for j,var in enumerate(varylist):
                                 if var in dFdvDict:
-                                    dMdvh[j][iref] = dFdvDict[var][iref]/ref[6]
+                                    dMdvh[j][iref] = w*dFdvDict[var][iref]
                             if phfx+'Scale' in varylist:
-                                dMdvh[varylist.index(phfx+'Scale')][iref] = ref[9]/ref[6]
+                                dMdvh[varylist.index(phfx+'Scale')][iref] = w*ref[9]
                     else:
-                        Fo = np.sqrt(ref[5])
-                        Fc = np.sqrt(ref[7])
-                        sig = ref[6]/(2.0*Fo)
-                        wdf[iref] = (Fo-Fc)/sig
-                        if Fo/sig >= calcControls['minF/sig']:
-                            for j,var in enumerate(varylist):
-                                if var in dFdvDict:
-                                    dMdvh[j][iref] = dFdvDict[var][iref]/ref[6]
-                            if phfx+'Scale' in varylist:
-                                dMdvh[varylist.index(phfx+'Scale')][iref] = ref[9]/ref[6]                            
+                        if ref[5] > 0.:
+                            Fo = np.sqrt(ref[5])
+                            Fc = np.sqrt(ref[7])
+                            sig = ref[6]/(2.0*Fo)
+                            w = wtFactor/sig
+                            wdf[iref] = w*(Fo-Fc)
+                            if Fo/sig >= calcControls['minF/sig']:
+                                for j,var in enumerate(varylist):
+                                    if var in dFdvDict:
+                                        dMdvh[j][iref] = w*dFdvDict[var][iref]
+                                if phfx+'Scale' in varylist:
+                                    dMdvh[varylist.index(phfx+'Scale')][iref] = w*ref[9]                           
             if dlg:
                 dlg.Update(Histogram['wR'],newmsg='Hessian for histogram %d Rw=%8.3f%s'%(hId,Histogram['wR'],'%'))[0]
@@ -3480 +3485 @@
                             sumdF2 += abs(ref[5]-ref[7])
                             nobs += 1
-                            df[i] = -(ref[5]-ref[7])/ref[6]
-                            sumwYo += (ref[5]/ref[6])**2
+                            df[i] = -np.sqrt(wtFactor)*(ref[5]-ref[7])/ref[6]
+                            sumwYo += wtFactor*(ref[5]/ref[6])**2
                     else:
                         Fo = np.sqrt(ref[5])
@@ -3492 +3497 @@
                             sumdF2 += abs(ref[5]-ref[7])
                             nobs += 1
-                            df[i] = -(Fo-Fc)/sig
-                            sumwYo += (Fo/sig)**2
+                            df[i] = -np.sqrt(wtFactor)*(Fo-Fc)/sig
+                            sumwYo += wtFactor*(Fo/sig)**2
             Histogram['Nobs'] = nobs
             Histogram['sumwYo'] = sumwYo