nifty_gridder.cc 39.8 KB
Newer Older
Martin Reinecke's avatar
Martin Reinecke committed
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
/*
 *  This file is part of nifty_gridder.
 *
 *  nifty_gridder is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
 *  the Free Software Foundation; either version 2 of the License, or
 *  (at your option) any later version.
 *
 *  nifty_gridder is distributed in the hope that it will be useful,
 *  but WITHOUT ANY WARRANTY; without even the implied warranty of
 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 *  GNU General Public License for more details.
 *
 *  You should have received a copy of the GNU General Public License
 *  along with nifty_fridder; if not, write to the Free Software
 *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */

Martin Reinecke's avatar
Martin Reinecke committed
19
20
21
/* Copyright (C) 2019 Max-Planck-Society
   Author: Martin Reinecke */

Martin Reinecke's avatar
import  
Martin Reinecke committed
22
23
24
25
#include <pybind11/pybind11.h>
#include <pybind11/numpy.h>
#include <iostream>
#include <algorithm>
Martin Reinecke's avatar
Martin Reinecke committed
26
27

#define POCKETFFT_OPENMP
Martin Reinecke's avatar
updates    
Martin Reinecke committed
28
#include "pocketfft_hdronly.h"
Martin Reinecke's avatar
import  
Martin Reinecke committed
29

Martin Reinecke's avatar
tweaks    
Martin Reinecke committed
30
31
#ifdef __GNUC__
#define RESTRICT __restrict__
Martin Reinecke's avatar
Martin Reinecke committed
32
#define NOINLINE __attribute__ ((noinline))
Martin Reinecke's avatar
tweaks    
Martin Reinecke committed
33
34
35
36
#else
#define RESTRICT
#endif

Martin Reinecke's avatar
import  
Martin Reinecke committed
37
38
39
40
41
42
using namespace std;

namespace py = pybind11;

