Skip to content

Commit 8a922f0

Browse files
author
Auggie Marignier
committed
fix types
1 parent e68abdc commit 8a922f0

File tree

1 file changed

+49
-26
lines changed

1 file changed

+49
-26
lines changed

‎src/main/pys2let/pys2let.pyx‎

Lines changed: 49 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -795,24 +795,29 @@ def analysis_lm2lmn(np.ndarray[double complex, ndim=1, mode="c"] flm not None,
795795
parameters.dl_method = SSHT_DL_RISBO
796796
parameters.reality = 0
797797
parameters.verbosity = 0
798-
J = s2let_j_max(parameters)
798+
J = s2let_j_max(&parameters)
799799

800800
scal_l = np.zeros([L,])
801801
wav_lm = np.zeros([(J + 1) * L * L,], dtype=complex)
802-
s2let_tiling_wavelet(<double *> np.PyArray_DATA(wav_lm),
803-
<double complex*> np.PyArray_DATA(scal_l),
804-
parameters)
805-
806-
f_wav_lmn = np.zeros([s2let_n_lmn_wav(parameters),], dtype=complex)
807-
f_scal_lm = np.zeros([s2let_n_lm_scal(parameters),], dtype=complex)
802+
s2let_tiling_wavelet(<double complex*> np.PyArray_DATA(wav_lm),
803+
<double *> np.PyArray_DATA(scal_l),
804+
&parameters)
808805

809-
s2let_analysis_lm2lmn(f_wav_lmn, f_scal_lm, flm, wav_lm, scal_l, parameters)
806+
f_wav_lmn = np.zeros([s2let_n_lmn_wav(&parameters),], dtype=complex)
807+
f_scal_lm = np.zeros([s2let_n_lm_scal(&parameters),], dtype=complex)
810808

809+
s2let_analysis_lm2lmn(
810+
<double complex*> np.PyArray_DATA(f_wav_lmn),
811+
<double complex*> np.PyArray_DATA(f_scal_lm),
812+
<const double complex*> np.PyArray_DATA(flm),
813+
<const double complex*> np.PyArray_DATA(wav_lm),
814+
<const double *> np.PyArray_DATA(scal_l),
815+
&parameters)
811816
return f_wav_lmn, f_scal_lm
812817

813818
#----------------------------------------------------------------------------------------------------#
814819

815-
def analysis_adjoint_lm2lmn(
820+
def analysis_adjoint_lmn2lm(
816821
np.ndarray[double complex, ndim=1, mode="c"] f_wav_lmn not None,
817822
np.ndarray[double complex, ndim=1, mode="c"] f_scal_lm not None,
818823
B, L, J_min, N, spin, upsample, spin_lowered=False, original_spin=0):
@@ -829,16 +834,22 @@ def analysis_adjoint_lm2lmn(
829834
parameters.dl_method = SSHT_DL_RISBO
830835
parameters.reality = 0
831836
parameters.verbosity = 0
832-
J = s2let_j_max(parameters)
837+
J = s2let_j_max(&parameters)
833838

834839
scal_l = np.zeros([L,])
835840
wav_lm = np.zeros([(J + 1) * L * L,], dtype=complex)
836-
s2let_tiling_wavelet(<double *> np.PyArray_DATA(wav_lm),
837-
<double complex*> np.PyArray_DATA(scal_l),
838-
parameters)
841+
s2let_tiling_wavelet(<double complex*> np.PyArray_DATA(wav_lm),
842+
<double *> np.PyArray_DATA(scal_l),
843+
&parameters)
839844

840845
flm = np.zeros([L * L,], dtype=complex)
841-
s2let_analysis_adjoint_lmn2lm(flm, f_wav_lmn, f_scal_lm, wav_lm, scal_l, parameters)
846+
s2let_analysis_adjoint_lmn2lm(
847+
<double complex*> np.PyArray_DATA(flm),
848+
<const double complex*> np.PyArray_DATA(f_wav_lmn),
849+
<const double complex*> np.PyArray_DATA(f_scal_lm),
850+
<const double complex*> np.PyArray_DATA(wav_lm),
851+
<const double *> np.PyArray_DATA(scal_l),
852+
&parameters)
842853

843854
return flm
844855

@@ -861,16 +872,22 @@ def synthesis_lmn2lm(
861872
parameters.dl_method = SSHT_DL_RISBO
862873
parameters.reality = 0
863874
parameters.verbosity = 0
864-
J = s2let_j_max(parameters)
875+
J = s2let_j_max(&parameters)
865876

866877
scal_l = np.zeros([L,])
867878
wav_lm = np.zeros([(J + 1) * L * L,], dtype=complex)
868-
s2let_tiling_wavelet(<double *> np.PyArray_DATA(wav_lm),
869-
<double complex*> np.PyArray_DATA(scal_l),
870-
parameters)
879+
s2let_tiling_wavelet(<double complex*> np.PyArray_DATA(wav_lm),
880+
<double *> np.PyArray_DATA(scal_l),
881+
&parameters)
871882

872883
flm = np.zeros([L * L,], dtype=complex)
873-
s2let_synthesis_lmn2lm(flm, f_wav_lmn, f_scal_lm, wav_lm, scal_l, parameters)
884+
s2let_synthesis_lmn2lm(
885+
<double complex*> np.PyArray_DATA(flm),
886+
<const double complex*> np.PyArray_DATA(f_wav_lmn),
887+
<const double complex*> np.PyArray_DATA(f_scal_lm),
888+
<const double complex*> np.PyArray_DATA(wav_lm),
889+
<const double *> np.PyArray_DATA(scal_l),
890+
&parameters)
874891

875892
return flm
876893

@@ -891,18 +908,24 @@ def synthesis_adjoint_lm2lmn(np.ndarray[double complex, ndim=1, mode="c"] flm no
891908
parameters.dl_method = SSHT_DL_RISBO
892909
parameters.reality = 0
893910
parameters.verbosity = 0
894-
J = s2let_j_max(parameters)
911+
J = s2let_j_max(&parameters)
895912

896913
scal_l = np.zeros([L,])
897914
wav_lm = np.zeros([(J + 1) * L * L,], dtype=complex)
898-
s2let_tiling_wavelet(<double *> np.PyArray_DATA(wav_lm),
899-
<double complex*> np.PyArray_DATA(scal_l),
900-
parameters)
915+
s2let_tiling_wavelet(<double complex*> np.PyArray_DATA(wav_lm),
916+
<double *> np.PyArray_DATA(scal_l),
917+
&parameters)
901918

902-
f_wav_lmn = np.zeros([s2let_n_lmn_wav(parameters),], dtype=complex)
903-
f_scal_lm = np.zeros([s2let_n_lm_scal(parameters),], dtype=complex)
919+
f_wav_lmn = np.zeros([s2let_n_lmn_wav(&parameters),], dtype=complex)
920+
f_scal_lm = np.zeros([s2let_n_lm_scal(&parameters),], dtype=complex)
904921

905-
s2let_synthesis_adjoint_lm2lmn(f_wav_lmn, f_scal_lm, flm, wav_lm, scal_l, parameters)
922+
s2let_synthesis_adjoint_lm2lmn(
923+
<double complex*> np.PyArray_DATA(f_wav_lmn),
924+
<double complex*> np.PyArray_DATA(f_scal_lm),
925+
<const double complex*> np.PyArray_DATA(flm),
926+
<const double complex*> np.PyArray_DATA(wav_lm),
927+
<const double *> np.PyArray_DATA(scal_l),
928+
&parameters)
906929

907930
return f_wav_lmn, f_scal_lm
908931

0 commit comments

Comments
 (0)