QPMS
/
qpms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[hexpoint] some fixes 

Former-commit-id: 2741873a8507d756e95752e41bb1793e9a261219
This commit is contained in:
Marek Nečada 2017-02-09 07:08:20 +02:00
parent 90c3efe8b0
commit 042197f978
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
qpms/hexpoints.py
View File

@ -296,7 +296,7 @@ def hexlattice_precalc_AB_loadunwrap(file, tpdict = None, tphcdict = None, retur
a_self[tpdict['mi'][0]]=npz['a_self_m0'] a_self[tpdict['mi'][0]]=npz['a_self_m0']
b_self[tpdict['nmi']]=npz['b_self_nm'] b_self[tpdict['nmi']]=npz['b_self_nm']
b_self[tpdict['mi'][0]]=npz['b_self_m0'] b_self[tpdict['mi'][0]]=npz['b_self_m0']
mirrorangles = qpms.cart2sph(self_tr[tpdict['mi'][1]])[:,2] - qpms.cart2sph(self_tr[tpdict['mi'][0]])[:,2] mirrorangles = cart2sph(self_tr[tpdict['mi'][1]])[:,2] - cart2sph(self_tr[tpdict['mi'][0]])[:,2]
a_self[tpdict['mi'][1],:,:] = a_self[tpdict['mi'][0],:,:] * np.exp(1j*mirrorangles[:,nx,nx]*(my[nx,nx,:]-my[nx,:,nx])) a_self[tpdict['mi'][1],:,:] = a_self[tpdict['mi'][0],:,:] * np.exp(1j*mirrorangles[:,nx,nx]*(my[nx,nx,:]-my[nx,:,nx]))
b_self[tpdict['mi'][1],:,:] = b_self[tpdict['mi'][0],:,:] * np.exp(1j*mirrorangles[:,nx,nx]*(my[nx,nx,:]-my[nx,:,nx])) b_self[tpdict['mi'][1],:,:] = b_self[tpdict['mi'][0],:,:] * np.exp(1j*mirrorangles[:,nx,nx]*(my[nx,nx,:]-my[nx,:,nx]))
for i in range(1,6): for i in range(1,6):
@ -306,7 +306,7 @@ def hexlattice_precalc_AB_loadunwrap(file, tpdict = None, tphcdict = None, retur
a_d2u[tphcdict['mi'][0]]=npz['a_d2u_m0'] a_d2u[tphcdict['mi'][0]]=npz['a_d2u_m0']
b_d2u[tphcdict['nmi']]=npz['b_d2u_nm'] b_d2u[tphcdict['nmi']]=npz['b_d2u_nm']
b_d2u[tphcdict['mi'][0]]=npz['b_d2u_m0'] b_d2u[tphcdict['mi'][0]]=npz['b_d2u_m0']
mirrorangles = qpms.cart2sph(self_tr[tphcdict['mi'][1]])[:,2] - qpms.cart2sph(self_tr[tphcdict['mi'][0]])[:,2] mirrorangles = cart2sph(self_tr[tphcdict['mi'][1]])[:,2] - cart2sph(self_tr[tphcdict['mi'][0]])[:,2]
a_d2u[tphcdict['mi'][1],:,:] = a_d2u[tphcdict['mi'][0],:,:] * np.exp(1j*mirrorangles[:,nx,nx]*(my[nx,nx,:]-my[nx,:,nx])) a_d2u[tphcdict['mi'][1],:,:] = a_d2u[tphcdict['mi'][0],:,:] * np.exp(1j*mirrorangles[:,nx,nx]*(my[nx,nx,:]-my[nx,:,nx]))
b_d2u[tphcdict['mi'][1],:,:] = b_d2u[tphcdict['mi'][0],:,:] * np.exp(1j*mirrorangles[:,nx,nx]*(my[nx,nx,:]-my[nx,:,nx])) b_d2u[tphcdict['mi'][1],:,:] = b_d2u[tphcdict['mi'][0],:,:] * np.exp(1j*mirrorangles[:,nx,nx]*(my[nx,nx,:]-my[nx,:,nx]))
for i in (1,-1): for i in (1,-1):
@ -320,8 +320,10 @@ def hexlattice_precalc_AB_loadunwrap(file, tpdict = None, tphcdict = None, retur
'a_d2u' : a_d2u, 'a_d2u' : a_d2u,
'b_d2u' : b_d2u, 'b_d2u' : b_d2u,
'a_u2d' : a_u2d, 'a_u2d' : a_u2d,
'b_u2d' : b_u2d 'b_u2d' : b_u2d,
} }
for k in precalc_params.keys():
d[k] = precalc_params[k]
if return_points: if return_points:
d['d2u_tr'] = tphcdict['points'] d['d2u_tr'] = tphcdict['points']
d['u2d_tr'] = -tphcdict['points'] d['u2d_tr'] = -tphcdict['points']

2
setup.py
View File

@ -12,7 +12,7 @@ qpms_c = Extension('qpms_c',
sources = ['qpms/qpms_c.pyx']) sources = ['qpms/qpms_c.pyx'])
setup(name='qpms', setup(name='qpms',
version = "0.1.8", version = "0.1.9",
packages=['qpms'], packages=['qpms'],
# setup_requires=['setuptools_cython'], # setup_requires=['setuptools_cython'],
install_requires=['cython>=0.21','quaternion','spherical_functions','py_gmm'], install_requires=['cython>=0.21','quaternion','spherical_functions','py_gmm'],