namespace {

Martin Reinecke's avatar
Martin Reinecke committed
43
44
auto None = py::none();

Martin Reinecke's avatar
cleanup    
Martin Reinecke committed
45
46
47
48
//
// basic utilities
//

49
50
51
52
53
54
void myassert(bool cond, const char *msg)
  {
  if (cond) return;
  throw runtime_error(msg);
  }

Martin Reinecke's avatar
cleanup    
Martin Reinecke committed
55
56
57
58
59
60
61
62
63
64
65
/*! Returns the remainder of the division \a v1/v2.
    The result is non-negative.
    \a v1 can be positive or negative; \a v2 must be positive. */
template<typename T> inline T fmodulo (T v1, T v2)
  {
  if (v1>=0)
    return (v1<v2) ? v1 : fmod(v1,v2);
  T tmp=fmod(v1,v2)+v2;
  return (tmp==v2) ? T(0) : tmp;
  }

Martin Reinecke's avatar
Martin Reinecke committed
66
67
68
69
//
// Utilities for Gauss-Legendre quadrature
//

Martin Reinecke's avatar
Martin Reinecke committed
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
static inline double one_minus_x2 (double x)
  { return (fabs(x)>0.1) ? (1.+x)*(1.-x) : 1.-x*x; }

void legendre_prep(int n, vector<double> &x, vector<double> &w)
  {
  constexpr double pi = 3.141592653589793238462643383279502884197;
  constexpr double eps = 3e-14;
  int m = (n+1)>>1;
  x.resize(m);
  w.resize(m);

  double t0 = 1 - (1-1./n) / (8.*n*n);
  double t1 = 1./(4.*n+2.);

#pragma omp parallel
{
  int i;
#pragma omp for schedule(dynamic,100)
  for (i=1; i<=m; ++i)
    {
    double x0 = cos(pi * ((i<<2)-1) * t1) * t0;

    int dobreak=0;
    int j=0;
    double dpdx;
    while(1)
      {
      double P_1 = 1.0;
      double P0 = x0;
      double dx, x1;

      for (int k=2; k<=n; k++)
        {
        double P_2 = P_1;
        P_1 = P0;
//        P0 = ((2*k-1)*x0*P_1-(k-1)*P_2)/k;
        P0 = x0*P_1 + (k-1.)/k * (x0*P_1-P_2);
        }

      dpdx = (P_1 - x0*P0) * n / one_minus_x2(x0);

      /* Newton step */
      x1 = x0 - P0/dpdx;
      dx = x0-x1;
      x0 = x1;
      if (dobreak) break;

      if (abs(dx)<=eps) dobreak=1;
      if (++j>=100) throw runtime_error("convergence problem");
      }

    x[m-i] = x0;
    w[m-i] = 2. / (one_minus_x2(x0) * dpdx * dpdx);
    }
} // end of parallel region
  }

Martin Reinecke's avatar
Martin Reinecke committed
127
128
129
130
//
// Start of real gridder functionality
//

131
132
template<typename T>
  using pyarr = py::array_t<T>;
133
// The "_c" suffix here stands for "C memory order, contiguous"
134
135
template<typename T>
  using pyarr_c = py::array_t<T, py::array::c_style | py::array::forcecast>;
Martin Reinecke's avatar
import  
Martin Reinecke committed
136

Martin Reinecke's avatar
merge    
Martin Reinecke committed
137
template<typename T> pyarr_c<T> makeArray(const vector<size_t> &shape)
Martin Reinecke's avatar
updates    
Martin Reinecke committed
138
139
  { return pyarr_c<T>(shape); }

Martin Reinecke's avatar
cleanup    
Martin Reinecke committed
140
size_t get_w(double epsilon)
Martin Reinecke's avatar
Martin Reinecke committed
141
142
143
144
145
146
147
148
149
150
151
  {
  static const vector<double> maxmaperr { 1e8, 0.32, 0.021, 6.2e-4,
    1.08e-5, 1.25e-7, 8.25e-10, 5.70e-12, 1.22e-13, 2.48e-15, 4.82e-17,
    6.74e-19, 5.41e-21, 4.41e-23, 7.88e-25, 3.9e-26 };

  double epssq = epsilon*epsilon;

  for (size_t i=1; i<maxmaperr.size(); ++i)
    if (epssq>maxmaperr[i]) return i;
  throw runtime_error("requested epsilon too small - minimum is 2e-13");
  }
Martin Reinecke's avatar
Martin Reinecke committed
152

Martin Reinecke's avatar
merge    
Martin Reinecke committed
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
void checkArray(const py::array &arr, const char *aname,
  const vector<size_t> &shape)
  {
  if (size_t(arr.ndim())!=shape.size())
    {
    cerr << "Array '" << aname << "' has " << arr.ndim() << " dimensions; "
            "expected " << shape.size() << endl;
    throw runtime_error("bad dimensionality");
    }
  for (size_t i=0; i<shape.size(); ++i)
    if ((shape[i]!=0) && (size_t(arr.shape(i))!=shape[i]))
      {
      cerr << "Dimension " << i << " of array '" << aname << "' has size "
           << arr.shape(i) << "; expected " << shape[i] << endl;
      throw runtime_error("bad array size");
      }
  }

171
template<typename T> pyarr<T> provideArray(py::object &in,
Martin Reinecke's avatar
merge    
Martin Reinecke committed
172
173
  const vector<size_t> &shape)
  {
174
  if (in.is_none())
Martin Reinecke's avatar
merge    
Martin Reinecke committed
175
176
177
178
179
180
181
182
    {
    auto tmp_ = makeArray<T>(shape);
    size_t sz = size_t(tmp_.size());
    auto tmp = tmp_.mutable_data();
    for (size_t i=0; i<sz; ++i)
      tmp[i] = T(0);
    return tmp_;
    }
183
  auto tmp_ = in.cast<pyarr<T>>();
Martin Reinecke's avatar
merge    
Martin Reinecke committed
184
185
186
187
  checkArray(tmp_, "temporary", shape);
  return tmp_;
  }

Martin Reinecke's avatar
Martin Reinecke committed
188
template<typename T> pyarr_c<T> provideCArray(py::object &in,
Martin Reinecke's avatar
merge    
Martin Reinecke committed
189
190
  const vector<size_t> &shape)
  {
191
  if (in.is_none())
Martin Reinecke's avatar
merge    
Martin Reinecke committed
192
193
194
195
196
197
198
199
200
201
202
203
204
    {
    auto tmp_ = makeArray<T>(shape);
    size_t sz = size_t(tmp_.size());
    auto tmp = tmp_.mutable_data();
    for (size_t i=0; i<sz; ++i)
      tmp[i] = T(0);
    return tmp_;
    }
  auto tmp_ = in.cast<pyarr_c<T>>();
  checkArray(tmp_, "temporary", shape);
  return tmp_;
  }

Martin Reinecke's avatar
Martin Reinecke committed
205
template<typename T> pyarr_c<T> complex2hartley
206
  (const pyarr_c<complex<T>> &grid_, py::object &grid_in)
Martin Reinecke's avatar
Martin Reinecke committed
207
  {
Martin Reinecke's avatar
merge    
Martin Reinecke committed
208
  checkArray(grid_, "grid", {0,0});
Martin Reinecke's avatar
updates    
Martin Reinecke committed
209
  size_t nu = size_t(grid_.shape(0)), nv = size_t(grid_.shape(1));
Martin Reinecke's avatar
Martin Reinecke committed
210
211
  auto grid = grid_.data();

212
  auto res = provideCArray<T>(grid_in, {nu, nv});
Martin Reinecke's avatar
Martin Reinecke committed
213
  auto grid2 = res.mutable_data();
Martin Reinecke's avatar
Martin Reinecke committed
214
215
  {
  py::gil_scoped_release release;
Martin Reinecke's avatar
Martin Reinecke committed
216
#pragma omp parallel for
Martin Reinecke's avatar
updates    
Martin Reinecke committed
217
  for (size_t u=0; u<nu; ++u)
Martin Reinecke's avatar
Martin Reinecke committed
218
    {
Martin Reinecke's avatar
updates    
Martin Reinecke committed
219
220
    size_t xu = (u==0) ? 0 : nu-u;
    for (size_t v=0; v<nv; ++v)
Martin Reinecke's avatar
Martin Reinecke committed
221
      {
Martin Reinecke's avatar
updates    
Martin Reinecke committed
222
223
224
      size_t xv = (v==0) ? 0 : nv-v;
      size_t i1 = u*nv+v;
      size_t i2 = xu*nv+xv;
225
226
      grid2[i1] += T(0.5)*(grid[i1].real()+grid[i1].imag()+
                           grid[i2].real()-grid[i2].imag());
Martin Reinecke's avatar
Martin Reinecke committed
227
228
      }
    }
Martin Reinecke's avatar
Martin Reinecke committed
229
  }
Martin Reinecke's avatar
Martin Reinecke committed
230
231
232
  return res;
  }

Martin Reinecke's avatar
Martin Reinecke committed
233
234
template<typename T> pyarr_c<complex<T>> hartley2complex
  (const pyarr_c<T> &grid_)
Martin Reinecke's avatar
Martin Reinecke committed
235
  {
Martin Reinecke's avatar
merge    
Martin Reinecke committed
236
  checkArray(grid_, "grid", {0, 0});
Martin Reinecke's avatar
updates    
Martin Reinecke committed
237
  size_t nu = size_t(grid_.shape(0)), nv = size_t(grid_.shape(1));
Martin Reinecke's avatar
Martin Reinecke committed
238
239
  auto grid = grid_.data();

Martin Reinecke's avatar
merge    
Martin Reinecke committed
240
  auto res=makeArray<complex<T>>({nu, nv});
Martin Reinecke's avatar
Martin Reinecke committed
241
  auto grid2 = res.mutable_data();
Martin Reinecke's avatar
Martin Reinecke committed
242
243
  {
  py::gil_scoped_release release;
Martin Reinecke's avatar
Martin Reinecke committed
244
#pragma omp parallel for
Martin Reinecke's avatar
updates    
Martin Reinecke committed
245
  for (size_t u=0; u<nu; ++u)
Martin Reinecke's avatar
Martin Reinecke committed
246
    {
Martin Reinecke's avatar
updates    
Martin Reinecke committed
247
248
    size_t xu = (u==0) ? 0 : nu-u;
    for (size_t v=0; v<nv; ++v)
Martin Reinecke's avatar
Martin Reinecke committed
249
      {
Martin Reinecke's avatar
updates    
Martin Reinecke committed
250
251
252
      size_t xv = (v==0) ? 0 : nv-v;
      size_t i1 = u*nv+v;
      size_t i2 = xu*nv+xv;
Martin Reinecke's avatar
Martin Reinecke committed
253
254
255
      T v1 = T(0.5)*grid[i1];
      T v2 = T(0.5)*grid[i2];
      grid2[i1] = complex<T>(v1+v2, v1-v2);
Martin Reinecke's avatar
Martin Reinecke committed
256
257
      }
    }
Martin Reinecke's avatar
Martin Reinecke committed
258
  }
Martin Reinecke's avatar
Martin Reinecke committed
259
260
261
  return res;
  }

Martin Reinecke's avatar
Martin Reinecke committed
262
263
264
template<typename T> void hartley2_2D(const pyarr_c<T> &in, pyarr_c<T> &out)
  {
  size_t nu=in.shape(0), nv=in.shape(1);
Martin Reinecke's avatar
Martin Reinecke committed
265
266
267
  pocketfft::stride_t s_i{in.strides(0), in.strides(1)},
                      s_o{out.strides(0), out.strides(1)};
  auto d_i = in.data();
Martin Reinecke's avatar
Martin Reinecke committed
268
  auto ptmp = out.mutable_data();
Martin Reinecke's avatar
Martin Reinecke committed
269
270
271
  {
  py::gil_scoped_release release;
  pocketfft::r2r_hartley({nu, nv}, s_i, s_o, {0,1}, d_i, ptmp, T(1), 0);
Martin Reinecke's avatar
Martin Reinecke committed
272
#pragma omp parallel for
Martin Reinecke's avatar
Martin Reinecke committed
273
274
275
276
277
278
279
280
281
282
283
284
285
  for(size_t i=1; i<(nu+1)/2; ++i)
    for(size_t j=1; j<(nv+1)/2; ++j)
       {
       T a = ptmp[i*nv+j];
       T b = ptmp[(nu-i)*nv+j];
       T c = ptmp[i*nv+nv-j];
       T d = ptmp[(nu-i)*nv+nv-j];
       ptmp[i*nv+j] = T(0.5)*(a+b+c-d);
       ptmp[(nu-i)*nv+j] = T(0.5)*(a+b+d-c);
       ptmp[i*nv+nv-j] = T(0.5)*(a+c+d-b);
       ptmp[(nu-i)*nv+nv-j] = T(0.5)*(b+c+d-a);
       }
  }
Martin Reinecke's avatar
Martin Reinecke committed
286
  }
Martin Reinecke's avatar
Martin Reinecke committed
287

Martin Reinecke's avatar
Martin Reinecke committed
288
289
/* Compute correction factors for the ES gridding kernel
   This implementation follows eqs. (3.8) to (3.10) of Barnett et al. 2018 */
Martin Reinecke's avatar
updates    
Martin Reinecke committed
290
vector<double> correction_factors (size_t n, size_t nval, size_t w)
Martin Reinecke's avatar
Martin Reinecke committed
291
292
293
294
295
296
297
298
299
300
  {
  constexpr double pi = 3.141592653589793238462643383279502884197;
  auto beta = 2.3*w;
  auto p = int(1.5*w+2);
  double alpha = pi*w/n;
  vector<double> x, wgt;
  legendre_prep(2*p,x,wgt);
  auto psi = x;
  for (auto &v:psi)
    v = exp(beta*(sqrt(1-v*v)-1.));
Martin Reinecke's avatar
updates    
Martin Reinecke committed
301
  vector<double> res(nval);
Martin Reinecke's avatar
Martin Reinecke committed
302
#pragma omp parallel for schedule(static)
Martin Reinecke's avatar
Martin Reinecke committed
303
304
305
306
307
  for (size_t k=0; k<nval; ++k)
    {
    double tmp=0;
    for (int i=0; i<p; ++i)
      tmp += wgt[i]*psi[i]*cos(alpha*k*x[i]);
Martin Reinecke's avatar
updates    
Martin Reinecke committed
308
    res[k] = 1./(w*tmp);
Martin Reinecke's avatar
Martin Reinecke committed
309
310
311
312
    }
  return res;
  }

Martin Reinecke's avatar
Martin Reinecke committed
313
template<typename T> struct UVW
Martin Reinecke's avatar
updates    
Martin Reinecke committed
314
  {
Martin Reinecke's avatar
Martin Reinecke committed
315
  T u, v, w;
Martin Reinecke's avatar
updates    
Martin Reinecke committed
316
  UVW () {}
Martin Reinecke's avatar
Martin Reinecke committed
317
318
  UVW (T u_, T v_, T w_) : u(u_), v(v_), w(w_) {}
  UVW operator* (T fct) const
Martin Reinecke's avatar
updates    
Martin Reinecke committed
319
320
    { return UVW(u*fct, v*fct, w*fct); }
  };
Martin Reinecke's avatar
Martin Reinecke committed
321

Martin Reinecke's avatar
Martin Reinecke committed
322
template<typename T> class Baselines
Martin Reinecke's avatar
Martin Reinecke committed
323
324
  {
  private:
Martin Reinecke's avatar
Martin Reinecke committed
325
    vector<UVW<T>> coord;
326
    vector<T> f_over_c;
Martin Reinecke's avatar
updates    
Martin Reinecke committed
327
    size_t nrows, nchan;
Martin Reinecke's avatar
Martin Reinecke committed
328
329

  public:
330
    Baselines(const pyarr<T> &coord_, const pyarr<T> &freq_)
Martin Reinecke's avatar
Martin Reinecke committed
331
      {
332
      constexpr double speedOfLight = 299792458.;
Martin Reinecke's avatar
merge    
Martin Reinecke committed
333
      checkArray(coord_, "coord", {0, 3});
334
      checkArray(freq_, "freq", {0});
Martin Reinecke's avatar
Martin Reinecke committed
335
      nrows = coord_.shape(0);
336
      nchan = freq_.shape(0);
Martin Reinecke's avatar
Martin Reinecke committed
337
      myassert(nrows*nchan<(size_t(1)<<32), "too many entries in MS");
338
339
      auto freq = freq_.template unchecked<1>();
      auto cood = coord_.template unchecked<2>();
Martin Reinecke's avatar
Martin Reinecke committed
340
341
      {
      py::gil_scoped_release release;
342
      f_over_c.resize(nchan);
Martin Reinecke's avatar
updates    
Martin Reinecke committed
343
      for (size_t i=0; i<nchan; ++i)
344
        f_over_c[i] = freq(i)/speedOfLight;
Martin Reinecke's avatar
Martin Reinecke committed
345
346
      coord.resize(nrows);
      for (size_t i=0; i<coord.size(); ++i)
347
        coord[i] = UVW<T>(cood(i,0), cood(i,1), cood(i,2));
Martin Reinecke's avatar
Martin Reinecke committed
348
      }
Martin Reinecke's avatar
Martin Reinecke committed
349
350
      }

Martin Reinecke's avatar
Martin Reinecke committed
351
    UVW<T> effectiveCoord(uint32_t index) const
352
353
354
      {
      size_t irow = index/nchan;
      size_t ichan = index-nchan*irow;
355
      return coord[irow]*f_over_c[ichan];
356
357
      }
    UVW<T> effectiveCoord(size_t irow, size_t ichan) const
358
      { return coord[irow]*f_over_c[ichan]; }
Martin Reinecke's avatar
Martin Reinecke committed
359
    size_t Nrows() const { return nrows; }
Martin Reinecke's avatar
updates    
Martin Reinecke committed
360
361
    size_t Nchannels() const { return nchan; }

362
    template<typename T2> pyarr_c<T2> ms2vis(const pyarr<T2> &ms_,
Martin Reinecke's avatar
updates    
Martin Reinecke committed
363
364
      const pyarr_c<uint32_t> &idx_) const
      {
Martin Reinecke's avatar
merge    
Martin Reinecke committed
365
366
      checkArray(idx_, "idx", {0});
      checkArray(ms_, "ms", {nrows, nchan});
Martin Reinecke's avatar
updates    
Martin Reinecke committed
367
      size_t nvis = size_t(idx_.shape(0));
368
369
      auto idx = idx_.template unchecked<1>();
      auto ms = ms_.template unchecked<2>();
Martin Reinecke's avatar
updates    
Martin Reinecke committed
370

Martin Reinecke's avatar
merge    
Martin Reinecke committed
371
      auto res=makeArray<T2>({nvis});
Martin Reinecke's avatar
updates    
Martin Reinecke committed
372
      auto vis = res.mutable_data();
Martin Reinecke's avatar
Martin Reinecke committed
373
374
      {
      py::gil_scoped_release release;
Martin Reinecke's avatar
Martin Reinecke committed
375
#pragma omp parallel for
Martin Reinecke's avatar
updates    
Martin Reinecke committed
376
      for (size_t i=0; i<nvis; ++i)
377
378
379
380
381
382
        {
        auto t = idx(i);
        auto row = t/nchan;
        auto chan = t-row*nchan;
        vis[i] = ms(row, chan);
        }
Martin Reinecke's avatar
Martin Reinecke committed
383
      }
Martin Reinecke's avatar
updates    
Martin Reinecke committed
384
385
386
      return res;
      }

387
388
    template<typename T2> pyarr_c<T2> vis2ms(const pyarr<T2> &vis_,
      const pyarr<uint32_t> &idx_, py::object &ms_in) const
Martin Reinecke's avatar
updates    
Martin Reinecke committed
389
      {
Martin Reinecke's avatar
merge    
Martin Reinecke committed
390
      checkArray(vis_, "vis", {0});
Martin Reinecke's avatar
updates    
Martin Reinecke committed
391
      size_t nvis = size_t(vis_.shape(0));
Martin Reinecke's avatar
merge    
Martin Reinecke committed
392
      checkArray(idx_, "idx", {nvis});
393
394
      auto idx = idx_.template unchecked<1>();
      auto vis = vis_.template unchecked<1>();
Martin Reinecke's avatar
updates    
Martin Reinecke committed
395

Martin Reinecke's avatar
merge    
Martin Reinecke committed
396
      auto res = provideArray<T2>(ms_in, {nrows, nchan});
397
      auto ms = res.template mutable_unchecked<2>();
Martin Reinecke's avatar
Martin Reinecke committed
398
399
      {
      py::gil_scoped_release release;
Martin Reinecke's avatar
Martin Reinecke committed
400
#pragma omp parallel for
Martin Reinecke's avatar
updates    
Martin Reinecke committed
401
      for (size_t i=0; i<nvis; ++i)
402
403
404
405
        {
        auto t = idx(i);
        auto row = t/nchan;
        auto chan = t-row*nchan;
Martin Reinecke's avatar
Martin Reinecke committed
406
        ms(row, chan) += vis(i);
407
        }
Martin Reinecke's avatar
Martin Reinecke committed
408
      }
Martin Reinecke's avatar
updates    
Martin Reinecke committed
409
410
      return res;
      }
Martin Reinecke's avatar
Martin Reinecke committed
411
412
  };

Martin Reinecke's avatar
Martin Reinecke committed
413
414
constexpr int logsquare=4;

Martin Reinecke's avatar
Martin Reinecke committed
415
template<typename T> class GridderConfig
Martin Reinecke's avatar
Martin Reinecke committed
416
417
418
  {
  private:
    size_t nx_dirty, ny_dirty;
Martin Reinecke's avatar
Martin Reinecke committed
419
    double eps, psx, psy;
Martin Reinecke's avatar
Martin Reinecke committed
420
    size_t w, nsafe, nu, nv;
Martin Reinecke's avatar
cleanup    
Martin Reinecke committed
421
    T beta;
Martin Reinecke's avatar
Martin Reinecke committed
422
    vector<T> cfu, cfv;
Martin Reinecke's avatar
Martin Reinecke committed
423
424
425

  public:
    GridderConfig(size_t nxdirty, size_t nydirty, double epsilon,
Martin Reinecke's avatar
Martin Reinecke committed
426
      double pixsize_x, double pixsize_y)
Martin Reinecke's avatar
Martin Reinecke committed
427
428
      : nx_dirty(nxdirty), ny_dirty(nydirty), eps(epsilon),
        psx(pixsize_x), psy(pixsize_y),
Martin Reinecke's avatar
Martin Reinecke committed
429
430
        w(get_w(epsilon)), nsafe((w+1)/2),
        nu(max(2*nsafe,2*nx_dirty)), nv(max(2*nsafe,2*ny_dirty)),
Martin Reinecke's avatar
cleanup    
Martin Reinecke committed
431
        beta(2.3*w),
Martin Reinecke's avatar
updates    
Martin Reinecke committed
432
        cfu(nx_dirty), cfv(ny_dirty)
Martin Reinecke's avatar
Martin Reinecke committed
433
      {
Martin Reinecke's avatar
Martin Reinecke committed
434
435
      {
      py::gil_scoped_release release;
Martin Reinecke's avatar
Martin Reinecke committed
436
437
438
      myassert((nx_dirty&1)==0, "nx_dirty must be even");
      myassert((ny_dirty&1)==0, "ny_dirty must be even");
      myassert(epsilon>0, "epsilon must be positive");
Martin Reinecke's avatar
Martin Reinecke committed
439
440
      myassert(pixsize_x>0, "pixsize_x must be positive");
      myassert(pixsize_y>0, "pixsize_y must be positive");
Martin Reinecke's avatar
updates    
Martin Reinecke committed
441
442
443
444
445
446
447
448
449
450
451

      auto tmp = correction_factors(nu, nx_dirty/2+1, w);
      cfu[nx_dirty/2]=tmp[0];
      cfu[0]=tmp[nx_dirty/2];
      for (size_t i=1; i<nx_dirty/2; ++i)
        cfu[nx_dirty/2-i] = cfu[nx_dirty/2+i] = tmp[i];
      tmp = correction_factors(nv, ny_dirty/2+1, w);
      cfv[ny_dirty/2]=tmp[0];
      cfv[0]=tmp[ny_dirty/2];
      for (size_t i=1; i<ny_dirty/2; ++i)
        cfv[ny_dirty/2-i] = cfv[ny_dirty/2+i] = tmp[i];
Martin Reinecke's avatar
Martin Reinecke committed
452
      }
Martin Reinecke's avatar
Martin Reinecke committed
453
      }
Martin Reinecke's avatar
Martin Reinecke committed
454
455
456
457
458
    size_t Nxdirty() const { return nx_dirty; }
    size_t Nydirty() const { return ny_dirty; }
    double Epsilon() const { return eps; }
    double Pixsize_x() const { return psx; }
    double Pixsize_y() const { return psy; }
Martin Reinecke's avatar
Martin Reinecke committed
459
460
461
    size_t Nu() const { return nu; }
    size_t Nv() const { return nv; }
    size_t W() const { return w; }
462
    size_t Nsafe() const { return nsafe; }
Martin Reinecke's avatar
cleanup    
Martin Reinecke committed
463
    T Beta() const { return beta; }
Martin Reinecke's avatar
Martin Reinecke committed
464
    pyarr_c<T> grid2dirty(const pyarr_c<T> &grid) const
Martin Reinecke's avatar
Martin Reinecke committed
465
      {
Martin Reinecke's avatar
merge    
Martin Reinecke committed
466
467
      checkArray(grid, "grid", {nu, nv});
      auto tmp = makeArray<T>({nu, nv});
Martin Reinecke's avatar
updates    
Martin Reinecke committed
468
      auto ptmp = tmp.mutable_data();
Martin Reinecke's avatar
Martin Reinecke committed
469
      hartley2_2D<T>(grid, tmp);
Martin Reinecke's avatar
merge    
Martin Reinecke committed
470
      auto res = makeArray<T>({nx_dirty, ny_dirty});
Martin Reinecke's avatar
updates    
Martin Reinecke committed
471
      auto pout = res.mutable_data();
Martin Reinecke's avatar
Martin Reinecke committed
472
473
      {
      py::gil_scoped_release release;
Martin Reinecke's avatar
updates    
Martin Reinecke committed
474
475
476
477
478
479
480
481
482
      for (size_t i=0; i<nx_dirty; ++i)
        for (size_t j=0; j<ny_dirty; ++j)
          {
          size_t i2 = nu-nx_dirty/2+i;
          if (i2>=nu) i2-=nu;
          size_t j2 = nv-ny_dirty/2+j;
          if (j2>=nv) j2-=nv;
          pout[ny_dirty*i + j] = ptmp[nv*i2+j2]*cfu[i]*cfv[j];
          }
Martin Reinecke's avatar
Martin Reinecke committed
483
      }
Martin Reinecke's avatar
Martin Reinecke committed
484
485
      return res;
      }
486
487
    pyarr_c<complex<T>> grid2dirty_c(const pyarr_c<complex<T>> &grid) const
      {
Martin Reinecke's avatar
merge    
Martin Reinecke committed
488
489
      checkArray(grid, "grid", {nu, nv});
      auto tmp = makeArray<complex<T>>({nu, nv});
490
491
492
493
      auto ptmp = tmp.mutable_data();
      pocketfft::c2c({nu,nv},{grid.strides(0),grid.strides(1)},
        {tmp.strides(0), tmp.strides(1)}, {0,1}, pocketfft::BACKWARD,
        grid.data(), tmp.mutable_data(), T(1), 0);
Martin Reinecke's avatar
merge    
Martin Reinecke committed
494
      auto res = makeArray<complex<T>>({nx_dirty, ny_dirty});
495
      auto pout = res.mutable_data();
Martin Reinecke's avatar
Martin Reinecke committed
496
497
      {
      py::gil_scoped_release release;
498
499
500
501
502
503
504
505
506
      for (size_t i=0; i<nx_dirty; ++i)
        for (size_t j=0; j<ny_dirty; ++j)
          {
          size_t i2 = nu-nx_dirty/2+i;
          if (i2>=nu) i2-=nu;
          size_t j2 = nv-ny_dirty/2+j;
          if (j2>=nv) j2-=nv;
          pout[ny_dirty*i + j] = ptmp[nv*i2+j2]*cfu[i]*cfv[j];
          }
Martin Reinecke's avatar
Martin Reinecke committed
507
      }
508
509
      return res;
      }
Martin Reinecke's avatar
Martin Reinecke committed
510
    pyarr_c<T> dirty2grid(const pyarr_c<T> &dirty) const
Martin Reinecke's avatar
updates    
Martin Reinecke committed
511
      {
Martin Reinecke's avatar
merge    
Martin Reinecke committed
512
      checkArray(dirty, "dirty", {nx_dirty, ny_dirty});
Martin Reinecke's avatar
updates    
Martin Reinecke committed
513
      auto pdirty = dirty.data();
Martin Reinecke's avatar
merge    
Martin Reinecke committed
514
      auto tmp = makeArray<T>({nu, nv});
Martin Reinecke's avatar
updates    
Martin Reinecke committed
515
      auto ptmp = tmp.mutable_data();
Martin Reinecke's avatar
Martin Reinecke committed
516
517
      {
      py::gil_scoped_release release;
Martin Reinecke's avatar
updates    
Martin Reinecke committed
518
519
520
521
522
523
524
525
526
527
528
      for (size_t i=0; i<nu*nv; ++i)
        ptmp[i] = 0.;
      for (size_t i=0; i<nx_dirty; ++i)
        for (size_t j=0; j<ny_dirty; ++j)
          {
          size_t i2 = nu-nx_dirty/2+i;
          if (i2>=nu) i2-=nu;
          size_t j2 = nv-ny_dirty/2+j;
          if (j2>=nv) j2-=nv;
          ptmp[nv*i2+j2] = pdirty[ny_dirty*i + j]*cfu[i]*cfv[j];
          }
Martin Reinecke's avatar
Martin Reinecke committed
529
      }
Martin Reinecke's avatar
Martin Reinecke committed
530
      hartley2_2D<T>(tmp, tmp);
Martin Reinecke's avatar
updates    
Martin Reinecke committed
531
532
      return tmp;
      }
533
534
    pyarr_c<complex<T>> dirty2grid_c(const pyarr_c<complex<T>> &dirty) const
      {
Martin Reinecke's avatar
merge    
Martin Reinecke committed
535
      checkArray(dirty, "dirty", {nx_dirty, ny_dirty});
536
      auto pdirty = dirty.data();
Martin Reinecke's avatar
merge    
Martin Reinecke committed
537
      auto tmp = makeArray<complex<T>>({nu, nv});
538
      auto ptmp = tmp.mutable_data();
Martin Reinecke's avatar
Martin Reinecke committed
539
540
541
      pocketfft::stride_t strides{tmp.strides(0),tmp.strides(1)};
      {
      py::gil_scoped_release release;
542
543
544
545
546
547
548
549
550
551
552
      for (size_t i=0; i<nu*nv; ++i)
        ptmp[i] = 0.;
      for (size_t i=0; i<nx_dirty; ++i)
        for (size_t j=0; j<ny_dirty; ++j)
          {
          size_t i2 = nu-nx_dirty/2+i;
          if (i2>=nu) i2-=nu;
          size_t j2 = nv-ny_dirty/2+j;
          if (j2>=nv) j2-=nv;
          ptmp[nv*i2+j2] = pdirty[ny_dirty*i + j]*cfu[i]*cfv[j];
          }
Martin Reinecke's avatar
Martin Reinecke committed
553
554
555
      pocketfft::c2c({nu,nv}, strides, strides, {0,1}, pocketfft::FORWARD,
        ptmp, ptmp, T(1), 0);
      }
556
557
      return tmp;
      }
Martin Reinecke's avatar
cleanup    
Martin Reinecke committed
558
559
    inline void getpix(T u_in, T v_in, T &u, T &v, int &iu0, int &iv0) const
      {
Martin Reinecke's avatar
Martin Reinecke committed
560
      u=fmodulo(u_in*psx, T(1))*nu,
Martin Reinecke's avatar
cleanup    
Martin Reinecke committed
561
562
      iu0 = int(u-w*0.5 + 1 + nu) - nu;
      if (iu0+w>nu+nsafe) iu0 = nu+nsafe-w;
Martin Reinecke's avatar
Martin Reinecke committed
563
      v=fmodulo(v_in*psy, T(1))*nv;
Martin Reinecke's avatar
cleanup    
Martin Reinecke committed
564
565
566
      iv0 = int(v-w*0.5 + 1 + nv) - nv;
      if (iv0+w>nv+nsafe) iv0 = nv+nsafe-w;
      }
Martin Reinecke's avatar
Martin Reinecke committed
567
568
  };

Martin Reinecke's avatar
Martin Reinecke committed
569
template<typename T> class Helper
Martin Reinecke's avatar
import  
Martin Reinecke committed
570
  {
Martin Reinecke's avatar
Martin Reinecke committed
571
  private:
Martin Reinecke's avatar
cleanup    
Martin Reinecke committed
572
    const GridderConfig<T> &gconf;
Martin Reinecke's avatar
Martin Reinecke committed
573
574
    int nu, nv, nsafe, w;
    T beta;
575
576
577
    const complex<T> *grid_r;
    complex<T> *grid_w;
    int su, sv;
Martin Reinecke's avatar
Martin Reinecke committed
578
579
580
    int iu0, iv0; // start index of the current visibility
    int bu0, bv0; // start index of the current buffer

581
    vector<complex<T>> rbuf, wbuf;
Martin Reinecke's avatar
import  
Martin Reinecke committed
582

Martin Reinecke's avatar
Martin Reinecke committed
583
    void dump() const
Martin Reinecke's avatar
import  
Martin Reinecke committed
584
      {
Martin Reinecke's avatar
Martin Reinecke committed
585
      if (bu0<-nsafe) return; // nothing written into buffer yet
Martin Reinecke's avatar
cleanup    
Martin Reinecke committed
586

Martin Reinecke's avatar
merge    
Martin Reinecke committed
587
#pragma omp critical (gridder_writing_to_grid)
Martin Reinecke's avatar
import  
Martin Reinecke committed
588
{
Martin Reinecke's avatar
Martin Reinecke committed
589
590
591
      int idxu = (bu0+nu)%nu;
      int idxv0 = (bv0+nv)%nv;
      for (int iu=0; iu<su; ++iu)
Martin Reinecke's avatar
import  
Martin Reinecke committed
592
593
        {
        int idxv = idxv0;
Martin Reinecke's avatar
Martin Reinecke committed
594
        for (int iv=0; iv<sv; ++iv)
Martin Reinecke's avatar
import  
Martin Reinecke committed
595
          {
596
          grid_w[idxu*nv + idxv] += wbuf[iu*sv + iv];
Martin Reinecke's avatar
import  
Martin Reinecke committed
597
598
599
600
601
602
603
604
605
          if (++idxv>=nv) idxv=0;
          }
        if (++idxu>=nu) idxu=0;
        }
}
      }

    void load()
      {
Martin Reinecke's avatar
Martin Reinecke committed
606
607
608
      int idxu = (bu0+nu)%nu;
      int idxv0 = (bv0+nv)%nv;
      for (int iu=0; iu<su; ++iu)
Martin Reinecke's avatar
import  
Martin Reinecke committed
609
610
        {
        int idxv = idxv0;
Martin Reinecke's avatar
Martin Reinecke committed
611
        for (int iv=0; iv<sv; ++iv)
Martin Reinecke's avatar
import  
Martin Reinecke committed
612
          {
613
          rbuf[iu*sv + iv] = grid_r[idxu*nv + idxv];
Martin Reinecke's avatar
import  
Martin Reinecke committed
614
615
616
617
618
619
620
          if (++idxv>=nv) idxv=0;
          }
        if (++idxu>=nu) idxu=0;
        }
      }

  public:
621
622
    const complex<T> *p0r;
    complex<T> *p0w;
Martin Reinecke's avatar
Martin Reinecke committed
623
    vector<T> kernel;
Martin Reinecke's avatar
import  
Martin Reinecke committed
624

625
626
627
628
    Helper(const GridderConfig<T> &gconf_, const complex<T> *grid_r_,
      complex<T> *grid_w_)
      : gconf(gconf_), nu(gconf.Nu()), nv(gconf.Nv()), nsafe(gconf.Nsafe()),
        w(gconf.W()), beta(gconf.Beta()), grid_r(grid_r_), grid_w(grid_w_),
Martin Reinecke's avatar
Martin Reinecke committed
629
        su(2*nsafe+(1<<logsquare)), sv(2*nsafe+(1<<logsquare)),
630
631
632
633
        bu0(-1000000), bv0(-1000000),
        rbuf(su*sv*(grid_r!=nullptr),T(0)),
        wbuf(su*sv*(grid_w!=nullptr),T(0)),
        kernel(2*w)
Martin Reinecke's avatar
Martin Reinecke committed
634
      {}
635
636
637
    ~Helper() { if (grid_w) dump(); }

    int lineJump() const { return sv; }
Martin Reinecke's avatar
Martin Reinecke committed
638
639

    void prep(T u_in, T v_in)
Martin Reinecke's avatar
import  
Martin Reinecke committed
640
      {
Martin Reinecke's avatar
Martin Reinecke committed
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
      T u, v;
      gconf.getpix(u_in, v_in, u, v, iu0, iv0);
      T xw=T(2)/w;
      auto x0 = xw*(iu0-u);
      auto y0 = xw*(iv0-v);
      for (int i=0; i<w; ++i)
        {
        auto x = x0+i*xw;
        kernel[i  ] = beta*sqrt(T(1)-x*x);
        auto y = y0+i*xw;
        kernel[i+w] = beta*sqrt(T(1)-y*y);
        }
      for (auto &k : kernel)
        k = exp(k);

      if ((iu0<bu0) || (iv0<bv0) || (iu0+w>bu0+su) || (iv0+w>bv0+sv))
Martin Reinecke's avatar
import  
Martin Reinecke committed
657
        {
658
        if (grid_w) { dump(); fill(wbuf.begin(), wbuf.end(), T(0)); }
Martin Reinecke's avatar
Martin Reinecke committed
659
660
        bu0=((((iu0+nsafe)>>logsquare)<<logsquare))-nsafe;
        bv0=((((iv0+nsafe)>>logsquare)<<logsquare))-nsafe;
661
        if (grid_r) load();
Martin Reinecke's avatar
import  
Martin Reinecke committed
662
        }
663
664
      p0r = rbuf.data() + sv*(iu0-bu0) + iv0-bv0;
      p0w = wbuf.data() + sv*(iu0-bu0) + iv0-bv0;
Martin Reinecke's avatar
import  
Martin Reinecke committed
665
666
667
      }
  };

Martin Reinecke's avatar
cleanup    
Martin Reinecke committed
668
669
template<typename T> pyarr_c<complex<T>> vis2grid_c(
  const Baselines<T> &baselines, const GridderConfig<T> &gconf,
Martin Reinecke's avatar
Martin Reinecke committed
670
671
  const pyarr<uint32_t> &idx_, const pyarr<complex<T>> &vis_,
  py::object &grid_in)
672
  {
Martin Reinecke's avatar
merge    
Martin Reinecke committed
673
674
675
  checkArray(vis_, "vis", {0});
  size_t nvis = size_t(vis_.shape(0));
  checkArray(idx_, "idx", {nvis});
676
677
  auto vis=vis_.template unchecked<1>();
  auto idx = idx_.template unchecked<1>();
678

679
  size_t nu=gconf.Nu(), nv=gconf.Nv();
Martin Reinecke's avatar
Martin Reinecke committed
680
  auto res = provideCArray<complex<T>>(grid_in, {nu, nv});
681
  auto grid = res.mutable_data();
Martin Reinecke's avatar
Martin Reinecke committed
682
683
  {
  py::gil_scoped_release release;
Martin Reinecke's avatar
cleanup    
Martin Reinecke committed
684
685
  T beta = gconf.Beta();
  size_t w = gconf.W();
686
687
688

#pragma omp parallel
{
689
  Helper<T> hlp(gconf, nullptr, grid);
Martin Reinecke's avatar
cleanup    
Martin Reinecke committed
690
  T emb = exp(-2*beta);
691
  int jump = hlp.lineJump();
692
  const T * RESTRICT ku = hlp.kernel.data();
Martin Reinecke's avatar
cleanup    
Martin Reinecke committed
693
  const T * RESTRICT kv = hlp.kernel.data()+w;
694
695
696
697
698

  // Loop over sampling points
#pragma omp for schedule(guided,100)
  for (size_t ipart=0; ipart<nvis; ++ipart)
    {
699
    UVW<T> coord = baselines.effectiveCoord(idx(ipart));
Martin Reinecke's avatar
Martin Reinecke committed
700
    hlp.prep(coord.u, coord.v);
701
    auto * RESTRICT ptr = hlp.p0w;
702
    auto v(vis(ipart)*emb);
Martin Reinecke's avatar
cleanup    
Martin Reinecke committed
703
    for (size_t cu=0; cu<w; ++cu)
704
705
      {
      complex<T> tmp(v*ku[cu]);
Martin Reinecke's avatar
cleanup    
Martin Reinecke committed
706
      for (size_t cv=0; cv<w; ++cv)
707
        ptr[cv] += tmp*kv[cv];
708
      ptr+=jump;
709
710
711
      }
    }
} // end of parallel region
Martin Reinecke's avatar
Martin Reinecke committed
712
  }
713
714
715
  return res;
  }

Martin Reinecke's avatar
Martin Reinecke committed
716
template<typename T> pyarr_c<T> vis2grid(const Baselines<T> &baselines,
717
  const GridderConfig<T> &gconf, const pyarr<uint32_t> &idx_,
718
719
  const pyarr<complex<T>> &vis_, py::object &grid_in)
  { return complex2hartley(vis2grid_c(baselines, gconf, idx_, vis_, None), grid_in); }
Martin Reinecke's avatar
updates    
Martin Reinecke committed
720

Martin Reinecke's avatar
cleanup    
Martin Reinecke committed
721
722
template<typename T> pyarr_c<complex<T>> ms2grid_c(
  const Baselines<T> &baselines, const GridderConfig<T> &gconf,
Martin Reinecke's avatar
Martin Reinecke committed
723
724
  const pyarr<uint32_t> &idx_, const pyarr<complex<T>> &ms_,
  py::object &grid_in)
Martin Reinecke's avatar
merge    
Martin Reinecke committed
725
726
727
728
729
730
  {
  auto nrows = baselines.Nrows();
  auto nchan = baselines.Nchannels();
  checkArray(ms_, "ms", {nrows, nchan});
  checkArray(idx_, "idx", {0});
  size_t nvis = size_t(idx_.shape(0));
731
732
  auto ms = ms_.template unchecked<2>();
  auto idx = idx_.template unchecked<1>();
Simon Perkins's avatar
Simon Perkins committed
733

Martin Reinecke's avatar
merge    
Martin Reinecke committed
734
  size_t nu=gconf.Nu(), nv=gconf.Nv();
Martin Reinecke's avatar
Martin Reinecke committed
735
  auto res = provideCArray<complex<T>>(grid_in, {nu, nv});
Martin Reinecke's avatar
merge    
Martin Reinecke committed
736
  auto grid = res.mutable_data();
Martin Reinecke's avatar
Martin Reinecke committed
737
738
  {
  py::gil_scoped_release release;
Martin Reinecke's avatar
merge    
Martin Reinecke committed
739
740
741
742
743
  T beta = gconf.Beta();
  size_t w = gconf.W();

#pragma omp parallel
{
744
  Helper<T> hlp(gconf, nullptr, grid);
Martin Reinecke's avatar
merge    
Martin Reinecke committed
745
  T emb = exp(-2*beta);
746
  int jump = hlp.lineJump();
Martin Reinecke's avatar
merge    
Martin Reinecke committed
747
748
749
750
751
752
753
  const T * RESTRICT ku = hlp.kernel.data();
  const T * RESTRICT kv = hlp.kernel.data()+w;

  // Loop over sampling points
#pragma omp for schedule(guided,100)
  for (size_t ipart=0; ipart<nvis; ++ipart)
    {
754
755
756
757
    auto tidx = idx(ipart);
    auto row = tidx/nchan;
    auto chan = tidx-row*nchan;
    UVW<T> coord = baselines.effectiveCoord(tidx);
Martin Reinecke's avatar
merge    
Martin Reinecke committed
758
    hlp.prep(coord.u, coord.v);
759
    auto * RESTRICT ptr = hlp.p0w;
760
    auto v(ms(row,chan)*emb);
Martin Reinecke's avatar
merge    
Martin Reinecke committed
761
762
763
764
765
    for (size_t cu=0; cu<w; ++cu)
      {
      complex<T> tmp(v*ku[cu]);
      for (size_t cv=0; cv<w; ++cv)
        ptr[cv] += tmp*kv[cv];
766
      ptr+=jump;
Martin Reinecke's avatar
merge    
Martin Reinecke committed
767
768
769
      }
    }
} // end of parallel region
Martin Reinecke's avatar
Martin Reinecke committed
770
  }
Martin Reinecke's avatar
merge    
Martin Reinecke committed
771
772
773
774
  return res;
  }

template<typename T> pyarr_c<T> ms2grid(const Baselines<T> &baselines,
775
  const GridderConfig<T> &gconf, const pyarr<uint32_t> &idx_,
776
777
  const pyarr<complex<T>> &ms_, py::object &grid_in)
  { return complex2hartley(ms2grid_c(baselines, gconf, idx_, ms_, None), grid_in); }
Martin Reinecke's avatar
merge    
Martin Reinecke committed
778

779
780
781
template<typename T> pyarr_c<complex<T>> ms2grid_c_wgt(
  const Baselines<T> &baselines, const GridderConfig<T> &gconf,
  const pyarr<uint32_t> &idx_, const pyarr<complex<T>> &ms_,
Martin Reinecke's avatar
Martin Reinecke committed
782
  const pyarr<T> &wgt_, py::object &grid_in)
783
784
785
786
787
788
789
790
791
792
793
794
  {
  auto nrows = baselines.Nrows();
  auto nchan = baselines.Nchannels();
  checkArray(wgt_, "wgt", {nrows, nchan});
  checkArray(ms_, "ms", {nrows, nchan});
  checkArray(idx_, "idx", {0});
  size_t nvis = size_t(idx_.shape(0));
  auto ms = ms_.template unchecked<2>();
  auto wgt = wgt_.template unchecked<2>();
  auto idx = idx_.template unchecked<1>();

  size_t nu=gconf.Nu(), nv=gconf.Nv();
Martin Reinecke's avatar
Martin Reinecke committed
795
  auto res = provideArray<complex<T>>(grid_in, {nu, nv});
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
  auto grid = res.mutable_data();
  {
  py::gil_scoped_release release;
  T beta = gconf.Beta();
  size_t w = gconf.W();

#pragma omp parallel
{
  Helper<T> hlp(gconf, nullptr, grid);
  T emb = exp(-2*beta);
  int jump = hlp.lineJump();
  const T * RESTRICT ku = hlp.kernel.data();
  const T * RESTRICT kv = hlp.kernel.data()+w;

  // Loop over sampling points
#pragma omp for schedule(guided,100)
  for (size_t ipart=0; ipart<nvis; ++ipart)
    {
    auto tidx = idx(ipart);
    auto row = tidx/nchan;
    auto chan = tidx-row*nchan;
    UVW<T> coord = baselines.effectiveCoord(tidx);
    hlp.prep(coord.u, coord.v);
    auto * RESTRICT ptr = hlp.p0w;
    auto v(ms(row,chan)*(emb*wgt(row, chan)));
    for (size_t cu=0; cu<w; ++cu)
      {
      complex<T> tmp(v*ku[cu]);
      for (size_t cv=0; cv<w; ++cv)
        ptr[cv] += tmp*kv[cv];
      ptr+=jump;
      }
    }
} // end of parallel region
  }
  return res;
  }

template<typename T> pyarr_c<T> ms2grid_wgt(const Baselines<T> &baselines,
  const GridderConfig<T> &gconf, const pyarr<uint32_t> &idx_,
836
837
838
  const pyarr<complex<T>> &ms_, const pyarr<T> &wgt_,
  py::object &grid_in)
  { return complex2hartley(ms2grid_c_wgt(baselines, gconf, idx_, ms_, wgt_, None), grid_in); }
839

840
841
template<typename T> pyarr_c<complex<T>> grid2vis_c(
  const Baselines<T> &baselines, const GridderConfig<T> &gconf,
842
  const pyarr<uint32_t> &idx_, const pyarr_c<complex<T>> &grid_)
843
844
  {
  size_t nu=gconf.Nu(), nv=gconf.Nv();
Martin Reinecke's avatar
merge    
Martin Reinecke committed
845
  checkArray(idx_, "idx", {0});
846
  auto grid = grid_.data();
Martin Reinecke's avatar
merge    
Martin Reinecke committed
847
  checkArray(grid_, "grid", {nu, nv});
848
  size_t nvis = size_t(idx_.shape(0));
849
  auto idx = idx_.template unchecked<1>();
850

Martin Reinecke's avatar
merge    
Martin Reinecke committed
851
  auto res = makeArray<complex<T>>({nvis});
852
  auto vis = res.mutable_data();
Martin Reinecke's avatar
Martin Reinecke committed
853
854
  {
  py::gil_scoped_release release;
Martin Reinecke's avatar
cleanup    
Martin Reinecke committed
855
856
  T beta = gconf.Beta();
  size_t w = gconf.W();
857
858
859
860

  // Loop over sampling points
#pragma omp parallel
{
861
  Helper<T> hlp(gconf, grid, nullptr);
Martin Reinecke's avatar
cleanup    
Martin Reinecke committed
862
  T emb = exp(-2*beta);
863
  int jump = hlp.lineJump();
864
  const T * RESTRICT ku = hlp.kernel.data();
Martin Reinecke's avatar
cleanup    
Martin Reinecke committed
865
  const T * RESTRICT kv = hlp.kernel.data()+w;
866
867
868
869

#pragma omp for schedule(guided,100)
  for (size_t ipart=0; ipart<nvis; ++ipart)
    {
870
    UVW<T> coord = baselines.effectiveCoord(idx(ipart));
Martin Reinecke's avatar
Martin Reinecke committed
871
    hlp.prep(coord.u, coord.v);
872
    complex<T> r = 0;
873
    const auto * RESTRICT ptr = hlp.p0r;
Martin Reinecke's avatar
cleanup    
Martin Reinecke committed
874
    for (size_t cu=0; cu<w; ++cu)
875
876
      {
      complex<T> tmp(0);
Martin Reinecke's avatar
cleanup    
Martin Reinecke committed
877
      for (size_t cv=0; cv<w; ++cv)
878
879
        tmp += ptr[cv] * kv[cv];
      r += tmp*ku[cu];
880
      ptr += jump;
881
882
883
884
      }
    vis[ipart] = r*emb;
    }
}
Martin Reinecke's avatar
Martin Reinecke committed
885
  }
886
887
888
  return res;
  }

Martin Reinecke's avatar
Martin Reinecke committed
889
template<typename T> pyarr_c<complex<T>> grid2vis(const Baselines<T> &baselines,
890
  const GridderConfig<T> &gconf, const pyarr<uint32_t> &idx_,
Martin Reinecke's avatar
Martin Reinecke committed
891
892
893
  const pyarr_c<T> &grid_)
  { return grid2vis_c(baselines, gconf, idx_, hartley2complex(grid_)); }

Martin Reinecke's avatar
merge    
Martin Reinecke committed
894
template<typename T> pyarr_c<complex<T>> grid2ms_c(const Baselines<T> &baselines,
895
  const GridderConfig<T> &gconf, const pyarr<uint32_t> &idx_,
Martin Reinecke's avatar
merge    
Martin Reinecke committed
896
897
  const pyarr_c<complex<T>> &grid_, py::object &ms_in)
  {
898
899
  auto nrows = baselines.Nrows();
  auto nchan = baselines.Nchannels();
Martin Reinecke's avatar
merge    
Martin Reinecke committed
900
901
902
903
904
  size_t nu=gconf.Nu(), nv=gconf.Nv();
  checkArray(idx_, "idx", {0});
  auto grid = grid_.data();
  checkArray(grid_, "grid", {nu, nv});
  size_t nvis = size_t(idx_.shape(0));
905
  auto idx = idx_.template unchecked<1>();
Martin Reinecke's avatar
merge    
Martin Reinecke committed
906

907
908
  auto res = provideArray<complex<T>>(ms_in, {nrows, nchan});
  auto ms = res.template mutable_unchecked<2>();
Martin Reinecke's avatar
Martin Reinecke committed
909
910
  {
  py::gil_scoped_release release;
Martin Reinecke's avatar
merge    
Martin Reinecke committed
911
912
913
914
915
916
  T beta = gconf.Beta();
  size_t w = gconf.W();

  // Loop over sampling points
#pragma omp parallel
{
917
  Helper<T> hlp(gconf, grid, nullptr);
Martin Reinecke's avatar
merge    
Martin Reinecke committed
918
  T emb = exp(-2*beta);
919
  int jump = hlp.lineJump();
Martin Reinecke's avatar
merge    
Martin Reinecke committed
920
921
922
923
924
925
  const T * RESTRICT ku = hlp.kernel.data();
  const T * RESTRICT kv = hlp.kernel.data()+w;

#pragma omp for schedule(guided,100)
  for (size_t ipart=0; ipart<nvis; ++ipart)
    {
926
927
928
929
    auto tidx = idx(ipart);
    auto row = tidx/nchan;
    auto chan = tidx-row*nchan;
    UVW<T> coord = baselines.effectiveCoord(tidx);
Martin Reinecke's avatar
merge    
Martin Reinecke committed
930
931
    hlp.prep(coord.u, coord.v);
    complex<T> r = 0;
932
    const auto * RESTRICT ptr = hlp.p0r;
Martin Reinecke's avatar
merge    
Martin Reinecke committed
933
934
935
936
937
938
    for (size_t cu=0; cu<w; ++cu)
      {
      complex<T> tmp(0);
      for (size_t cv=0; cv<w; ++cv)
        tmp += ptr[cv] * kv[cv];
      r += tmp*ku[cu];
939
      ptr += jump;
Martin Reinecke's avatar
merge    
Martin Reinecke committed
940
      }
941
    ms(row,chan) += r*emb;
Martin Reinecke's avatar
merge    
Martin Reinecke committed
942
943
    }
}
Martin Reinecke's avatar
Martin Reinecke committed
944
  }
Martin Reinecke's avatar
merge    
Martin Reinecke committed
945
946
947
948
  return res;
  }

template<typename T> pyarr_c<complex<T>> grid2ms(const Baselines<T> &baselines,
949
  const GridderConfig<T> &gconf, const pyarr<uint32_t> &idx_,
Martin Reinecke's avatar
merge    
Martin Reinecke committed
950
951
952
  const pyarr_c<T> &grid_, py::object &ms_in)
  { return grid2ms_c(baselines, gconf, idx_, hartley2complex(grid_), ms_in); }

953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
template<typename T> pyarr_c<complex<T>> grid2ms_c_wgt(
  const Baselines<T> &baselines, const GridderConfig<T> &gconf,
  const pyarr<uint32_t> &idx_, const pyarr_c<complex<T>> &grid_,
  const pyarr<T> &wgt_, py::object &ms_in)
  {
  auto nrows = baselines.Nrows();
  auto nchan = baselines.Nchannels();
  checkArray(wgt_, "wgt", {nrows, nchan});
  auto wgt = wgt_.template unchecked<2>();
  size_t nu=gconf.Nu(), nv=gconf.Nv();
  checkArray(idx_, "idx", {0});
  auto grid = grid_.data();
  checkArray(grid_, "grid", {nu, nv});
  size_t nvis = size_t(idx_.shape(0));
  auto idx = idx_.template unchecked<1>();

  auto res = provideArray<complex<T>>(ms_in, {nrows, nchan});
  auto ms = res.