@@ -1397,7 +1397,9 @@ def StructureFactorDerv2(refDict,G,hfx,pfx,SGData,calcControls,parmDict):
13971397 SB = fbs [0 ]+ fbs [1 ]
13981398 if 'P' in calcControls [hfx + 'histType' ]: #checked perfect for centro & noncentro
13991399 dFdfr [iBeg :iFin ] = pMul * np .sum (fas [:,:,nxs ]* dfadfr + fbs [:,:,nxs ]* dfbdfr ,axis = 0 )* Mdata / nOps
1400- dFdff [:,iBeg :iFin ] = pMul * np .sum (fas [:,:,nxs ,nxs ]* dfadff + fbs [:,:,nxs ,nxs ]* dfbdff ,axis = 0 ) #not summed on Uniq yet
1400+ # dFdff[:,iBeg:iFin] = pMul*np.sum(fas[:,:,nxs,nxs]*dfadff+fbs[:,:,nxs,nxs]*dfbdff,axis=0) #not summed on Uniq yet
1401+ dFdff [:,iBeg :iFin ] = [2. * (fas [0 ,:,nxs ,nxs ]* dfadff [0 ]+ fbs [0 ,:,nxs ,nxs ]* dfbdff [0 ]),
1402+ 2. * (fas [0 ,:,nxs ,nxs ]* dfadff [1 ]+ fbs [0 ,:,nxs ,nxs ]* dfbdff [1 ])] #not summed on Uniq yet array(Nref,nEqv,nAtom)
14011403 dFdx [iBeg :iFin ] = pMul * np .sum (fas [:,:,nxs ,nxs ]* dfadx + fbs [:,:,nxs ,nxs ]* dfbdx ,axis = 0 )
14021404 dFdui [iBeg :iFin ] = pMul * np .sum (fas [:,:,nxs ]* dfadui + fbs [:,:,nxs ]* dfbdui ,axis = 0 )
14031405 dFdua [iBeg :iFin ] = pMul * np .sum (fas [:,:,nxs ,nxs ]* dfadua + fbs [:,:,nxs ,nxs ]* dfbdua ,axis = 0 )
0 commit comments