Changeset 2508

Timestamp:

Oct 27, 2016 12:50:38 PM (9 years ago)

Author:

vondreele

Message:

fix move difference curve problem
mag derivs are better but still not right - refinements work (sort of)
fix to testDeriv to show atom pos derivs for depVarList parameters

Location:

trunk

Files:

• GSASIIplot.py (modified) (1 diff)
• GSASIIstrMath.py (modified) (3 diffs)
• testDeriv.py (modified) (5 diffs)

trunk/GSASIIplot.py ¶

@@ -1596 +1596 @@
             data = G2frame.PatternTree.GetItemPyData(PickId)
             ypos = event.ydata
-            Pattern[0]['delOffset'] = -ypos/Ymax
+            Pattern[0]['delOffset'] = -ypos
             G2frame.itemPicked = None
             wx.CallAfter(PlotPatterns,G2frame,plotType=plottype)

trunk/GSASIIstrMath.py ¶

@@ -1222 +1222 @@
     Mag = np.sqrt(np.sum(Gdata**2,axis=0))      #magnitude of moments for uniq atoms
     Gdata = np.where(Mag>0.,Gdata/Mag,0.)       #normalze mag. moments
-    dGdM = np.copy(Gdata)
+    dGdM = np.repeat(Gdata[:,nxs,:],Nops*Ncen*(1+SGData['SGInv']),axis=1)
     Gdata = np.inner(Bmat,Gdata.T)              #convert to crystal space
     Gdata = np.inner(Gdata.T,SGMT).T            #apply sym. ops.
@@ -1235 +1235 @@
     if SGData['SGInv']:
         Mag = np.repeat(Mag,2,axis=0)
-    dGdm = (1.-Gdata**2)    #1/Mag removed - canceled out in dqmx=sum(dqdm*dGdm)
+    dGdm = (1.-Gdata**2)                        #1/Mag removed - canceled out in dqmx=sum(dqdm*dGdm)
     dFdMx = np.zeros((nRef,mSize,3))
     Uij = np.array(G2lat.U6toUij(Uijdata))
@@ -1284 +1284 @@
         cosm = np.cos(mphase)                               #ditto
         HM = np.inner(Bmat.T,H)                             #put into cartesian space
-        HM = HM/np.sqrt(np.sum(HM**2,axis=0))               
+        HM = HM/np.sqrt(np.sum(HM**2,axis=0))               #unit vector for H
         eDotK = np.sum(HM[:,:,nxs,nxs]*Gdata[:,nxs,:,:],axis=0)
         Q = HM[:,:,nxs,nxs]*eDotK[nxs,:,:,:]-Gdata[:,nxs,:,:] #Mxyz,Nref,Nop,Natm = BPM in magstrfc.for OK
         dqdm = np.array([np.outer(hm,hm)-np.eye(3) for hm in HM.T]).T   #Mxyz,Mxyz,Nref (3x3 matrix)
         dqmx = np.sum(dqdm[:,:,:,nxs,nxs]*dGdm[:,nxs,nxs,:,:],axis=0)   #matrix * vector = vector
-        dmx = Q*Gdata[:,nxs,:,:]+dqmx      #*Mag canceled out of dqmx term
-        fam = Q*TMcorr[nxs,:,nxs,:]*cosm[nxs,:,:,:]*Mag[nxs,nxs,:,:]    #ditto
-        fbm = Q*TMcorr[nxs,:,nxs,:]*sinm[nxs,:,:,:]*Mag[nxs,nxs,:,:]    #ditto
-        fams = np.sum(np.sum(fam,axis=-1),axis=-1)                          #Mxyz,Nref
-        fbms = np.sum(np.sum(fbm,axis=-1),axis=-1)                          #ditto
+        dmx = Q*dGdM[:,nxs,:,:]+dqmx                                    #*Mag canceled out of dqmx term
+        fam = Q*TMcorr[nxs,:,nxs,:]*cosm[nxs,:,:,:]*Mag[nxs,nxs,:,:]    #Mxyz,Nref,Nop,Natm
+        fbm = Q*TMcorr[nxs,:,nxs,:]*sinm[nxs,:,:,:]*Mag[nxs,nxs,:,:]
+        fams = np.sum(np.sum(fam,axis=-1),axis=-1)                      #Mxyz,Nref
+        fbms = np.sum(np.sum(fbm,axis=-1),axis=-1)
         famx = Q*TMcorr[nxs,:,nxs,:]*Mag[nxs,nxs,:,:]*sinm[nxs,:,:,:]   #Mxyz,Nref,Nops,Natom
         fbmx = Q*TMcorr[nxs,:,nxs,:]*Mag[nxs,nxs,:,:]*cosm[nxs,:,:,:]

trunk/testDeriv.py ¶

@@ -85 +85 @@
 
     def OnTestRead(self,event):
-        dlg = wx.FileDialog(self, 'Open testDeriv.dat file', '.', 'testDeriv.dat')
+        dlg = wx.FileDialog(self, 'Open testDeriv.dat file',defaultFile='testDeriv.dat',
+            wildcard='testDeriv.dat')
         if self.dirname:
             dlg.SetDirectory(self.dirname)
@@ -165 +166 @@
             
         def test2(name,delt):
-            
             Title = 'derivatives test for '+name
             varyList = self.varylist+self.depVarList
@@ -171 +171 @@
             dMdV = G2stMth.dervRefine(self.values,self.HistoPhases,self.parmDict,
                 varyList,self.calcControls,self.pawleyLookup,None)
-            hplot.plot(dMdV[varyList.index(name)],'b',label='analytic deriv')
+            M2 = dMdV[varyList.index(name)]
+            hplot.plot(M2,'b',label='analytic deriv')
             if name in varyList:
                 mmin = np.min(dMdV[varyList.index(name)])
@@ -184 +185 @@
                         varyList,self.calcControls,self.pawleyLookup,None)
                     self.values[self.varylist.index(name)] -= delt
-                else:   #in depVarList
+                elif name in self.depVarList:   #in depVarList
+                    if 'dA' in name:
+                        name = name.replace('dA','A')
+                        delt *= -1
                     self.parmDict[name] -= delt
                     M0 = G2stMth.errRefine(self.values,self.HistoPhases,self.parmDict,
@@ -192 +196 @@
                         varyList,self.calcControls,self.pawleyLookup,None)
                     self.parmDict[name] -= delt    
-                Mn = (M1-M0)/(2.*delt)
+                Mn = (M1-M0)/(2.*abs(delt))
                 hplot.plot(Mn,'r',label='numeric deriv')
-                hplot.plot(dMdV[varyList.index(name)]-Mn,'g',label='diff')
+                hplot.plot(M2-Mn,'g',label='diff')
 #            GSASIIpath.IPyBreak()
             hplot.legend(loc='best')