Commit 294536e6 authored by Martin Reinecke's avatar Martin Reinecke
Browse files

Merge branch 'master' into improve_scaling

parents 9e5c5f20 93bc5bec
...@@ -1004,7 +1004,7 @@ template<typename T, typename Serv> void x2grid_c ...@@ -1004,7 +1004,7 @@ template<typename T, typename Serv> void x2grid_c
{ {
complex<T> tmp(v*ku[cu]); complex<T> tmp(v*ku[cu]);
size_t cv=0; size_t cv=0;
for (; cv<supp-3; cv+=4) for (; cv+3<supp; cv+=4)
{ {
ptr[cv ] += tmp*kv[cv ]; ptr[cv ] += tmp*kv[cv ];
ptr[cv+1] += tmp*kv[cv+1]; ptr[cv+1] += tmp*kv[cv+1];
...@@ -1063,7 +1063,7 @@ template<typename T, typename Serv> void grid2x_c ...@@ -1063,7 +1063,7 @@ template<typename T, typename Serv> void grid2x_c
{ {
complex<T> tmp(0); complex<T> tmp(0);
size_t cv=0; size_t cv=0;
for (; cv<supp-3; cv+=4) for (; cv+3<supp; cv+=4)
tmp += ptr[cv ]*kv[cv ] tmp += ptr[cv ]*kv[cv ]
+ ptr[cv+1]*kv[cv+1] + ptr[cv+1]*kv[cv+1]
+ ptr[cv+2]*kv[cv+2] + ptr[cv+2]*kv[cv+2]
......
...@@ -59,7 +59,7 @@ def explicit_gridder(uvw, freq, ms, wgt, nxdirty, nydirty, xpixsize, ypixsize, ...@@ -59,7 +59,7 @@ def explicit_gridder(uvw, freq, ms, wgt, nxdirty, nydirty, xpixsize, ypixsize,
@pmp("nydirty", (128, 250)) @pmp("nydirty", (128, 250))
@pmp("nrow", (2, 27)) @pmp("nrow", (2, 27))
@pmp("nchan", (1, 5)) @pmp("nchan", (1, 5))
@pmp("epsilon", (1e-3, 1e-5, 1e-7, 5e-13)) @pmp("epsilon", (1e-1, 1e-3, 1e-5, 1e-7, 5e-13))
@pmp("singleprec", (True, False)) @pmp("singleprec", (True, False))
@pmp("wstacking", (True, False)) @pmp("wstacking", (True, False))
@pmp("use_wgt", (True, False)) @pmp("use_wgt", (True, False))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment