Commit 9251080a authored by Martin Reinecke's avatar Martin Reinecke
Browse files

more blabla

parent 355cba73
......@@ -1002,6 +1002,7 @@ template<typename T, typename Serv> void x2dirty(
if (verbosity>0)
cout << "Gridding without w-stacking: " << srv.Nvis()
<< " visibilities" << endl;
if (verbosity>0) cout << "Using " << gconf.Nthreads() << " threads" << endl;
tmpStorage<complex<T>,2> grid_({nu,nv});
auto grid=grid_.getMav();
......@@ -1009,6 +1010,7 @@ template<typename T, typename Serv> void x2dirty(
x2grid_c(gconf, srv, grid);
tmpStorage<complex<T>,2> cdirty_({nx_dirty,ny_dirty});
auto cdirty=cdirty_.getMav();
// FIXME: this could use symmetries to accelerate the FFT
gconf.grid2dirty_c(grid, cdirty);
for (size_t i=0; i<nx_dirty; ++i)
for (size_t j=0; j<ny_dirty; ++j)
......@@ -1025,6 +1027,11 @@ template<typename T, typename Serv> void dirty2x(
auto nv=gconf.Nv();
size_t nvis = srv.Nvis();
if (verbosity>0)
cout << "Degridding without w-stacking: " << srv.Nvis()
<< " visibilities" << endl;
if (verbosity>0) cout << "Using " << gconf.Nthreads() << " threads" << endl;
for (size_t i=0; i<nvis; ++i)
srv.setVis(i, 0.);
......@@ -1036,6 +1043,7 @@ template<typename T, typename Serv> void dirty2x(
tmpStorage<complex<T>,2> grid_({nu,nv});
auto grid=grid_.getMav();
// FIXME: this could use symmetries to accelerate the FFT
gconf.dirty2grid_c(cdirty, grid);
grid2x_c(gconf, const_mav<complex<T>,2>(grid.data(),{nu,nv}), srv);
}
......@@ -1063,6 +1071,7 @@ template<typename T, typename Serv> void wstack_common(
wmin = min(wmin,wval[ipart]);
wmax = max(wmax,wval[ipart]);
}
if (verbosity>0) cout << "Using " << nthreads << " threads" << endl;
if (verbosity>0) cout << "W range: " << wmin << " to " << wmax << endl;
double x0 = -0.5*nx_dirty*psx,
y0 = -0.5*ny_dirty*psy;
......@@ -1113,6 +1122,7 @@ template<typename T, typename Serv> void x2dirty_wstack(
size_t nplanes;
vector<size_t> nvis_plane;
vector<int> minplane;
if (verbosity>0) cout << "Gridding using improved w-stacking" << endl;
wstack_common(gconf, srv, wmin, wval, dw, nplanes, nvis_plane, minplane, verbosity);
for (size_t i=0; i<nx_dirty; ++i)
......@@ -1190,6 +1200,7 @@ template<typename T, typename Serv> void dirty2x_wstack(
size_t nplanes;
vector<size_t> nvis_plane;
vector<int> minplane;
if (verbosity>0) cout << "Degridding using improved w-stacking" << endl;
wstack_common(gconf, srv, wmin, wval, dw, nplanes, nvis_plane, minplane, verbosity);
for (size_t i=0; i<nvis; ++i)
......
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