gridder_cxx.h 51.4 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
19
20
21
22
23
24
25
26
27
28
29
#ifndef GRIDDER_CXX_H
#define GRIDDER_CXX_H

/*
 *  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_gridder; if not, write to the Free Software
 *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */

/* Copyright (C) 2019 Max-Planck-Society
   Author: Martin Reinecke */

#include <iostream>
#include <algorithm>
#include <cstdlib>
#include <cmath>
#include <vector>
Martin Reinecke's avatar
Martin Reinecke committed
30
#include <array>
Martin Reinecke's avatar
Martin Reinecke committed
31

Martin Reinecke's avatar
Martin Reinecke committed
32
33
34
35
#ifdef _OPENMP
#include <omp.h>
#endif

Martin Reinecke's avatar
Martin Reinecke committed
36
#include "pocketfft_hdronly.h"
Martin Reinecke's avatar
Martin Reinecke committed
37
38

#if defined(__GNUC__)
Martin Reinecke's avatar
tweaks    
Martin Reinecke committed
39
#define NOINLINE __attribute__((noinline))
Martin Reinecke's avatar
Martin Reinecke committed
40
#define ALIGNED(align) __attribute__ ((aligned(align)))
Martin Reinecke's avatar
Martin Reinecke committed
41
#define RESTRICT __restrict__
Martin Reinecke's avatar
Martin Reinecke committed
42
43
44
#else
#define NOINLINE
#define ALIGNED(align)
Martin Reinecke's avatar
Martin Reinecke committed
45
#define RESTRICT
Martin Reinecke's avatar
Martin Reinecke committed
46
#endif
Martin Reinecke's avatar
Martin Reinecke committed
47

