Changeset 3416

Timestamp:

May 31, 2018 4:03:31 PM (6 years ago)

Author:

vondreele

Message:

One more tweak to Mag moment derivatives

File:

• trunk/GSASIIstrMath.py (modified) (1 diff)

trunk/GSASIIstrMath.py

@@ -1165 +1165 @@
         Q = HM[:,:,nxs,nxs]*eDotK[nxs,:,:,:]-Kdata[:,nxs,:,:] #Mxyz,Nref,Nop,Natm = BPM in magstrfc.for OK
         dqdk = np.array([np.outer(hm,hm)-np.eye(3) for hm in HM.T]).T     #Mxyz**2,Nref
-        NQ = np.sqrt(np.sum(Q*Q,axis=0))
-        NQ = np.where(NQ > 0.,1./NQ,0.)
         dqdm = dqdk[:,:,:,nxs,nxs]*dkdm[:,nxs,nxs,:,:]   #Mxyz**2,Nref,Nops,Natms
-        dmx = Q*dMdm[:,nxs,nxs,:]/2.
+        dmx = Q*dMdm[:,nxs,nxs,:]
         dmx = dmx[nxs,:,:,:,:]+dqdm*Mag[nxs,nxs,nxs,:,:]
+        dmx /= 2.
         
         fam = Q*TMcorr[nxs,:,nxs,:]*cosm[nxs,:,:,:]*Mag[nxs,nxs,:,:]    #Mxyz,Nref,Nop,Natm