Martin Reinecke's avatar
Martin Reinecke committed
48
49
namespace gridder {

50
51
namespace detail {

Martin Reinecke's avatar
Martin Reinecke committed
52
53
using namespace std;

54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
template<typename T> struct VLEN { static constexpr size_t val=1; };

#if (defined(__AVX512F__))
template<> struct VLEN<float> { static constexpr size_t val=16; };
template<> struct VLEN<double> { static constexpr size_t val=8; };
#elif (defined(__AVX__))
template<> struct VLEN<float> { static constexpr size_t val=8; };
template<> struct VLEN<double> { static constexpr size_t val=4; };
#elif (defined(__SSE2__))
template<> struct VLEN<float> { static constexpr size_t val=4; };
template<> struct VLEN<double> { static constexpr size_t val=2; };
#elif (defined(__VSX__))
template<> struct VLEN<float> { static constexpr size_t val=4; };
template<> struct VLEN<double> { static constexpr size_t val=2; };
#endif

Martin Reinecke's avatar
Martin Reinecke committed
70
71

// "mav" stands for "multidimensional array view"
Martin Reinecke's avatar
Martin Reinecke committed
72
template<typename T, size_t ndim> class mav
Martin Reinecke's avatar
Martin Reinecke committed
73
74
75
76
77
  {
  static_assert((ndim>0) && (ndim<3), "only supports 1D and 2D arrays");

  private:
    T *d;
Martin Reinecke's avatar
Martin Reinecke committed
78
79
    array<size_t, ndim> shp;
    array<ptrdiff_t, ndim> str;
Martin Reinecke's avatar
Martin Reinecke committed
80
81

  public:
Martin Reinecke's avatar
Martin Reinecke committed
82
83
84
85
    mav(T *d_, const array<size_t,ndim> &shp_,
        const array<ptrdiff_t,ndim> &str_)
      : d(d_), shp(shp_), str(str_) {}
    mav(T *d_, const array<size_t,ndim> &shp_)
Martin Reinecke's avatar
Martin Reinecke committed
86
87
88
89
90
91
      : d(d_), shp(shp_)
      {
      str[ndim-1]=1;
      for (size_t d=2; d<=ndim; ++d)
        str[ndim-d] = str[ndim-d+1]*shp[ndim-d+1];
      }
92
    T &operator[](size_t i) const
Martin Reinecke's avatar
Martin Reinecke committed
93
      { return operator()(i); }
94
    T &operator()(size_t i) const
Martin Reinecke's avatar
Martin Reinecke committed
95
96
      {
      static_assert(ndim==1, "ndim must be 1");
Martin Reinecke's avatar
Martin Reinecke committed
97
      return d[str[0]*i];
Martin Reinecke's avatar
Martin Reinecke committed
98
      }
99
    T &operator()(size_t i, size_t j) const
Martin Reinecke's avatar
Martin Reinecke committed
100
101
      {
      static_assert(ndim==2, "ndim must be 2");
Martin Reinecke's avatar
Martin Reinecke committed
102
      return d[str[0]*i + str[1]*j];
Martin Reinecke's avatar
Martin Reinecke committed
103
104
      }
    size_t shape(size_t i) const { return shp[i]; }
Martin Reinecke's avatar
Martin Reinecke committed
105
    const array<size_t,ndim> &shape() const { return shp; }
Martin Reinecke's avatar
Martin Reinecke committed
106
107
108
109
110
111
    size_t size() const
      {
      size_t res=1;
      for (auto v: shp) res*=v;
      return res;
      }
Martin Reinecke's avatar
cleanup    
Martin Reinecke committed
112
    ptrdiff_t stride(size_t i) const { return str[i]; }
113
    T *data() const
Martin Reinecke's avatar
Martin Reinecke committed
114
      { return d; }
Martin Reinecke's avatar
updates    
Martin Reinecke committed
115
116
117
118
119
120
121
122
123
124
    bool contiguous() const
      {
      ptrdiff_t stride=1;
      for (size_t i=0; i<ndim; ++i)
        {
        if (str[ndim-1-i]!=stride) return false;
        stride *= shp[ndim-1-i];
        }
      return true;
      }
Martin Reinecke's avatar
Martin Reinecke committed
125
126
    void fill(const T &val) const
      {
Martin Reinecke's avatar
Martin Reinecke committed
127
      // FIXME: special cases for contiguous arrays and/or zeroing?
Martin Reinecke's avatar
Martin Reinecke committed
128
129
130
131
132
133
134
135
      if (ndim==1)
        for (size_t i=0; i<shp[0]; ++i)
          d[str[0]*i]=val;
      else if (ndim==2)
        for (size_t i=0; i<shp[0]; ++i)
          for (size_t j=0; j<shp[1]; ++j)
            d[str[0]*i + str[1]*j] = val;
      }
Martin Reinecke's avatar
Martin Reinecke committed
136
137
  };

Martin Reinecke's avatar
updates    
Martin Reinecke committed
138
template<typename T, size_t ndim> using const_mav = mav<const T, ndim>;
Martin Reinecke's avatar
Martin Reinecke committed
139
140
141
142
143
144
145
146
template<typename T, size_t ndim> const_mav<T, ndim> cmav (const mav<T, ndim> &mav)
  { return const_mav<T, ndim>(mav.data(), mav.shape()); }
template<typename T, size_t ndim> const_mav<T, ndim> nullmav()
  {
  array<size_t,ndim> shp;
  shp.fill(0);
  return const_mav<T, ndim>(nullptr, shp);
  }
Martin Reinecke's avatar
Martin Reinecke committed
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
template<typename T, size_t ndim> class tmpStorage
  {
  private:
    vector<T> d;
    mav<T,ndim> mav_;

    static size_t prod(const array<size_t,ndim> &shp)
      {
      size_t res=1;
      for (auto v: shp) res*=v;
      return res;
      }

  public:
    tmpStorage(const array<size_t,ndim> &shp)
      : d(prod(shp)), mav_(d.data(), shp) {}
Martin Reinecke's avatar
Martin Reinecke committed
163
164
    mav<T,ndim> &getMav() { return mav_; }
    const_mav<T,ndim> getCmav() { return cmav(mav_); }
Martin Reinecke's avatar
Martin Reinecke committed
165
166
167
    void fill(const T & val)
      { std::fill(d.begin(), d.end(), val); }
  };
Martin Reinecke's avatar
Martin Reinecke committed
168

Martin Reinecke's avatar
Martin Reinecke committed
169
170
171
//
// basic utilities
//
Martin Reinecke's avatar
Martin Reinecke committed
172
173
174
175
176
#if defined (__GNUC__)
#define LOC_ CodeLocation(__FILE__, __LINE__, __PRETTY_FUNCTION__)
#else
#define LOC_ CodeLocation(__FILE__, __LINE__)
#endif
Martin Reinecke's avatar
Martin Reinecke committed
177

Martin Reinecke's avatar
Martin Reinecke committed
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
#define myfail(...) \
  do { \
    std::ostringstream os; \
    streamDump__(os, LOC_, "\n", ##__VA_ARGS__, "\n"); \
    throw std::runtime_error(os.str()); \
    } while(0)

#define myassert(cond,...) \
  do { \
    if (cond); \
    else { myfail("Assertion failure\n", ##__VA_ARGS__); } \
    } while(0)

template<typename T>
inline void streamDump__(std::ostream &os, const T& value)
  { os << value; }

template<typename T, typename ... Args>
inline void streamDump__(std::ostream &os, const T& value,
  const Args& ... args)
Martin Reinecke's avatar
Martin Reinecke committed
198
  {
Martin Reinecke's avatar
Martin Reinecke committed
199
200
  os << value;
  streamDump__(os, args...);
Martin Reinecke's avatar
Martin Reinecke committed
201
  }
Martin Reinecke's avatar
Martin Reinecke committed
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
// to be replaced with std::source_location once available
class CodeLocation
  {
  private:
    const char *file, *func;
    int line;

  public:
    CodeLocation(const char *file_, int line_, const char *func_=nullptr)
      : file(file_), func(func_), line(line_) {}

    ostream &print(ostream &os) const
      {
      os << "file: " << file <<  ", line: " <<  line;
      if (func) os << ", function: " << func;
      return os;
      }
  };

inline std::ostream &operator<<(std::ostream &os, const CodeLocation &loc)
  { return loc.print(os); }
Martin Reinecke's avatar
Martin Reinecke committed
223
224

template<size_t ndim> void checkShape
Martin Reinecke's avatar
Martin Reinecke committed
225
  (const array<size_t, ndim> &shp1, const array<size_t, ndim> &shp2)
Martin Reinecke's avatar
Martin Reinecke committed
226
227
228
229
230
  {
  for (size_t i=0; i<ndim; ++i)
    myassert(shp1[i]==shp2[i], "shape mismatch");
  }

Martin Reinecke's avatar
Martin Reinecke committed
231
232
template<typename T> inline T fmod1 (T v)
  { return v-floor(v); }
Martin Reinecke's avatar
Martin Reinecke committed
233
234
235
236
237
238
239
240

//
// Utilities for Gauss-Legendre quadrature
//

static inline double one_minus_x2 (double x)
  { return (fabs(x)>0.1) ? (1.+x)*(1.-x) : 1.-x*x; }

Martin Reinecke's avatar
Martin Reinecke committed
241
void legendre_prep(int n, vector<double> &x, vector<double> &w, size_t nthreads)
Martin Reinecke's avatar
Martin Reinecke committed
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
  {
  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 num_threads(nthreads)
{
  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;
      myassert(++j<100, "convergence problem");
      }

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

//
// Start of real gridder functionality
//

Martin Reinecke's avatar
Martin Reinecke committed
299
300
301
302
303
struct RowChan
  {
  size_t row, chan;
  };

304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
template<typename T> void complex2hartley
  (const const_mav<complex<T>, 2> &grid, const mav<T,2> &grid2, size_t nthreads)
  {
  myassert(grid.shape()==grid2.shape(), "shape mismatch");
  size_t nu=grid.shape(0), nv=grid.shape(1);

#pragma omp parallel for num_threads(nthreads)
  for (size_t u=0; u<nu; ++u)
    {
    size_t xu = (u==0) ? 0 : nu-u;
    for (size_t v=0; v<nv; ++v)
      {
      size_t xv = (v==0) ? 0 : nv-v;
      grid2(u,v) += T(0.5)*(grid( u, v).real()+grid( u, v).imag()+
                            grid(xu,xv).real()-grid(xu,xv).imag());
      }
    }
  }

template<typename T> void hartley2complex
  (const const_mav<T,2> &grid, const mav<complex<T>,2> &grid2, size_t nthreads)
  {
  myassert(grid.shape()==grid2.shape(), "shape mismatch");
  size_t nu=grid.shape(0), nv=grid.shape(1);

#pragma omp parallel for num_threads(nthreads)
  for (size_t u=0; u<nu; ++u)
    {
    size_t xu = (u==0) ? 0 : nu-u;
    for (size_t v=0; v<nv; ++v)
      {
      size_t xv = (v==0) ? 0 : nv-v;
      T v1 = T(0.5)*grid( u, v);
      T v2 = T(0.5)*grid(xu,xv);
      grid2(u,v) = std::complex<T>(v1+v2, v1-v2);
      }
    }
  }

Martin Reinecke's avatar
Martin Reinecke committed
343
344
template<typename T> void hartley2_2D(const const_mav<T,2> &in,
  const mav<T,2> &out, size_t nthreads)
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
  {
  myassert(in.shape()==out.shape(), "shape mismatch");
  size_t nu=in.shape(0), nv=in.shape(1);
  ptrdiff_t sz=ptrdiff_t(sizeof(T));
  pocketfft::stride_t stri{sz*in.stride(0), sz*in.stride(1)};
  pocketfft::stride_t stro{sz*out.stride(0), sz*out.stride(1)};
  auto d_i = in.data();
  auto ptmp = out.data();
  pocketfft::r2r_separable_hartley({nu, nv}, stri, stro, {0,1}, d_i, ptmp, T(1),
    nthreads);
#pragma omp parallel for num_threads(nthreads)
  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
371
class ES_Kernel
Martin Reinecke's avatar
Martin Reinecke committed
372
373
  {
  protected:
Martin Reinecke's avatar
Martin Reinecke committed
374
    double beta;
Martin Reinecke's avatar
Martin Reinecke committed
375
376

  public:
Martin Reinecke's avatar
Martin Reinecke committed
377
    ES_Kernel(size_t supp) : beta(2.3*supp) {}
Martin Reinecke's avatar
Martin Reinecke committed
378
    double operator()(double v) const { return exp(beta*(sqrt(1.-v*v)-1.)); }
Martin Reinecke's avatar
Martin Reinecke committed
379
380
381
382
383
384
385
386
387
388
389
    static size_t get_supp(double epsilon)
      {
      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;
      myfail("requested epsilon too small - minimum is 2e-13");
      }
Martin Reinecke's avatar
Martin Reinecke committed
390
391
  };

Martin Reinecke's avatar
Martin Reinecke committed
392
class ES_Kernel_with_correction: public ES_Kernel
Martin Reinecke's avatar
Martin Reinecke committed
393
394
  {
  protected:
Martin Reinecke's avatar
Martin Reinecke committed
395
    static constexpr double pi = 3.141592653589793238462643383279502884197;
Martin Reinecke's avatar
Martin Reinecke committed
396
    int p;
397
    vector<double> x, wgt, psi;
Martin Reinecke's avatar
Martin Reinecke committed
398
    size_t supp;
Martin Reinecke's avatar
Martin Reinecke committed
399
400

  public:
Martin Reinecke's avatar
Martin Reinecke committed
401
402
    ES_Kernel_with_correction(size_t supp_, size_t nthreads)
      : ES_Kernel(supp_), p(int(1.5*supp_+2)), supp(supp_)
Martin Reinecke's avatar
Martin Reinecke committed
403
      {
Martin Reinecke's avatar
Martin Reinecke committed
404
      legendre_prep(2*p,x,wgt,nthreads);
Martin Reinecke's avatar
Martin Reinecke committed
405
406
407
408
409
410
      psi=x;
      for (auto &v:psi)
        v=operator()(v);
      }
    /* 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
Martin Reinecke committed
411
    double corfac(double v) const
Martin Reinecke's avatar
Martin Reinecke committed
412
      {
Martin Reinecke's avatar
Martin Reinecke committed
413
      double tmp=0;
Martin Reinecke's avatar
Martin Reinecke committed
414
415
      for (int i=0; i<p; ++i)
        tmp += wgt[i]*psi[i]*cos(pi*supp*v*x[i]);
Martin Reinecke's avatar
Martin Reinecke committed
416
      return 1./(supp*tmp);
Martin Reinecke's avatar
Martin Reinecke committed
417
418
419
420
      }
  };
/* 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
Martin Reinecke committed
421
vector<double> correction_factors(size_t n, size_t nval, size_t supp,
Martin Reinecke's avatar
Martin Reinecke committed
422
  size_t nthreads)
Martin Reinecke's avatar
Martin Reinecke committed
423
  {
Martin Reinecke's avatar
Martin Reinecke committed
424
  ES_Kernel_with_correction kernel(supp, nthreads);
Martin Reinecke's avatar
Martin Reinecke committed
425
  vector<double> res(nval);
Martin Reinecke's avatar
Martin Reinecke committed
426
427
428
429
430
431
432
  double xn = 1./n;
#pragma omp parallel for schedule(static) num_threads(nthreads)
  for (size_t k=0; k<nval; ++k)
    res[k] = kernel.corfac(k*xn);
  return res;
  }

Martin Reinecke's avatar
step 1    
Martin Reinecke committed
433
struct UVW
Martin Reinecke's avatar
Martin Reinecke committed
434
  {
Martin Reinecke's avatar
step 1    
Martin Reinecke committed
435
436
437
438
  double u, v, w;
  UVW() {}
  UVW(double u_, double v_, double w_) : u(u_), v(v_), w(w_) {}
  UVW operator* (double fct) const
Martin Reinecke's avatar
Martin Reinecke committed
439
    { return UVW(u*fct, v*fct, w*fct); }
440
441
442
443
444
445
446
  void Flip() { u=-u; v=-v; w=-w; }
  bool FixW()
    {
    bool flip = w<0;
    if (flip) Flip();
    return flip;
    }
Martin Reinecke's avatar
Martin Reinecke committed
447
448
  };

Martin Reinecke's avatar
step 1    
Martin Reinecke committed
449
class Baselines
Martin Reinecke's avatar
Martin Reinecke committed
450
451
  {
  protected:
Martin Reinecke's avatar
step 1    
Martin Reinecke committed
452
453
    vector<UVW> coord;
    vector<double> f_over_c;
Martin Reinecke's avatar
Martin Reinecke committed
454
    size_t nrows, nchan;
455
    size_t shift, mask;
Martin Reinecke's avatar
Martin Reinecke committed
456
457

  public:
Martin Reinecke's avatar
step 1    
Martin Reinecke committed
458
    template<typename T> Baselines(const const_mav<T,2> &coord_, const const_mav<T,1> &freq)
Martin Reinecke's avatar
Martin Reinecke committed
459
460
461
462
463
      {
      constexpr double speedOfLight = 299792458.;
      myassert(coord_.shape(1)==3, "dimension mismatch");
      nrows = coord_.shape(0);
      nchan = freq.shape(0);
464
465
466
      shift=0;
      while((size_t(1)<<shift)<nchan) ++shift;
      mask=(size_t(1)<<shift)-1;
Martin Reinecke's avatar
Martin Reinecke committed
467
468
469
      myassert(nrows*nchan<(size_t(1)<<32), "too many entries in MS");
      f_over_c.resize(nchan);
      for (size_t i=0; i<nchan; ++i)
470
471
        {
        myassert(freq[i]>0, "negative channel frequency encountered");
Martin Reinecke's avatar
Martin Reinecke committed
472
        f_over_c[i] = freq(i)/speedOfLight;
473
        }
Martin Reinecke's avatar
Martin Reinecke committed
474
475
      coord.resize(nrows);
      for (size_t i=0; i<coord.size(); ++i)
Martin Reinecke's avatar
step 1    
Martin Reinecke committed
476
        coord[i] = UVW(coord_(i,0), coord_(i,1), coord_(i,2));
Martin Reinecke's avatar
Martin Reinecke committed
477
478
      }

Martin Reinecke's avatar
Martin Reinecke committed
479
    RowChan getRowChan(uint32_t index) const
480
      { return RowChan{index>>shift, index&mask}; }
Martin Reinecke's avatar
Martin Reinecke committed
481

Martin Reinecke's avatar
step 1    
Martin Reinecke committed
482
    UVW effectiveCoord(const RowChan &rc) const
Martin Reinecke's avatar
Martin Reinecke committed
483
      { return coord[rc.row]*f_over_c[rc.chan]; }
Martin Reinecke's avatar
step 1    
Martin Reinecke committed
484
    UVW effectiveCoord(uint32_t index) const
Martin Reinecke's avatar
Martin Reinecke committed
485
      { return effectiveCoord(getRowChan(index)); }
Martin Reinecke's avatar
Martin Reinecke committed
486
487
    size_t Nrows() const { return nrows; }
    size_t Nchannels() const { return nchan; }
488
489
    uint32_t getIdx(size_t irow, size_t ichan) const
      { return ichan+(irow<<shift); }
Martin Reinecke's avatar
Martin Reinecke committed
490

Martin Reinecke's avatar
step 1    
Martin Reinecke committed
491
492
    template<typename T> void effectiveUVW(const mav<const uint32_t,1> &idx,
      mav<T,2> &res) const
Martin Reinecke's avatar
Martin Reinecke committed
493
494
495
496
497
498
499
500
501
502
503
504
505
      {
      size_t nvis = idx.shape(0);
      myassert(res.shape(0)==nvis, "shape mismatch");
      myassert(res.shape(1)==3, "shape mismatch");
      for (size_t i=0; i<nvis; i++)
        {
        auto uvw = effectiveCoord(idx(i));
        res(i,0) = uvw.u;
        res(i,1) = uvw.v;
        res(i,2) = uvw.w;
        }
      }

Martin Reinecke's avatar
step 1    
Martin Reinecke committed
506
507
    template<typename T> void ms2vis(const mav<const T,2> &ms,
      const mav<const uint32_t,1> &idx, mav<T,1> &vis, size_t nthreads) const
Martin Reinecke's avatar
Martin Reinecke committed
508
509
510
511
512
513
514
515
      {
      myassert(ms.shape(0)==nrows, "shape mismatch");
      myassert(ms.shape(1)==nchan, "shape mismatch");
      size_t nvis = idx.shape(0);
      myassert(vis.shape(0)==nvis, "shape mismatch");
#pragma omp parallel for num_threads(nthreads)
      for (size_t i=0; i<nvis; ++i)
        {
Martin Reinecke's avatar
Martin Reinecke committed
516
517
        auto rc = getRowChan(idx(i));
        vis[i] = ms(rc.row, rc.chan);
Martin Reinecke's avatar
Martin Reinecke committed
518
519
520
        }
      }

Martin Reinecke's avatar
step 1    
Martin Reinecke committed
521
522
    template<typename T> void vis2ms(const mav<const T,1> &vis,
      const mav<const uint32_t,1> &idx, mav<T,2> &ms, size_t nthreads) const
Martin Reinecke's avatar
Martin Reinecke committed
523
524
525
526
527
528
529
530
      {
      size_t nvis = vis.shape(0);
      myassert(idx.shape(0)==nvis, "shape mismatch");
      myassert(ms.shape(0)==nrows, "shape mismatch");
      myassert(ms.shape(1)==nchan, "shape mismatch");
#pragma omp parallel for num_threads(nthreads)
      for (size_t i=0; i<nvis; ++i)
        {
Martin Reinecke's avatar
Martin Reinecke committed
531
532
        auto rc = getRowChan(idx(i));
        ms(rc.row, rc.chan) += vis(i);
Martin Reinecke's avatar
Martin Reinecke committed
533
534
535
536
        }
      }
  };

Martin Reinecke's avatar
step 1    
Martin Reinecke committed
537
class GridderConfig
Martin Reinecke's avatar
Martin Reinecke committed
538
539
540
  {
  protected:
    size_t nx_dirty, ny_dirty;
Martin Reinecke's avatar
Martin Reinecke committed
541
    double eps, psx, psy;
Martin Reinecke's avatar
Martin Reinecke committed
542
    size_t supp, nsafe, nu, nv;
Martin Reinecke's avatar
Martin Reinecke committed
543
544
    double beta;
    vector<double> cfu, cfv;
Martin Reinecke's avatar
Martin Reinecke committed
545
    size_t nthreads;
Martin Reinecke's avatar
Martin Reinecke committed
546

Martin Reinecke's avatar
step 1    
Martin Reinecke committed
547
    complex<double> wscreen(double x, double y, double w, bool adjoint) const
Martin Reinecke's avatar
Martin Reinecke committed
548
549
      {
      constexpr double pi = 3.141592653589793238462643383279502884197;
550
551
552
      double tmp = 1-x-y;
      if (tmp<0) return 0.;
      double nm1 = (-x-y)/(sqrt(tmp)+1); // more accurate form of sqrt(1-x-y)
Martin Reinecke's avatar
Martin Reinecke committed
553
554
555
      double n = nm1+1., xn = 1./n;
      double phase = 2*pi*w*nm1;
      if (adjoint) phase *= -1;
Martin Reinecke's avatar
step 1    
Martin Reinecke committed
556
      return complex<double>(cos(phase)*xn, sin(phase)*xn);
Martin Reinecke's avatar
Martin Reinecke committed
557
558
559
560
      }

  public:
    GridderConfig(size_t nxdirty, size_t nydirty, double epsilon,
Martin Reinecke's avatar
Martin Reinecke committed
561
      double pixsize_x, double pixsize_y, size_t nthreads_)
Martin Reinecke's avatar
Martin Reinecke committed
562
563
      : nx_dirty(nxdirty), ny_dirty(nydirty), eps(epsilon),
        psx(pixsize_x), psy(pixsize_y),
Martin Reinecke's avatar
Martin Reinecke committed
564
        supp(ES_Kernel::get_supp(epsilon)), nsafe((supp+1)/2),
Martin Reinecke's avatar
Martin Reinecke committed
565
        nu(max(2*nsafe,2*nx_dirty)), nv(max(2*nsafe,2*ny_dirty)),
Martin Reinecke's avatar
Martin Reinecke committed
566
        beta(2.3*supp),
Martin Reinecke's avatar
Martin Reinecke committed
567
        cfu(nx_dirty), cfv(ny_dirty), nthreads(nthreads_)
Martin Reinecke's avatar
Martin Reinecke committed
568
569
570
571
572
573
574
      {
      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");
      myassert(pixsize_x>0, "pixsize_x must be positive");
      myassert(pixsize_y>0, "pixsize_y must be positive");

Martin Reinecke's avatar
Martin Reinecke committed
575
      auto tmp = correction_factors(nu, nx_dirty/2+1, supp, nthreads);
Martin Reinecke's avatar
Martin Reinecke committed
576
577
578
579
      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];
Martin Reinecke's avatar
Martin Reinecke committed
580
      tmp = correction_factors(nv, ny_dirty/2+1, supp, nthreads);
Martin Reinecke's avatar
Martin Reinecke committed
581
582
583
584
585
586
587
588
589
590
591
592
593
594
      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];
      }
    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; }
    size_t Nu() const { return nu; }
    size_t Nv() const { return nv; }
    size_t Supp() const { return supp; }
    size_t Nsafe() const { return nsafe; }
Martin Reinecke's avatar
Martin Reinecke committed
595
    double Beta() const { return beta; }
Martin Reinecke's avatar
Martin Reinecke committed
596
    size_t Nthreads() const { return nthreads; }
Martin Reinecke's avatar
Martin Reinecke committed
597

Martin Reinecke's avatar
step 1    
Martin Reinecke committed
598
    template<typename T> void apply_taper(const mav<const T,2> &img, mav<T,2> &img2, bool divide) const
Martin Reinecke's avatar
Martin Reinecke committed
599
      {
Martin Reinecke's avatar
Martin Reinecke committed
600
601
      checkShape(img.shape(), {nx_dirty, ny_dirty});
      checkShape(img2.shape(), {nx_dirty, ny_dirty});
Martin Reinecke's avatar
Martin Reinecke committed
602
603
604
      if (divide)
        for (size_t i=0; i<nx_dirty; ++i)
          for (size_t j=0; j<ny_dirty; ++j)
Martin Reinecke's avatar
Martin Reinecke committed
605
            img2(i,j) = img(i,j)/(cfu[i]*cfv[j]);
Martin Reinecke's avatar
Martin Reinecke committed
606
607
608
      else
        for (size_t i=0; i<nx_dirty; ++i)
          for (size_t j=0; j<ny_dirty; ++j)
Martin Reinecke's avatar
Martin Reinecke committed
609
            img2(i,j) = img(i,j)*cfu[i]*cfv[j];
Martin Reinecke's avatar
Martin Reinecke committed
610
611
      }

612
    template<typename T> void grid2dirty_post(const mav<T,2> &tmav, const mav<T,2> &dirty) const
613
      {
Martin Reinecke's avatar
Martin Reinecke committed
614
      checkShape(dirty.shape(), {nx_dirty,ny_dirty});
615
616
617
618
619
620
621
      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;
Martin Reinecke's avatar
Martin Reinecke committed
622
          dirty(i,j) = tmav(i2,j2)*T(cfu[i]*cfv[j]);
623
624
          }
      }
Martin Reinecke's avatar
Martin Reinecke committed
625

626
627
628
629
630
631
632
633
    template<typename T> void grid2dirty(const const_mav<T,2> &grid, const mav<T,2> &dirty) const
      {
      checkShape(grid.shape(), {nu,nv});
      tmpStorage<T,2> tmpdat({nu,nv});
      auto tmav = tmpdat.getMav();
      hartley2_2D<T>(grid, tmav, nthreads);
      grid2dirty_post(tmav, dirty);
      }
634

Martin Reinecke's avatar
step 1    
Martin Reinecke committed
635
    template<typename T> void grid2dirty_c(const mav<const complex<T>,2> &grid, mav<complex<T>,2> &dirty) const
Martin Reinecke's avatar
Martin Reinecke committed
636
      {
Martin Reinecke's avatar
Martin Reinecke committed
637
      checkShape(grid.shape(), {nu,nv});
638
639
      tmpStorage<complex<T>,2> tmpdat({nu,nv});
      auto tmp = tmpdat.getMav();
Martin Reinecke's avatar
cleanup    
Martin Reinecke committed
640
      constexpr auto sc = ptrdiff_t(sizeof(complex<T>));
Martin Reinecke's avatar
Martin Reinecke committed
641
642
643
      pocketfft::c2c({nu,nv},{grid.stride(0)*sc,grid.stride(1)*sc},
        {tmp.stride(0)*sc, tmp.stride(1)*sc}, {0,1}, pocketfft::BACKWARD,
        grid.data(), tmp.data(), T(1), nthreads);
644
      grid2dirty_post(tmp, dirty);
Martin Reinecke's avatar
Martin Reinecke committed
645
      }
Martin Reinecke's avatar
updates    
Martin Reinecke committed
646

647
    template<typename T> void dirty2grid_pre(const const_mav<T,2> &dirty, mav<T,2> &grid) const
648
649
650
651
652
653
654
655
656
657
658
      {
      checkShape(dirty.shape(), {nx_dirty, ny_dirty});
      checkShape(grid.shape(), {nu, nv});
      grid.fill(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;
Martin Reinecke's avatar
Martin Reinecke committed
659
          grid(i2,j2) = dirty(i,j)*T(cfu[i]*cfv[j]);
660
          }
661
      }
Martin Reinecke's avatar
Martin Reinecke committed
662

663
664
665
    template<typename T> void dirty2grid(const const_mav<T,2> &dirty, mav<T,2> &grid) const
      {
      dirty2grid_pre(dirty, grid);
Martin Reinecke's avatar
Martin Reinecke committed
666
      hartley2_2D<T>(cmav(grid), grid, nthreads);
667
668
      }

Martin Reinecke's avatar
step 1    
Martin Reinecke committed
669
    template<typename T> void dirty2grid_c(const const_mav<complex<T>,2> &dirty,
Martin Reinecke's avatar
updates    
Martin Reinecke committed
670
      mav<complex<T>,2> &grid) const
Martin Reinecke's avatar
Martin Reinecke committed
671
      {
672
      dirty2grid_pre(dirty, grid);
Martin Reinecke's avatar
cleanup    
Martin Reinecke committed
673
      constexpr auto sc = ptrdiff_t(sizeof(complex<T>));
Martin Reinecke's avatar
updates    
Martin Reinecke committed
674
      pocketfft::stride_t strides{grid.stride(0)*sc,grid.stride(1)*sc};
Martin Reinecke's avatar
Martin Reinecke committed
675
      pocketfft::c2c({nu,nv}, strides, strides, {0,1}, pocketfft::FORWARD,
Martin Reinecke's avatar
updates    
Martin Reinecke committed
676
        grid.data(), grid.data(), T(1), nthreads);
Martin Reinecke's avatar
Martin Reinecke committed
677
      }
Martin Reinecke's avatar
updates    
Martin Reinecke committed
678

Martin Reinecke's avatar
step 1    
Martin Reinecke committed
679
    template<typename T>void getpix(T u_in, T v_in, T &u, T &v, int &iu0, int &iv0) const
Martin Reinecke's avatar
Martin Reinecke committed
680
      {
Martin Reinecke's avatar
Martin Reinecke committed
681
      u=fmod1(u_in*psx)*nu,
Martin Reinecke's avatar
Martin Reinecke committed
682
      iu0 = int(u-supp*0.5 + 1 + nu) - nu;
Martin Reinecke's avatar
Martin Reinecke committed
683
      iu0 = min<int>(iu0, (nu+nsafe)-supp);
Martin Reinecke's avatar
Martin Reinecke committed
684
      v=fmod1(v_in*psy)*nv;
Martin Reinecke's avatar
Martin Reinecke committed
685
      iv0 = int(v-supp*0.5 + 1 + nv) - nv;
Martin Reinecke's avatar
Martin Reinecke committed
686
      iv0 = min<int>(iv0, (nv+nsafe)-supp);
Martin Reinecke's avatar
Martin Reinecke committed
687
      }
Martin Reinecke's avatar
updates    
Martin Reinecke committed
688

Martin Reinecke's avatar
step 1    
Martin Reinecke committed
689
    template<typename T> void apply_wscreen(const const_mav<complex<T>,2> &dirty,
Martin Reinecke's avatar
updates    
Martin Reinecke committed
690
      mav<complex<T>,2> &dirty2, double w, bool adjoint) const
Martin Reinecke's avatar
Martin Reinecke committed
691
      {
Martin Reinecke's avatar
updates    
Martin Reinecke committed
692
693
      checkShape(dirty.shape(), {nx_dirty, ny_dirty});
      checkShape(dirty2.shape(), {nx_dirty, ny_dirty});
Martin Reinecke's avatar
Martin Reinecke committed
694
695
      double x0 = -0.5*nx_dirty*psx,
             y0 = -0.5*ny_dirty*psy;
Martin Reinecke's avatar
updates    
Martin Reinecke committed
696
#pragma omp parallel for num_threads(nthreads) schedule(static)
Martin Reinecke's avatar
Martin Reinecke committed
697
698
699
700
701
702
703
      for (size_t i=0; i<=nx_dirty/2; ++i)
        {
        double fx = x0+i*psx;
        fx *= fx;
        for (size_t j=0; j<=ny_dirty/2; ++j)
          {
          double fy = y0+j*psy;
Martin Reinecke's avatar
step 1    
Martin Reinecke committed
704
          auto ws = complex<T>(wscreen(fx, fy*fy, w, adjoint));
Martin Reinecke's avatar
updates    
Martin Reinecke committed
705
          dirty2(i,j) = dirty(i,j)*ws; // lower left
Martin Reinecke's avatar
Martin Reinecke committed
706
707
708
          size_t i2 = nx_dirty-i, j2 = ny_dirty-j;
          if ((i>0)&&(i<i2))
            {
Martin Reinecke's avatar
updates    
Martin Reinecke committed
709
            dirty2(i2,j) = dirty(i2,j)*ws; // lower right
Martin Reinecke's avatar
Martin Reinecke committed
710
            if ((j>0)&&(j<j2))
Martin Reinecke's avatar
updates    
Martin Reinecke committed
711
              dirty2(i2,j2) = dirty(i2,j2)*ws; // upper right
Martin Reinecke's avatar
Martin Reinecke committed
712
713
            }
          if ((j>0)&&(j<j2))
Martin Reinecke's avatar
updates    
Martin Reinecke committed
714
            dirty2(i,j2) = dirty(i,j2)*ws; // upper left
Martin Reinecke's avatar
Martin Reinecke committed
715
716
717
718
719
720
721
          }
        }
      }
  };

constexpr int logsquare=4;

Martin Reinecke's avatar
Martin Reinecke committed
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
#ifdef _OPENMP
class Lock
  {
  private:
    omp_lock_t lck;

    Lock(const Lock &) = delete;
    Lock& operator=(const Lock &) = delete;

  public:
    Lock() { omp_init_lock(&lck); }
    ~Lock() { omp_destroy_lock(&lck); }
    void lock() { omp_set_lock(&lck); }
    void unlock() { omp_unset_lock(&lck); }
  };
#else
class Lock
  {
  public:
    Lock() {}
    ~Lock() {}
    void lock() {}
    void unlock {}
  };
#endif

Martin Reinecke's avatar
Martin Reinecke committed
748
template<typename T, typename T2=complex<T>> class Helper
Martin Reinecke's avatar
Martin Reinecke committed
749
750
  {
  private:
Martin Reinecke's avatar
step 1    
Martin Reinecke committed
751
    const GridderConfig &gconf;
Martin Reinecke's avatar
Martin Reinecke committed
752
753
754
755
756
757
758
759
    int nu, nv, nsafe, supp;
    T beta;
    const T2 *grid_r;
    T2 *grid_w;
    int su, sv;
    int iu0, iv0; // start index of the current visibility
    int bu0, bv0; // start index of the current buffer

Martin Reinecke's avatar
Martin Reinecke committed
760
    vector<T2> rbuf, wbuf;
Martin Reinecke's avatar
Martin Reinecke committed
761
762
763
    bool do_w_gridding;
    T w0, xdw;
    size_t nexp;
764
    size_t nvecs;
Martin Reinecke's avatar
Martin Reinecke committed
765
    vector<Lock> &locks;
Martin Reinecke's avatar
Martin Reinecke committed
766
767
768
769
770
771
772
773
774
775
776
777

    void dump() const
      {
      if (bu0<-nsafe) return; // nothing written into buffer yet

#pragma omp critical (gridder_writing_to_grid)
{
      int idxu = (bu0+nu)%nu;
      int idxv0 = (bv0+nv)%nv;
      for (int iu=0; iu<su; ++iu)
        {
        int idxv = idxv0;
Martin Reinecke's avatar
Martin Reinecke committed
778
        locks[idxu].lock();
Martin Reinecke's avatar
Martin Reinecke committed
779
780
781
782
783
        for (int iv=0; iv<sv; ++iv)
          {
          grid_w[idxu*nv + idxv] += wbuf[iu*sv + iv];
          if (++idxv>=nv) idxv=0;
          }
Martin Reinecke's avatar
Martin Reinecke committed
784
        locks[idxu].unlock();
Martin Reinecke's avatar
Martin Reinecke committed
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
        if (++idxu>=nu) idxu=0;
        }
}
      }

    void load()
      {
      int idxu = (bu0+nu)%nu;
      int idxv0 = (bv0+nv)%nv;
      for (int iu=0; iu<su; ++iu)
        {
        int idxv = idxv0;
        for (int iv=0; iv<sv; ++iv)
          {
          rbuf[iu*sv + iv] = grid_r[idxu*nv + idxv];
          if (++idxv>=nv) idxv=0;
          }
        if (++idxu>=nu) idxu=0;
        }
      }

  public:
    const T2 *p0r;
    T2 *p0w;
Martin Reinecke's avatar
Martin Reinecke committed
809
    T kernel[64] ALIGNED(64);
Martin Reinecke's avatar
Martin Reinecke committed
810

Martin Reinecke's avatar
step 1    
Martin Reinecke committed
811
    Helper(const GridderConfig &gconf_, const T2 *grid_r_, T2 *grid_w_,
Martin Reinecke's avatar
Martin Reinecke committed
812
      vector<Lock> &locks_, T w0_=-1, T dw_=-1)
Martin Reinecke's avatar
Martin Reinecke committed
813
814
815
816
817
818
      : gconf(gconf_), nu(gconf.Nu()), nv(gconf.Nv()), nsafe(gconf.Nsafe()),
        supp(gconf.Supp()), beta(gconf.Beta()), grid_r(grid_r_),
        grid_w(grid_w_), su(2*nsafe+(1<<logsquare)), sv(2*nsafe+(1<<logsquare)),
        bu0(-1000000), bv0(-1000000),
        rbuf(su*sv*(grid_r!=nullptr),T(0)),
        wbuf(su*sv*(grid_w!=nullptr),T(0)),
Martin Reinecke's avatar
Martin Reinecke committed
819
820
821
822
        do_w_gridding(dw_>0),
        w0(w0_),
        xdw(T(1)/dw_),
        nexp(2*supp + do_w_gridding),
Martin Reinecke's avatar
Martin Reinecke committed
823
824
        nvecs(VLEN<T>::val*((nexp+VLEN<T>::val-1)/VLEN<T>::val)),
        locks(locks_)
Martin Reinecke's avatar
Martin Reinecke committed
825
826
827
828
      {}
    ~Helper() { if (grid_w) dump(); }

    int lineJump() const { return sv; }
Martin Reinecke's avatar
Martin Reinecke committed
829
    T Wfac() const { return kernel[2*supp]; }
Martin Reinecke's avatar
step 1    
Martin Reinecke committed
830
    void prep(const UVW &in)
Martin Reinecke's avatar
Martin Reinecke committed
831
832
      {
      T u, v;
Martin Reinecke's avatar
step 1    
Martin Reinecke committed
833
      gconf.getpix<T>(in.u, in.v, u, v, iu0, iv0);
Martin Reinecke's avatar
Martin Reinecke committed
834
835
836
837
838
      T xsupp=T(2)/supp;
      auto x0 = xsupp*(iu0-u);
      auto y0 = xsupp*(iv0-v);
      for (int i=0; i<supp; ++i)
        {
Martin Reinecke's avatar
Martin Reinecke committed
839
840
        kernel[i  ] = x0+i*xsupp;
        kernel[i+supp] = y0+i*xsupp;
Martin Reinecke's avatar
Martin Reinecke committed
841
        }
Martin Reinecke's avatar
Martin Reinecke committed
842
      if (do_w_gridding)
Martin Reinecke's avatar
step 1    
Martin Reinecke committed
843
        kernel[2*supp] = min(T(1), xdw*xsupp*abs(w0-T(in.w)));
Martin Reinecke's avatar
Martin Reinecke committed
844
      for (size_t i=nexp; i<nvecs; ++i)
845
846
        kernel[i]=0;
      for (size_t i=0; i<nvecs; ++i)
Martin Reinecke's avatar
Martin Reinecke committed
847
        kernel[i] = exp(beta*(sqrt(T(1)-kernel[i]*kernel[i])-T(1)));
Martin Reinecke's avatar
Martin Reinecke committed
848
849
850
851
852
853
854
855
856
857
858
859
      if ((iu0<bu0) || (iv0<bv0) || (iu0+supp>bu0+su) || (iv0+supp>bv0+sv))
        {
        if (grid_w) { dump(); fill(wbuf.begin(), wbuf.end(), T(0)); }
        bu0=((((iu0+nsafe)>>logsquare)<<logsquare))-nsafe;
        bv0=((((iv0+nsafe)>>logsquare)<<logsquare))-nsafe;
        if (grid_r) load();
        }
      p0r = grid_r ? rbuf.data() + sv*(iu0-bu0) + iv0-bv0 : nullptr;
      p0w = grid_w ? wbuf.data() + sv*(iu0-bu0) + iv0-bv0 : nullptr;
      }
  };

Martin Reinecke's avatar
step 1    
Martin Reinecke committed
860
template<class T, class T2> class VisServ
Martin Reinecke's avatar
updates    
Martin Reinecke committed
861
  {
862
  private:
Martin Reinecke's avatar
step 1    
Martin Reinecke committed
863
    const Baselines &baselines;
864
    const_mav<uint32_t,1> idx;
865
    T2 vis;
866
    const_mav<T,1> wgt;
867
868
    size_t nvis;
    bool have_wgt;
Martin Reinecke's avatar
updates    
Martin Reinecke committed
869

870
  public:
Martin Reinecke's avatar
step 1    
Martin Reinecke committed
871
872
    VisServ(const Baselines &baselines_,
      const const_mav<uint32_t,1> &idx_, T2 vis_, const const_mav<T,1> &wgt_)
Martin Reinecke's avatar
Martin Reinecke committed
873
874
      : baselines(baselines_), idx(idx_), vis(vis_), wgt(wgt_),
        nvis(vis.shape(0)), have_wgt(wgt.size()!=0)
875
876
877
878
      {
      checkShape(idx.shape(), {nvis});
      if (have_wgt) checkShape(wgt.shape(), {nvis});
      }
Martin Reinecke's avatar
cleanup    
Martin Reinecke committed
879
880
881
    VisServ(const VisServ &orig, const const_mav<uint32_t,1> &/*newidx*/)
      : baselines(orig.baselines), idx(orig.idx), vis(orig.vis), wgt(orig.wgt)
      { myfail("must not happen"); }
882
    size_t Nvis() const { return nvis; }
Martin Reinecke's avatar
step 1    
Martin Reinecke committed
883
884
    const Baselines &getBaselines() const { return baselines; }
    UVW getCoord(size_t i) const
885
886
887
888
889
890
891
892
      { return baselines.effectiveCoord(idx[i]); }
    complex<T> getVis(size_t i) const
      { return have_wgt ? vis(i)*wgt(i) : vis(i); }
    uint32_t getIdx(size_t i) const { return idx[i]; }
    void setVis (size_t i, const complex<T> &v) const
      { vis(i) = have_wgt ? v*wgt(i) : v; }
    void addVis (size_t i, const complex<T> &v) const
      { vis(i) += have_wgt ? v*wgt(i) : v; }
Martin Reinecke's avatar
cleanup    
Martin Reinecke committed
893
    bool isMsServ() const { return false; }
894
  };
Martin Reinecke's avatar
step 1    
Martin Reinecke committed
895
896
897
898
899
900
template<class T, class T2> VisServ<T, T2> makeVisServ
  (const Baselines &baselines,
   const const_mav<uint32_t,1> &idx, const T2 &vis, const const_mav<T,1> &wgt)
  { return VisServ<T, T2>(baselines, idx, vis, wgt); }

template<class T, class T2> class MsServ
901
902
  {
  private:
Martin Reinecke's avatar
step 1    
Martin Reinecke committed
903
    const Baselines &baselines;
904
    const_mav<uint32_t,1> idx;
905
    T2 ms;
906
    const_mav<T,2> wgt;
907
908
    size_t nvis;
    bool have_wgt;
Martin Reinecke's avatar
updates    
Martin Reinecke committed
909

910
  public:
Martin Reinecke's avatar
step 1    
Martin Reinecke committed
911
912
    MsServ(const Baselines &baselines_,
    const const_mav<uint32_t,1> &idx_, T2 ms_, const const_mav<T,2> &wgt_)
Martin Reinecke's avatar
Martin Reinecke committed
913
914
      : baselines(baselines_), idx(idx_), ms(ms_), wgt(wgt_),
        nvis(idx.shape(0)), have_wgt(wgt.size()!=0)
Martin Reinecke's avatar
updates    
Martin Reinecke committed
915
      {
Martin Reinecke's avatar
Martin Reinecke committed
916
917
      checkShape(ms.shape(), {baselines.Nrows(), baselines.Nchannels()});
      if (have_wgt) checkShape(wgt.shape(), ms.shape());
Martin Reinecke's avatar
updates    
Martin Reinecke committed
918
      }
Martin Reinecke's avatar
Martin Reinecke committed
919
920
    MsServ(const MsServ &orig, const const_mav<uint32_t,1> &newidx)
      : MsServ(orig.baselines, newidx, orig.ms, orig.wgt) {}
921
    size_t Nvis() const { return nvis; }
Martin Reinecke's avatar
step 1    
Martin Reinecke committed
922
923
    const Baselines &getBaselines() const { return baselines; }
    UVW getCoord(size_t i) const
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
      { return baselines.effectiveCoord(idx(i)); }
    complex<T> getVis(size_t i) const
      {
      auto rc = baselines.getRowChan(idx(i));
      return have_wgt ? ms(rc.row, rc.chan)*wgt(rc.row, rc.chan)
                      : ms(rc.row, rc.chan);
      }
    uint32_t getIdx(size_t i) const { return idx[i]; }
    void setVis (size_t i, const complex<T> &v) const
      {
      auto rc = baselines.getRowChan(idx(i));
      ms(rc.row, rc.chan) = have_wgt ? v*wgt(rc.row, rc.chan) : v;
      }
    void addVis (size_t i, const complex<T> &v) const
      {
      auto rc = baselines.getRowChan(idx(i));
      ms(rc.row, rc.chan) += have_wgt ? v*wgt(rc.row, rc.chan) : v;
      }
Martin Reinecke's avatar
cleanup    
Martin Reinecke committed
942
    bool isMsServ() const { return true; }
943
  };
Martin Reinecke's avatar
step 1    
Martin Reinecke committed
944
945
946
947
template<class T, class T2> MsServ<T, T2> makeMsServ
  (const Baselines &baselines,
   const const_mav<uint32_t,1> &idx, const T2 &ms, const const_mav<T,2> &wgt)
  { return MsServ<T, T2>(baselines, idx, ms, wgt); }
Martin Reinecke's avatar
updates    
Martin Reinecke committed
948

949
template<typename T, typename Serv> void x2grid_c
Martin Reinecke's avatar
step 1    
Martin Reinecke committed
950
951
  (const GridderConfig &gconf, const Serv &srv, mav<complex<T>,2> &grid,
  double w0=-1, double dw=-1)
Martin Reinecke's avatar
updates    
Martin Reinecke committed
952
  {
Martin Reinecke's avatar
Martin Reinecke committed
953
  checkShape(grid.shape(), {gconf.Nu(), gconf.Nv()});
Martin Reinecke's avatar
updates    
Martin Reinecke committed
954
955
  myassert(grid.contiguous(), "grid is not contiguous");
  size_t supp = gconf.Supp();
Martin Reinecke's avatar
Martin Reinecke committed
956
  size_t nthreads = gconf.Nthreads();
Martin Reinecke's avatar
Martin Reinecke committed
957
  bool do_w_gridding = dw>0;
Martin Reinecke's avatar
Martin Reinecke committed
958
  vector<Lock> locks(gconf.Nu());
Martin Reinecke's avatar
updates    
Martin Reinecke committed
959
960
961

#pragma omp parallel num_threads(nthreads)
{
Martin Reinecke's avatar
Martin Reinecke committed
962
  Helper<T> hlp(gconf, nullptr, grid.data(), locks, w0, dw);
Martin Reinecke's avatar
updates    
Martin Reinecke committed
963
  int jump = hlp.lineJump();
Martin Reinecke's avatar
Martin Reinecke committed
964
965
  const T * RESTRICT ku = hlp.kernel;
  const T * RESTRICT kv = hlp.kernel+supp;
966
  size_t np = srv.Nvis();
Martin Reinecke's avatar
updates    
Martin Reinecke committed
967
968
969

  // Loop over sampling points
#pragma omp for schedule(guided,100)
970
  for (size_t ipart=0; ipart<np; ++ipart)
Martin Reinecke's avatar
updates    
Martin Reinecke committed
971
    {
Martin Reinecke's avatar
step 1    
Martin Reinecke committed
972
    UVW coord = srv.getCoord(ipart);
973
    auto flip = coord.FixW();
Martin Reinecke's avatar
Martin Reinecke committed
974
    hlp.prep(coord);
Martin Reinecke's avatar
Martin Reinecke committed
975
    auto * RESTRICT ptr = hlp.p0w;
Martin Reinecke's avatar
Martin Reinecke committed
976
977
    auto v(srv.getVis(ipart));
    if (do_w_gridding) v*=hlp.Wfac();
978
    if (flip) v=conj(v);
Martin Reinecke's avatar
updates    
Martin Reinecke committed
979
980
981
    for (size_t cu=0; cu<supp; ++cu)
      {
      complex<T> tmp(v*ku[cu]);
Martin Reinecke's avatar
Martin Reinecke committed
982
983
984
985
986
987
988
989
990
      size_t cv=0;
      for (; cv<supp-3; cv+=4)
        {
        ptr[cv  ] += tmp*kv[cv  ];
        ptr[cv+1] += tmp*kv[cv+1];
        ptr[cv+2] += tmp*kv[cv+2];
        ptr[cv+3] += tmp*kv[cv+3];
        }
      for (; cv<supp; ++cv)
Martin Reinecke's avatar
updates    
Martin Reinecke committed
991
992
993
994
995
996
997
        ptr[cv] += tmp*kv[cv];
      ptr+=jump;
      }
    }
} // end of parallel region
  }

998
template<typename T> void vis2grid_c
Martin Reinecke's avatar
step 1    
Martin Reinecke committed
999
  (const Baselines &baselines, const GridderConfig &gconf,
1000
  const const_mav<uint32_t,1> &idx, const const_mav<complex<T>,1> &vis,
Martin Reinecke's avatar
step 1    
Martin Reinecke committed
1001
  mav<complex<T>,2> &grid, const const_mav<T,1> &wgt, double w0=-1, double dw=-1)
Martin Reinecke's avatar
Martin Reinecke committed
1002
  { x2grid_c(gconf, makeVisServ(baselines, idx, vis, wgt), grid, w0, dw); }
1003
1004

template<typename T> void ms2grid_c
Martin Reinecke's avatar
step 1    
Martin Reinecke committed
1005
  (const Baselines &baselines, const GridderConfig &gconf,
1006
1007
  const const_mav<uint32_t,1> &idx, const const_mav<complex<T>,2> &ms,
  mav<complex<T>,2> &grid, const const_mav<T,2> &wgt)
Martin Reinecke's avatar
Martin Reinecke committed
1008
  { x2grid_c(gconf, makeMsServ(baselines, idx, ms, wgt), grid); }
Martin Reinecke's avatar
updates    
Martin Reinecke committed
1009

1010
template<typename T, typename Serv> void grid2x_c
Martin Reinecke's avatar
step 1    
Martin Reinecke committed
1011
1012
  (const GridderConfig &gconf, const const_mav<complex<T>,2> &grid,
  const Serv &srv, double w0=-1, double dw=-1)
1013
  {
Martin Reinecke's avatar
Martin Reinecke committed
1014
  checkShape(grid.shape(), {gconf.Nu(), gconf.Nv()});
Martin Reinecke's avatar
updates    
Martin Reinecke committed
1015
1016
  myassert(grid.contiguous(), "grid is not contiguous");
  size_t supp = gconf.Supp();
Martin Reinecke's avatar
Martin Reinecke committed
1017
  size_t nthreads = gconf.Nthreads();
Martin Reinecke's avatar
Martin Reinecke committed
1018
  bool do_w_gridding = dw>0;
Martin Reinecke's avatar
Martin Reinecke committed
1019
  vector<Lock> locks(gconf.Nu());
Martin Reinecke's avatar
updates    
Martin Reinecke committed
1020
1021
1022
1023

  // Loop over sampling points
#pragma omp parallel num_threads(nthreads)
{
Martin Reinecke's avatar
Martin Reinecke committed
1024
  Helper<T> hlp(gconf, grid.data(), nullptr, locks, w0, dw);
Martin Reinecke's avatar
updates    
Martin Reinecke committed
1025
  int jump = hlp.lineJump();
Martin Reinecke's avatar
Martin Reinecke committed
1026
1027
  const T * RESTRICT ku = hlp.kernel;
  const T * RESTRICT kv = hlp.kernel+supp;
1028
  size_t np = srv.Nvis();
Martin Reinecke's avatar
updates    
Martin Reinecke committed
1029
1030

#pragma omp for schedule(guided,100)
1031
  for (size_t ipart=0; ipart<np; ++ipart)
Martin Reinecke's avatar
updates    
Martin Reinecke committed
1032
    {
Martin Reinecke's avatar
step 1    
Martin Reinecke committed
1033
    UVW coord = srv.getCoord(ipart);
1034
    auto flip = coord.FixW();
Martin Reinecke's avatar
Martin Reinecke committed
1035
    hlp.prep(coord);
Martin Reinecke's avatar
updates    
Martin Reinecke committed
1036
    complex<T> r = 0;
Martin Reinecke's avatar
Martin Reinecke committed
1037
    const auto * RESTRICT ptr = hlp.p0r;
Martin Reinecke's avatar
updates    
Martin Reinecke committed
1038
1039
1040
    for (size_t cu=0; cu<supp; ++cu)
      {
      complex<T> tmp(0);
Martin Reinecke's avatar
Martin Reinecke committed
1041
1042
1043
1044
1045
1046
1047
      size_t cv=0;
      for (; cv<supp-3; cv+=4)
        tmp += ptr[cv  ]*kv[cv  ]
             + ptr[cv+1]*kv[cv+1]
             + ptr[cv+2]*kv[cv+2]
             + ptr[cv+3]*kv[cv+3];
      for (; cv<supp; ++cv)
Martin Reinecke's avatar
updates    
Martin Reinecke committed
1048
1049
1050
1051
        tmp += ptr[cv] * kv[cv];
      r += tmp*ku[cu];
      ptr += jump;
      }
1052
    if (flip) r=conj(r);
Martin Reinecke's avatar
Martin Reinecke committed
1053
    if (do_w_gridding) r*=hlp.Wfac();
1054
    srv.addVis(ipart, r);
Martin Reinecke's avatar
updates    
Martin Reinecke committed
1055
1056
1057
    }
}
  }
1058
template<typename T> void grid2vis_c