gridder_cxx.h 36.5 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
#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
 */

22
/* Copyright (C) 2019-2020 Max-Planck-Society
Martin Reinecke's avatar
Martin Reinecke committed
23 24 25 26 27 28 29 30
   Author: Martin Reinecke */

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

Martin Reinecke's avatar
Martin Reinecke committed
33 34 35 36 37
#include "ducc0/infra/error_handling.h"
#include "ducc0/math/fft.h"
#include "ducc0/infra/threading.h"
#include "ducc0/infra/useful_macros.h"
#include "ducc0/infra/mav.h"
Martin Reinecke's avatar
Martin Reinecke committed
38
#include "ducc0/infra/simd.h"
Martin Reinecke's avatar
Martin Reinecke committed
39
#include "ducc0/math/gridding_kernel.h"
Martin Reinecke's avatar
Martin Reinecke committed
40

Martin Reinecke's avatar
Martin Reinecke committed
41
namespace ducc0 {
Martin Reinecke's avatar
Martin Reinecke committed
42

Martin Reinecke's avatar
Martin Reinecke committed
43
namespace detail_gridder {
Martin Reinecke's avatar
Martin Reinecke committed
44 45 46 47 48

using namespace std;

template<size_t ndim> void checkShape
  (const array<size_t, ndim> &shp1, const array<size_t, ndim> &shp2)
49
  { MR_assert(shp1==shp2, "shape mismatch"); }
Martin Reinecke's avatar
Martin Reinecke committed
50 51 52 53 54 55 56 57 58

template<typename T> inline T fmod1 (T v)
  { return v-floor(v); }

//
// Start of real gridder functionality
//

template<typename T> void complex2hartley
Martin Reinecke's avatar
stage 2  
Martin Reinecke committed
59
  (const mav<complex<T>, 2> &grid, mav<T,2> &grid2, size_t nthreads)
Martin Reinecke's avatar
Martin Reinecke committed
60
  {
61
  MR_assert(grid.conformable(grid2), "shape mismatch");
Martin Reinecke's avatar
Martin Reinecke committed
62 63 64 65 66 67 68 69 70 71
  size_t nu=grid.shape(0), nv=grid.shape(1);

  execStatic(nu, nthreads, 0, [&](Scheduler &sched)
    {
    while (auto rng=sched.getNext()) for(auto u=rng.lo; u<rng.hi; ++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;
Martin Reinecke's avatar
Martin Reinecke committed
72 73
        grid2.v(u,v) = T(0.5)*(grid( u, v).real()+grid( u, v).imag()+
                               grid(xu,xv).real()-grid(xu,xv).imag());
Martin Reinecke's avatar
Martin Reinecke committed
74 75 76 77 78 79
        }
      }
    });
  }

template<typename T> void hartley2complex
Martin Reinecke's avatar
stage 2  
Martin Reinecke committed
80
  (const mav<T,2> &grid, mav<complex<T>,2> &grid2, size_t nthreads)
Martin Reinecke's avatar
Martin Reinecke committed
81
  {
82
  MR_assert(grid.conformable(grid2), "shape mismatch");
Martin Reinecke's avatar
Martin Reinecke committed
83 84 85 86 87 88 89 90 91 92 93 94
  size_t nu=grid.shape(0), nv=grid.shape(1);

  execStatic(nu, nthreads, 0, [&](Scheduler &sched)
    {
    while (auto rng=sched.getNext()) for(auto u=rng.lo; u<rng.hi; ++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);
Martin Reinecke's avatar
Martin Reinecke committed
95
        grid2.v(u,v) = std::complex<T>(v1+v2, v1-v2);
Martin Reinecke's avatar
Martin Reinecke committed
96 97 98 99 100
        }
      }
    });
  }

Martin Reinecke's avatar
cleanup  
Martin Reinecke committed
101 102
template<typename T> void hartley2_2D(mav<T,2> &arr, size_t vlim, bool g2d,
  size_t nthreads)
Martin Reinecke's avatar
Martin Reinecke committed
103
  {
Martin Reinecke's avatar
Martin Reinecke committed
104 105
  size_t nu=arr.shape(0), nv=arr.shape(1);
  fmav<T> farr(arr);
Martin Reinecke's avatar
cleanup  
Martin Reinecke committed
106
  if (2*vlim<nv)
Martin Reinecke's avatar
Martin Reinecke committed
107 108 109
    {
    if (!g2d)
      r2r_separable_hartley(farr, farr, {1}, T(1), nthreads);
Martin Reinecke's avatar
cleanup  
Martin Reinecke committed
110
    auto flo = farr.subarray({0,0},{farr.shape(0),vlim});
Martin Reinecke's avatar
Martin Reinecke committed
111
    r2r_separable_hartley(flo, flo, {0}, T(1), nthreads);
Martin Reinecke's avatar
cleanup  
Martin Reinecke committed
112
    auto fhi = farr.subarray({0,farr.shape(1)-vlim},{farr.shape(0),vlim});
Martin Reinecke's avatar
Martin Reinecke committed
113 114 115 116 117 118
    r2r_separable_hartley(fhi, fhi, {0}, T(1), nthreads);
    if (g2d)
      r2r_separable_hartley(farr, farr, {1}, T(1), nthreads);
    }
  else
    r2r_separable_hartley(farr, farr, {0,1}, T(1), nthreads);
Martin Reinecke's avatar
Martin Reinecke committed
119 120 121 122 123
  execStatic((nu+1)/2-1, nthreads, 0, [&](Scheduler &sched)
    {
    while (auto rng=sched.getNext()) for(auto i=rng.lo+1; i<rng.hi+1; ++i)
      for(size_t j=1; j<(nv+1)/2; ++j)
         {
Martin Reinecke's avatar
Martin Reinecke committed
124 125 126 127 128 129 130 131
         T a = arr(i,j);
         T b = arr(nu-i,j);
         T c = arr(i,nv-j);
         T d = arr(nu-i,nv-j);
         arr.v(i,j) = T(0.5)*(a+b+c-d);
         arr.v(nu-i,j) = T(0.5)*(a+b+d-c);
         arr.v(i,nv-j) = T(0.5)*(a+c+d-b);
         arr.v(nu-i,nv-j) = T(0.5)*(b+c+d-a);
Martin Reinecke's avatar
Martin Reinecke committed
132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165
         }
     });
  }

using idx_t = uint32_t;

struct RowChan
  {
  idx_t row, chan;
  };

struct UVW
  {
  double u, v, w;
  UVW() {}
  UVW(double u_, double v_, double w_) : u(u_), v(v_), w(w_) {}
  UVW operator* (double fct) const
    { return UVW(u*fct, v*fct, w*fct); }
  void Flip() { u=-u; v=-v; w=-w; }
  bool FixW()
    {
    bool flip = w<0;
    if (flip) Flip();
    return flip;
    }
  };

class Baselines
  {
  protected:
    vector<UVW> coord;
    vector<double> f_over_c;
    idx_t nrows, nchan;
    idx_t shift, mask;
Martin Reinecke's avatar
Martin Reinecke committed
166
    double umax, vmax;
Martin Reinecke's avatar
Martin Reinecke committed
167 168

  public:
Martin Reinecke's avatar
stage 2  
Martin Reinecke committed
169 170
    template<typename T> Baselines(const mav<T,2> &coord_,
      const mav<T,1> &freq, bool negate_v=false)
Martin Reinecke's avatar
Martin Reinecke committed
171 172 173 174 175 176 177 178 179 180 181 182 183 184
      {
      constexpr double speedOfLight = 299792458.;
      MR_assert(coord_.shape(1)==3, "dimension mismatch");
      auto hugeval = size_t(~(idx_t(0)));
      MR_assert(coord_.shape(0)<hugeval, "too many entries in MS");
      MR_assert(coord_.shape(1)<hugeval, "too many entries in MS");
      MR_assert(coord_.size()<hugeval, "too many entries in MS");
      nrows = coord_.shape(0);
      nchan = freq.shape(0);
      shift=0;
      while((idx_t(1)<<shift)<nchan) ++shift;
      mask=(idx_t(1)<<shift)-1;
      MR_assert(nrows*(mask+1)<hugeval, "too many entries in MS");
      f_over_c.resize(nchan);
Martin Reinecke's avatar
Martin Reinecke committed
185
      double fcmax = 0;
Martin Reinecke's avatar
Martin Reinecke committed
186 187
      for (size_t i=0; i<nchan; ++i)
        {
Martin Reinecke's avatar
stage 2  
Martin Reinecke committed
188
        MR_assert(freq(i)>0, "negative channel frequency encountered");
Martin Reinecke's avatar
Martin Reinecke committed
189
        f_over_c[i] = freq(i)/speedOfLight;
Martin Reinecke's avatar
Martin Reinecke committed
190
        fcmax = max(fcmax, abs(f_over_c[i]));
Martin Reinecke's avatar
Martin Reinecke committed
191 192
        }
      coord.resize(nrows);
Martin Reinecke's avatar
Martin Reinecke committed
193 194 195 196 197 198 199 200 201 202
      double vfac = negate_v ? -1 : 1;
      vmax=0;
      for (size_t i=0; i<coord.size(); ++i)
        {
        coord[i] = UVW(coord_(i,0), vfac*coord_(i,1), coord_(i,2));
        umax = max(umax, abs(coord_(i,0)));
        vmax = max(vmax, abs(coord_(i,1)));
        }
      umax *= fcmax;
      vmax *= fcmax;
Martin Reinecke's avatar
Martin Reinecke committed
203 204 205 206 207 208 209 210 211 212 213 214 215
      }

    RowChan getRowChan(idx_t index) const
      { return RowChan{index>>shift, index&mask}; }

    UVW effectiveCoord(const RowChan &rc) const
      { return coord[rc.row]*f_over_c[rc.chan]; }
    UVW effectiveCoord(idx_t index) const
      { return effectiveCoord(getRowChan(index)); }
    size_t Nrows() const { return nrows; }
    size_t Nchannels() const { return nchan; }
    idx_t getIdx(idx_t irow, idx_t ichan) const
      { return ichan+(irow<<shift); }
Martin Reinecke's avatar
Martin Reinecke committed
216 217
    double Umax() const { return umax; }
    double Vmax() const { return vmax; }
Martin Reinecke's avatar
Martin Reinecke committed
218 219
  };

Martin Reinecke's avatar
Martin Reinecke committed
220
template<typename T> class GridderConfig
Martin Reinecke's avatar
Martin Reinecke committed
221 222 223
  {
  protected:
    size_t nx_dirty, ny_dirty, nu, nv;
Martin Reinecke's avatar
Martin Reinecke committed
224 225
    double ofactor;

Martin Reinecke's avatar
Martin Reinecke committed
226
  // FIXME: this should probably be done more cleanly
Martin Reinecke's avatar
Martin Reinecke committed
227 228 229 230 231
  public:
    shared_ptr<GriddingKernel<T>> krn;

  protected:
    double psx, psy;
Martin Reinecke's avatar
Martin Reinecke committed
232 233 234 235 236
    size_t supp, nsafe;
    double beta;
    size_t nthreads;
    double ushift, vshift;
    int maxiu0, maxiv0;
Martin Reinecke's avatar
cleanup  
Martin Reinecke committed
237
    size_t vlim;
Martin Reinecke's avatar
Martin Reinecke committed
238

Martin Reinecke's avatar
Martin Reinecke committed
239
    complex<T> wscreen(T x, T y, T w, bool adjoint) const
Martin Reinecke's avatar
Martin Reinecke committed
240 241 242 243 244 245 246 247 248 249 250 251
      {
      constexpr T pi = T(3.141592653589793238462643383279502884197);
      T tmp = 1-x-y;
      if (tmp<=0) return 1; // no phase factor beyond the horizon
      T nm1 = (-x-y)/(sqrt(tmp)+1); // more accurate form of sqrt(1-x-y)-1
      T phase = 2*pi*w*nm1;
      if (adjoint) phase *= -1;
      return complex<T>(cos(phase), sin(phase));
      }

  public:
    GridderConfig(size_t nxdirty, size_t nydirty, size_t nu_, size_t nv_,
Martin Reinecke's avatar
cleanup  
Martin Reinecke committed
252 253
      double epsilon, double pixsize_x, double pixsize_y,
      const Baselines &baselines, size_t nthreads_)
Martin Reinecke's avatar
Martin Reinecke committed
254 255
      : nx_dirty(nxdirty), ny_dirty(nydirty), nu(nu_), nv(nv_),
        ofactor(min(double(nu)/nxdirty, double(nv)/nydirty)),
Martin Reinecke's avatar
cleanup  
Martin Reinecke committed
256
        krn(selectKernel<T>(ofactor, epsilon)),
Martin Reinecke's avatar
Martin Reinecke committed
257
        psx(pixsize_x), psy(pixsize_y),
Martin Reinecke's avatar
Martin Reinecke committed
258
        supp(krn->support()), nsafe((supp+1)/2),
Martin Reinecke's avatar
Martin Reinecke committed
259 260
        nthreads(nthreads_),
        ushift(supp*(-0.5)+1+nu), vshift(supp*(-0.5)+1+nv),
Martin Reinecke's avatar
cleanup  
Martin Reinecke committed
261 262
        maxiu0((nu+nsafe)-supp), maxiv0((nv+nsafe)-supp),
        vlim(min(nv/2, size_t(nv*baselines.Vmax()*psy+0.5*supp+1)))
Martin Reinecke's avatar
Martin Reinecke committed
263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283
      {
      MR_assert(nu>=2*nsafe, "nu too small");
      MR_assert(nv>=2*nsafe, "nv too small");
      MR_assert((nx_dirty&1)==0, "nx_dirty must be even");
      MR_assert((ny_dirty&1)==0, "ny_dirty must be even");
      MR_assert((nu&1)==0, "nu must be even");
      MR_assert((nv&1)==0, "nv must be even");
      MR_assert(epsilon>0, "epsilon must be positive");
      MR_assert(pixsize_x>0, "pixsize_x must be positive");
      MR_assert(pixsize_y>0, "pixsize_y must be positive");
      }
    size_t Nxdirty() const { return nx_dirty; }
    size_t Nydirty() const { return ny_dirty; }
    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; }
    size_t Nthreads() const { return nthreads; }

Martin Reinecke's avatar
Martin Reinecke committed
284
    void grid2dirty_post(mav<T,2> &tmav,
Martin Reinecke's avatar
stage 2  
Martin Reinecke committed
285
      mav<T,2> &dirty) const
Martin Reinecke's avatar
Martin Reinecke committed
286
      {
287
      checkShape(dirty.shape(), {nx_dirty, ny_dirty});
Martin Reinecke's avatar
Martin Reinecke committed
288 289
      auto cfu = krn->corfunc(nx_dirty/2+1, 1./nu, nthreads);
      auto cfv = krn->corfunc(ny_dirty/2+1, 1./nv, nthreads);
Martin Reinecke's avatar
Martin Reinecke committed
290 291 292 293 294 295 296 297 298 299 300 301 302 303
      execStatic(nx_dirty, nthreads, 0, [&](Scheduler &sched)
        {
        while (auto rng=sched.getNext()) for(auto i=rng.lo; i<rng.hi; ++i)
          {
          int icfu = abs(int(nx_dirty/2)-int(i));
          for (size_t j=0; j<ny_dirty; ++j)
            {
            int icfv = abs(int(ny_dirty/2)-int(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;
            // FIXME: for some reason g++ warns about double-to-float conversion
            // here, even though there is an explicit cast...
Martin Reinecke's avatar
Martin Reinecke committed
304
            dirty.v(i,j) = tmav(i2,j2)*T(cfu[icfu]*cfv[icfv]);
Martin Reinecke's avatar
Martin Reinecke committed
305 306 307 308
            }
          }
        });
      }
Martin Reinecke's avatar
Martin Reinecke committed
309
    void grid2dirty_post2(
Martin Reinecke's avatar
stage 2  
Martin Reinecke committed
310
      mav<complex<T>,2> &tmav, mav<T,2> &dirty, T w) const
Martin Reinecke's avatar
Martin Reinecke committed
311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328
      {
      checkShape(dirty.shape(), {nx_dirty,ny_dirty});
      double x0 = -0.5*nx_dirty*psx,
             y0 = -0.5*ny_dirty*psy;
      execStatic(nx_dirty/2+1, nthreads, 0, [&](Scheduler &sched)
        {
        while (auto rng=sched.getNext()) for(auto i=rng.lo; i<rng.hi; ++i)
          {
          T fx = T(x0+i*psx);
          fx *= fx;
          for (size_t j=0; j<=ny_dirty/2; ++j)
            {
            T fy = T(y0+j*psy);
            auto ws = wscreen(fx, fy*fy, w, true);
            size_t ix = nu-nx_dirty/2+i;
            if (ix>=nu) ix-=nu;
            size_t jx = nv-ny_dirty/2+j;
            if (jx>=nv) jx-=nv;
Martin Reinecke's avatar
Martin Reinecke committed
329
            dirty.v(i,j) += (tmav(ix,jx)*ws).real(); // lower left
Martin Reinecke's avatar
Martin Reinecke committed
330 331 332 333 334 335 336
            size_t i2 = nx_dirty-i, j2 = ny_dirty-j;
            size_t ix2 = nu-nx_dirty/2+i2;
            if (ix2>=nu) ix2-=nu;
            size_t jx2 = nv-ny_dirty/2+j2;
            if (jx2>=nv) jx2-=nv;
            if ((i>0)&&(i<i2))
              {
Martin Reinecke's avatar
Martin Reinecke committed
337
              dirty.v(i2,j) += (tmav(ix2,jx)*ws).real(); // lower right
Martin Reinecke's avatar
Martin Reinecke committed
338
              if ((j>0)&&(j<j2))
Martin Reinecke's avatar
Martin Reinecke committed
339
                dirty.v(i2,j2) += (tmav(ix2,jx2)*ws).real(); // upper right
Martin Reinecke's avatar
Martin Reinecke committed
340 341
              }
            if ((j>0)&&(j<j2))
Martin Reinecke's avatar
Martin Reinecke committed
342
              dirty.v(i,j2) += (tmav(ix,jx2)*ws).real(); // upper left
Martin Reinecke's avatar
Martin Reinecke committed
343 344 345 346 347
            }
          }
        });
      }

Martin Reinecke's avatar
Martin Reinecke committed
348
    void grid2dirty(const mav<T,2> &grid,
Martin Reinecke's avatar
stage 2  
Martin Reinecke committed
349
      mav<T,2> &dirty) const
Martin Reinecke's avatar
Martin Reinecke committed
350 351
      {
      checkShape(grid.shape(), {nu,nv});
352
      mav<T,2> tmav({nu,nv});
Martin Reinecke's avatar
Martin Reinecke committed
353
      tmav.apply(grid, [](T&a, T b) {a=b;});
Martin Reinecke's avatar
cleanup  
Martin Reinecke committed
354
      hartley2_2D<T>(tmav, vlim, true, nthreads);
Martin Reinecke's avatar
Martin Reinecke committed
355 356 357
      grid2dirty_post(tmav, dirty);
      }

Martin Reinecke's avatar
Martin Reinecke committed
358
    void grid2dirty_c_overwrite_wscreen_add
Martin Reinecke's avatar
stage 2  
Martin Reinecke committed
359
      (mav<complex<T>,2> &grid, mav<T,2> &dirty, T w) const
Martin Reinecke's avatar
Martin Reinecke committed
360 361
      {
      checkShape(grid.shape(), {nu,nv});
Martin Reinecke's avatar
Martin Reinecke committed
362
      fmav<complex<T>> inout(grid);
Martin Reinecke's avatar
cleanup  
Martin Reinecke committed
363
      if (2*vlim<nv)
Martin Reinecke's avatar
Martin Reinecke committed
364
        {
Martin Reinecke's avatar
cleanup  
Martin Reinecke committed
365
        auto inout_lo = inout.subarray({0,0},{inout.shape(0),vlim});
Martin Reinecke's avatar
Martin Reinecke committed
366
        c2c(inout_lo, inout_lo, {0}, BACKWARD, T(1), nthreads);
Martin Reinecke's avatar
cleanup  
Martin Reinecke committed
367
        auto inout_hi = inout.subarray({0,inout.shape(1)-vlim},{inout.shape(0),vlim});
Martin Reinecke's avatar
Martin Reinecke committed
368 369 370 371 372
        c2c(inout_hi, inout_hi, {0}, BACKWARD, T(1), nthreads);
        c2c(inout, inout, {1}, BACKWARD, T(1), nthreads);
        }
      else
        c2c(inout, inout, {0,1}, BACKWARD, T(1), nthreads);
Martin Reinecke's avatar
Martin Reinecke committed
373 374 375
      grid2dirty_post2(grid, dirty, w);
      }

Martin Reinecke's avatar
Martin Reinecke committed
376
    void dirty2grid_pre(const mav<T,2> &dirty,
Martin Reinecke's avatar
stage 2  
Martin Reinecke committed
377
      mav<T,2> &grid) const
Martin Reinecke's avatar
Martin Reinecke committed
378 379 380
      {
      checkShape(dirty.shape(), {nx_dirty, ny_dirty});
      checkShape(grid.shape(), {nu, nv});
Martin Reinecke's avatar
Martin Reinecke committed
381 382
      auto cfu = krn->corfunc(nx_dirty/2+1, 1./nu, nthreads);
      auto cfv = krn->corfunc(ny_dirty/2+1, 1./nv, nthreads);
Martin Reinecke's avatar
Martin Reinecke committed
383 384 385 386 387 388 389 390 391 392 393 394 395
      grid.fill(0);
      execStatic(nx_dirty, nthreads, 0, [&](Scheduler &sched)
        {
        while (auto rng=sched.getNext()) for(auto i=rng.lo; i<rng.hi; ++i)
          {
          int icfu = abs(int(nx_dirty/2)-int(i));
          for (size_t j=0; j<ny_dirty; ++j)
            {
            int icfv = abs(int(ny_dirty/2)-int(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
396
            grid.v(i2,j2) = dirty(i,j)*T(cfu[icfu]*cfv[icfv]);
Martin Reinecke's avatar
Martin Reinecke committed
397 398 399 400
            }
          }
        });
      }
Martin Reinecke's avatar
Martin Reinecke committed
401
    void dirty2grid_pre2(const mav<T,2> &dirty,
Martin Reinecke's avatar
stage 2  
Martin Reinecke committed
402
      mav<complex<T>,2> &grid, T w) const
Martin Reinecke's avatar
Martin Reinecke committed
403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423
      {
      checkShape(dirty.shape(), {nx_dirty, ny_dirty});
      checkShape(grid.shape(), {nu, nv});
      grid.fill(0);

      double x0 = -0.5*nx_dirty*psx,
             y0 = -0.5*ny_dirty*psy;
      execStatic(nx_dirty/2+1, nthreads, 0, [&](Scheduler &sched)
        {
        while (auto rng=sched.getNext()) for(auto i=rng.lo; i<rng.hi; ++i)
          {
          T fx = T(x0+i*psx);
          fx *= fx;
          for (size_t j=0; j<=ny_dirty/2; ++j)
            {
            T fy = T(y0+j*psy);
            auto ws = wscreen(fx, fy*fy, w, false);
            size_t ix = nu-nx_dirty/2+i;
            if (ix>=nu) ix-=nu;
            size_t jx = nv-ny_dirty/2+j;
            if (jx>=nv) jx-=nv;
Martin Reinecke's avatar
Martin Reinecke committed
424
            grid.v(ix,jx) = dirty(i,j)*ws; // lower left
Martin Reinecke's avatar
Martin Reinecke committed
425 426 427 428 429 430 431
            size_t i2 = nx_dirty-i, j2 = ny_dirty-j;
            size_t ix2 = nu-nx_dirty/2+i2;
            if (ix2>=nu) ix2-=nu;
            size_t jx2 = nv-ny_dirty/2+j2;
            if (jx2>=nv) jx2-=nv;
            if ((i>0)&&(i<i2))
              {
Martin Reinecke's avatar
Martin Reinecke committed
432
              grid.v(ix2,jx) = dirty(i2,j)*ws; // lower right
Martin Reinecke's avatar
Martin Reinecke committed
433
              if ((j>0)&&(j<j2))
Martin Reinecke's avatar
Martin Reinecke committed
434
                grid.v(ix2,jx2) = dirty(i2,j2)*ws; // upper right
Martin Reinecke's avatar
Martin Reinecke committed
435 436
              }
            if ((j>0)&&(j<j2))
Martin Reinecke's avatar
Martin Reinecke committed
437
              grid.v(ix,jx2) = dirty(i,j2)*ws; // upper left
Martin Reinecke's avatar
Martin Reinecke committed
438 439 440 441 442
            }
          }
        });
      }

Martin Reinecke's avatar
Martin Reinecke committed
443
    void dirty2grid(const mav<T,2> &dirty,
Martin Reinecke's avatar
stage 2  
Martin Reinecke committed
444
      mav<T,2> &grid) const
Martin Reinecke's avatar
Martin Reinecke committed
445 446
      {
      dirty2grid_pre(dirty, grid);
Martin Reinecke's avatar
cleanup  
Martin Reinecke committed
447
      hartley2_2D<T>(grid, vlim, false, nthreads);
Martin Reinecke's avatar
Martin Reinecke committed
448 449
      }

Martin Reinecke's avatar
Martin Reinecke committed
450
    void dirty2grid_c_wscreen(const mav<T,2> &dirty,
Martin Reinecke's avatar
stage 2  
Martin Reinecke committed
451
      mav<complex<T>,2> &grid, T w) const
Martin Reinecke's avatar
Martin Reinecke committed
452 453
      {
      dirty2grid_pre2(dirty, grid, w);
Martin Reinecke's avatar
Martin Reinecke committed
454
      fmav<complex<T>> inout(grid);
Martin Reinecke's avatar
cleanup  
Martin Reinecke committed
455
      if (2*vlim<nv)
Martin Reinecke's avatar
Martin Reinecke committed
456 457
        {
        c2c(inout, inout, {1}, FORWARD, T(1), nthreads);
Martin Reinecke's avatar
cleanup  
Martin Reinecke committed
458
        auto inout_lo = inout.subarray({0,0},{inout.shape(0),vlim});
Martin Reinecke's avatar
Martin Reinecke committed
459
        c2c(inout_lo, inout_lo, {0}, FORWARD, T(1), nthreads);
Martin Reinecke's avatar
cleanup  
Martin Reinecke committed
460
        auto inout_hi = inout.subarray({0,inout.shape(1)-vlim},{inout.shape(0),vlim});
Martin Reinecke's avatar
Martin Reinecke committed
461 462 463 464
        c2c(inout_hi, inout_hi, {0}, FORWARD, T(1), nthreads);
        }
      else
        c2c(inout, inout, {0,1}, FORWARD, T(1), nthreads);
Martin Reinecke's avatar
Martin Reinecke committed
465 466 467 468 469 470 471 472 473 474
      }

    void getpix(double u_in, double v_in, double &u, double &v, int &iu0, int &iv0) const
      {
      u=fmod1(u_in*psx)*nu;
      iu0 = min(int(u+ushift)-int(nu), maxiu0);
      v=fmod1(v_in*psy)*nv;
      iv0 = min(int(v+vshift)-int(nv), maxiv0);
      }

Martin Reinecke's avatar
Martin Reinecke committed
475
    void apply_wscreen(const mav<complex<T>,2> &dirty,
Martin Reinecke's avatar
Martin Reinecke committed
476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513
      mav<complex<T>,2> &dirty2, double w, bool adjoint) const
      {
      checkShape(dirty.shape(), {nx_dirty, ny_dirty});
      checkShape(dirty2.shape(), {nx_dirty, ny_dirty});

      double x0 = -0.5*nx_dirty*psx,
             y0 = -0.5*ny_dirty*psy;
      execStatic(nx_dirty/2+1, nthreads, 0, [&](Scheduler &sched)
        {
        while (auto rng=sched.getNext()) for(auto i=rng.lo; i<rng.hi; ++i)
          {
          T fx = T(x0+i*psx);
          fx *= fx;
          for (size_t j=0; j<=ny_dirty/2; ++j)
            {
            T fy = T(y0+j*psy);
            auto ws = wscreen(fx, fy*fy, T(w), adjoint);
            dirty2(i,j) = dirty(i,j)*ws; // lower left
            size_t i2 = nx_dirty-i, j2 = ny_dirty-j;
            if ((i>0)&&(i<i2))
              {
              dirty2(i2,j) = dirty(i2,j)*ws; // lower right
              if ((j>0)&&(j<j2))
                dirty2(i2,j2) = dirty(i2,j2)*ws; // upper right
              }
            if ((j>0)&&(j<j2))
              dirty2(i,j2) = dirty(i,j2)*ws; // upper left
            }
          }
        });
      }
  };

constexpr int logsquare=4;

template<typename T, typename T2=complex<T>> class Helper
  {
  private:
Martin Reinecke's avatar
Martin Reinecke committed
514
    const GridderConfig<T> &gconf;
Martin Reinecke's avatar
Martin Reinecke committed
515 516 517 518 519 520
    int nu, nv, nsafe, supp;
    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
521
    T wfac;
Martin Reinecke's avatar
Martin Reinecke committed
522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565

    vector<T2> rbuf, wbuf;
    bool do_w_gridding;
    double w0, xdw;
    vector<std::mutex> &locks;

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

      int idxu = (bu0+nu)%nu;
      int idxv0 = (bv0+nv)%nv;
      for (int iu=0; iu<su; ++iu)
        {
        int idxv = idxv0;
        {
        std::lock_guard<std::mutex> lock(locks[idxu]);
        for (int iv=0; iv<sv; ++iv)
          {
          grid_w[idxu*nv + idxv] += wbuf[iu*sv + iv];
          if (++idxv>=nv) idxv=0;
          }
        }
        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:
Martin Reinecke's avatar
cleanup  
Martin Reinecke committed
566
    size_t nvec;
Martin Reinecke's avatar
Martin Reinecke committed
567 568 569
    const T2 *p0r;
    T2 *p0w;
    static constexpr size_t vlen=native_simd<T>::size();
Martin Reinecke's avatar
Martin Reinecke committed
570
    union kbuf {
Martin Reinecke's avatar
Martin Reinecke committed
571 572
      T scalar[64];
      native_simd<T> simd[64/vlen];
Martin Reinecke's avatar
Martin Reinecke committed
573
      };
Martin Reinecke's avatar
cleanup  
Martin Reinecke committed
574
    kbuf buf;
Martin Reinecke's avatar
Martin Reinecke committed
575

Martin Reinecke's avatar
Martin Reinecke committed
576
    Helper(const GridderConfig<T> &gconf_, const T2 *grid_r_, T2 *grid_w_,
Martin Reinecke's avatar
Martin Reinecke committed
577 578
      vector<std::mutex> &locks_, double w0_=-1, double dw_=-1)
      : gconf(gconf_), nu(gconf.Nu()), nv(gconf.Nv()), nsafe(gconf.Nsafe()),
Martin Reinecke's avatar
Martin Reinecke committed
579
        supp(gconf.Supp()), grid_r(grid_r_),
Martin Reinecke's avatar
Martin Reinecke committed
580 581 582 583 584 585 586
        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)),
        do_w_gridding(dw_>0),
        w0(w0_),
        xdw(T(1)/dw_),
Martin Reinecke's avatar
cleanup  
Martin Reinecke committed
587 588
        locks(locks_),
        nvec((supp+vlen-1)/vlen)
Martin Reinecke's avatar
Martin Reinecke committed
589
      {
Martin Reinecke's avatar
cleanup  
Martin Reinecke committed
590
      MR_assert(supp<=32, "support too large");
Martin Reinecke's avatar
Martin Reinecke committed
591
      }
Martin Reinecke's avatar
Martin Reinecke committed
592 593 594
    ~Helper() { if (grid_w) dump(); }

    int lineJump() const { return sv; }
Martin Reinecke's avatar
Martin Reinecke committed
595
    T Wfac() const { return wfac; }
Martin Reinecke's avatar
Martin Reinecke committed
596 597
    void prep(const UVW &in)
      {
Martin Reinecke's avatar
Martin Reinecke committed
598
      const auto &krn(*(gconf.krn));
Martin Reinecke's avatar
Martin Reinecke committed
599 600 601 602 603
      double u, v;
      gconf.getpix(in.u, in.v, u, v, iu0, iv0);
      double xsupp=2./supp;
      double x0 = xsupp*(iu0-u);
      double y0 = xsupp*(iv0-v);
Martin Reinecke's avatar
cleanup  
Martin Reinecke committed
604 605
      krn.eval(T(x0), &buf.simd[0]);
      krn.eval(T(y0), &buf.simd[nvec]);
Martin Reinecke's avatar
Martin Reinecke committed
606
      if (do_w_gridding)
Martin Reinecke's avatar
Martin Reinecke committed
607
        wfac = krn.eval_single(T(xdw*xsupp*abs(w0-in.w)));
Martin Reinecke's avatar
Martin Reinecke committed
608 609 610 611 612 613 614 615 616 617 618 619 620 621 622
      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;
      }
  };

template<class T, class Serv> class SubServ
  {
  private:
Martin Reinecke's avatar
stage 2  
Martin Reinecke committed
623 624
    Serv &srv;
    mav<idx_t,1> subidx;
Martin Reinecke's avatar
Martin Reinecke committed
625 626

  public:
Martin Reinecke's avatar
stage 2  
Martin Reinecke committed
627
    SubServ(Serv &orig, const mav<idx_t,1> &subidx_)
Martin Reinecke's avatar
Martin Reinecke committed
628 629 630 631
      : srv(orig), subidx(subidx_){}
    size_t Nvis() const { return subidx.size(); }
    const Baselines &getBaselines() const { return srv.getBaselines(); }
    UVW getCoord(size_t i) const
Martin Reinecke's avatar
stage 2  
Martin Reinecke committed
632
      { return srv.getCoord(subidx(i)); }
Martin Reinecke's avatar
Martin Reinecke committed
633
    complex<T> getVis(size_t i) const
Martin Reinecke's avatar
stage 2  
Martin Reinecke committed
634 635 636 637 638 639
      { return srv.getVis(subidx(i)); }
    idx_t getIdx(size_t i) const { return srv.getIdx(subidx(i)); }
    void setVis (size_t i, const complex<T> &v)
      { srv.setVis(subidx(i), v); }
    void addVis (size_t i, const complex<T> &v)
      { srv.addVis(subidx(i), v); }
Martin Reinecke's avatar
Martin Reinecke committed
640 641 642 643 644 645
  };

template<class T, class T2> class MsServ
  {
  private:
    const Baselines &baselines;
Martin Reinecke's avatar
stage 2  
Martin Reinecke committed
646
    mav<idx_t,1> idx;
Martin Reinecke's avatar
Martin Reinecke committed
647
    T2 ms;
Martin Reinecke's avatar
stage 2  
Martin Reinecke committed
648
    mav<T,2> wgt;
Martin Reinecke's avatar
Martin Reinecke committed
649 650 651 652 653 654 655
    size_t nvis;
    bool have_wgt;

  public:
    using Tsub = SubServ<T, MsServ>;

    MsServ(const Baselines &baselines_,
Martin Reinecke's avatar
stage 2  
Martin Reinecke committed
656
    const mav<idx_t,1> &idx_, T2 ms_, const mav<T,2> &wgt_)
Martin Reinecke's avatar
Martin Reinecke committed
657 658 659 660 661 662
      : baselines(baselines_), idx(idx_), ms(ms_), wgt(wgt_),
        nvis(idx.shape(0)), have_wgt(wgt.size()!=0)
      {
      checkShape(ms.shape(), {baselines.Nrows(), baselines.Nchannels()});
      if (have_wgt) checkShape(wgt.shape(), ms.shape());
      }
Martin Reinecke's avatar
stage 2  
Martin Reinecke committed
663
    Tsub getSubserv(const mav<idx_t,1> &subidx)
Martin Reinecke's avatar
Martin Reinecke committed
664 665 666 667 668 669 670 671 672 673 674
      { return Tsub(*this, subidx); }
    size_t Nvis() const { return nvis; }
    const Baselines &getBaselines() const { return baselines; }
    UVW getCoord(size_t i) const
      { 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);
      }
Martin Reinecke's avatar
stage 2  
Martin Reinecke committed
675 676
    idx_t getIdx(size_t i) const { return idx(i); }
    void setVis (size_t i, const complex<T> &v)
Martin Reinecke's avatar
Martin Reinecke committed
677 678
      {
      auto rc = baselines.getRowChan(idx(i));
Martin Reinecke's avatar
stage 2  
Martin Reinecke committed
679
      ms.w()(rc.row, rc.chan) = have_wgt ? v*wgt(rc.row, rc.chan) : v;
Martin Reinecke's avatar
Martin Reinecke committed
680
      }
Martin Reinecke's avatar
stage 2  
Martin Reinecke committed
681
    void addVis (size_t i, const complex<T> &v)
Martin Reinecke's avatar
Martin Reinecke committed
682 683
      {
      auto rc = baselines.getRowChan(idx(i));
Martin Reinecke's avatar
stage 2  
Martin Reinecke committed
684
      ms.v(rc.row, rc.chan) += have_wgt ? v*wgt(rc.row, rc.chan) : v;
Martin Reinecke's avatar
Martin Reinecke committed
685 686 687 688
      }
  };
template<class T, class T2> MsServ<T, T2> makeMsServ
  (const Baselines &baselines,
Martin Reinecke's avatar
stage 2  
Martin Reinecke committed
689
   const mav<idx_t,1> &idx, T2 &ms, const mav<T,2> &wgt)
Martin Reinecke's avatar
Martin Reinecke committed
690 691 692
  { return MsServ<T, T2>(baselines, idx, ms, wgt); }

template<typename T, typename Serv> void x2grid_c
Martin Reinecke's avatar
Martin Reinecke committed
693
  (const GridderConfig<T> &gconf, Serv &srv, mav<complex<T>,2> &grid,
Martin Reinecke's avatar
Martin Reinecke committed
694 695 696 697 698 699 700 701 702 703 704 705
  double w0=-1, double dw=-1)
  {
  checkShape(grid.shape(), {gconf.Nu(), gconf.Nv()});
  MR_assert(grid.contiguous(), "grid is not contiguous");
  size_t supp = gconf.Supp();
  size_t nthreads = gconf.Nthreads();
  bool do_w_gridding = dw>0;
  vector<std::mutex> locks(gconf.Nu());

  size_t np = srv.Nvis();
  execGuided(np, nthreads, 100, 0.2, [&](Scheduler &sched)
    {
Martin Reinecke's avatar
stage 2  
Martin Reinecke committed
706
    Helper<T> hlp(gconf, nullptr, grid.vdata(), locks, w0, dw);
Martin Reinecke's avatar
Martin Reinecke committed
707
    int jump = hlp.lineJump();
Martin Reinecke's avatar
cleanup  
Martin Reinecke committed
708 709
    const T * DUCC0_RESTRICT ku = hlp.buf.scalar;
    const T * DUCC0_RESTRICT kv = hlp.buf.scalar+hlp.vlen*hlp.nvec;
Martin Reinecke's avatar
Martin Reinecke committed
710 711 712 713 714 715

    while (auto rng=sched.getNext()) for(auto ipart=rng.lo; ipart<rng.hi; ++ipart)
      {
      UVW coord = srv.getCoord(ipart);
      auto flip = coord.FixW();
      hlp.prep(coord);
Martin Reinecke's avatar
Martin Reinecke committed
716
      auto * DUCC0_RESTRICT ptr = hlp.p0w;
Martin Reinecke's avatar
Martin Reinecke committed
717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739
      auto v(srv.getVis(ipart));
      if (do_w_gridding) v*=hlp.Wfac();
      if (flip) v=conj(v);
      for (size_t cu=0; cu<supp; ++cu)
        {
        complex<T> tmp(v*ku[cu]);
        size_t cv=0;
        for (; cv+3<supp; 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)
          ptr[cv] += tmp*kv[cv];
        ptr+=jump;
        }
      }
    });
  }

template<typename T, typename Serv> void grid2x_c
Martin Reinecke's avatar
Martin Reinecke committed
740
  (const GridderConfig<T> &gconf, const mav<complex<T>,2> &grid,
Martin Reinecke's avatar
stage 2  
Martin Reinecke committed
741
  Serv &srv, double w0=-1, double dw=-1)
Martin Reinecke's avatar
Martin Reinecke committed
742 743 744 745 746 747 748 749 750 751 752 753 754 755
  {
  checkShape(grid.shape(), {gconf.Nu(), gconf.Nv()});
  MR_assert(grid.contiguous(), "grid is not contiguous");
  size_t supp = gconf.Supp();
  size_t nthreads = gconf.Nthreads();
  bool do_w_gridding = dw>0;
  vector<std::mutex> locks(gconf.Nu());

  // Loop over sampling points
  size_t np = srv.Nvis();
  execGuided(np, nthreads, 1000, 0.5, [&](Scheduler &sched)
    {
    Helper<T> hlp(gconf, grid.data(), nullptr, locks, w0, dw);
    int jump = hlp.lineJump();
Martin Reinecke's avatar
cleanup  
Martin Reinecke committed
756 757
    const T * DUCC0_RESTRICT ku = hlp.buf.scalar;
    const T * DUCC0_RESTRICT kv = hlp.buf.scalar+hlp.vlen*hlp.nvec;
Martin Reinecke's avatar
Martin Reinecke committed
758 759 760 761 762 763 764

    while (auto rng=sched.getNext()) for(auto ipart=rng.lo; ipart<rng.hi; ++ipart)
      {
      UVW coord = srv.getCoord(ipart);
      auto flip = coord.FixW();
      hlp.prep(coord);
      complex<T> r = 0;
Martin Reinecke's avatar
Martin Reinecke committed
765
      const auto * DUCC0_RESTRICT ptr = hlp.p0r;
Martin Reinecke's avatar
Martin Reinecke committed
766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786
      for (size_t cu=0; cu<supp; ++cu)
        {
        complex<T> tmp(0);
        size_t cv=0;
        for (; cv+3<supp; 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)
          tmp += ptr[cv] * kv[cv];
        r += tmp*ku[cu];
        ptr += jump;
        }
      if (flip) r=conj(r);
      if (do_w_gridding) r*=hlp.Wfac();
      srv.addVis(ipart, r);
      }
    });
  }

Martin Reinecke's avatar
Martin Reinecke committed
787 788
template<typename T> void apply_global_corrections(const GridderConfig<T> &gconf,
  mav<T,2> &dirty, double dw, bool divide_by_n)
Martin Reinecke's avatar
Martin Reinecke committed
789 790 791 792 793 794 795 796
  {
  auto nx_dirty=gconf.Nxdirty();
  auto ny_dirty=gconf.Nydirty();
  size_t nthreads = gconf.Nthreads();
  auto psx=gconf.Pixsize_x();
  auto psy=gconf.Pixsize_y();
  double x0 = -0.5*nx_dirty*psx,
         y0 = -0.5*ny_dirty*psy;
Martin Reinecke's avatar
Martin Reinecke committed
797 798
  auto cfu = gconf.krn->corfunc(nx_dirty/2+1, 1./gconf.Nu(), nthreads);
  auto cfv = gconf.krn->corfunc(ny_dirty/2+1, 1./gconf.Nv(), nthreads);
Martin Reinecke's avatar
Martin Reinecke committed
799 800 801 802 803 804 805 806 807 808 809 810 811 812 813
  execStatic(nx_dirty/2+1, nthreads, 0, [&](Scheduler &sched)
    {
    while (auto rng=sched.getNext()) for(auto i=rng.lo; i<rng.hi; ++i)
      {
      auto fx = T(x0+i*psx);
      fx *= fx;
      for (size_t j=0; j<=ny_dirty/2; ++j)
        {
        auto fy = T(y0+j*psy);
        fy*=fy;
        T fct = 0;
        auto tmp = 1-fx-fy;
        if (tmp>=0)
          {
          auto nm1 = (-fx-fy)/(sqrt(tmp)+1); // accurate form of sqrt(1-x-y)-1
Martin Reinecke's avatar
Martin Reinecke committed
814
          fct = T(gconf.krn->corfunc(nm1*dw));
Martin Reinecke's avatar
Martin Reinecke committed
815 816 817 818 819 820 821 822 823 824
          if (divide_by_n)
            fct /= nm1+1;
          }
        else // beyond the horizon, don't really know what to do here
          {
          if (divide_by_n)
            fct=0;
          else
            {
            auto nm1 = sqrt(-tmp)-1;
Martin Reinecke's avatar
Martin Reinecke committed
825
            fct = T(gconf.krn->corfunc(nm1*dw));
Martin Reinecke's avatar
Martin Reinecke committed
826 827 828 829
            }
          }
        fct *= T(cfu[nx_dirty/2-i]*cfv[ny_dirty/2-j]);
        size_t i2 = nx_dirty-i, j2 = ny_dirty-j;
Martin Reinecke's avatar
Martin Reinecke committed
830
        dirty.v(i,j)*=fct;
Martin Reinecke's avatar
Martin Reinecke committed
831 832
        if ((i>0)&&(i<i2))
          {
Martin Reinecke's avatar
Martin Reinecke committed
833
          dirty.v(i2,j)*=fct;
Martin Reinecke's avatar
Martin Reinecke committed
834
          if ((j>0)&&(j<j2))
Martin Reinecke's avatar
Martin Reinecke committed
835
            dirty.v(i2,j2)*=fct;
Martin Reinecke's avatar
Martin Reinecke committed
836 837
          }
        if ((j>0)&&(j<j2))
Martin Reinecke's avatar
Martin Reinecke committed
838
          dirty.v(i,j2)*=fct;
Martin Reinecke's avatar
Martin Reinecke committed
839 840 841 842 843
        }
      }
    });
  }

Martin Reinecke's avatar
Martin Reinecke committed
844
template<typename T, typename Serv> class WgridHelper
Martin Reinecke's avatar
Martin Reinecke committed
845 846
  {
  private:
Martin Reinecke's avatar
stage 2  
Martin Reinecke committed
847
    Serv &srv;
Martin Reinecke's avatar
Martin Reinecke committed
848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870
    double wmin, dw;
    size_t nplanes, supp;
    vector<vector<idx_t>> minplane;
    size_t verbosity;

    int curplane;
    vector<idx_t> subidx;

    static void wminmax(const Serv &srv, double &wmin, double &wmax)
      {
      size_t nvis = srv.Nvis();

      wmin= 1e38;
      wmax=-1e38;
      // FIXME maybe this can be done more intelligently
      for (size_t ipart=0; ipart<nvis; ++ipart)
        {
        auto wval = abs(srv.getCoord(ipart).w);
        wmin = min(wmin,wval);
        wmax = max(wmax,wval);
        }
      }

Martin Reinecke's avatar
Martin Reinecke committed
871 872
    template<typename T2> static void update_idx(vector<T2> &v, const vector<T2> &add,
      const vector<T2> &del)
Martin Reinecke's avatar
Martin Reinecke committed
873 874
      {
      MR_assert(v.size()>=del.size(), "must not happen");
Martin Reinecke's avatar
Martin Reinecke committed
875
      vector<T2> res;
Martin Reinecke's avatar
Martin Reinecke committed
876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897
      res.reserve((v.size()+add.size())-del.size());
      auto iin=v.begin(), ein=v.end();
      auto iadd=add.begin(), eadd=add.end();
      auto irem=del.begin(), erem=del.end();

      while(iin!=ein)
        {
        if ((irem!=erem) && (*iin==*irem))
          {  ++irem; ++iin; } // skip removed entry
        else if ((iadd!=eadd) && (*iadd<*iin))
           res.push_back(*(iadd++)); // add new entry
        else
          res.push_back(*(iin++));
        }
      MR_assert(irem==erem, "must not happen");
      while(iadd!=eadd)
        res.push_back(*(iadd++));
      MR_assert(res.size()==(v.size()+add.size())-del.size(), "must not happen");
      v.swap(res);
      }

  public:
Martin Reinecke's avatar
Martin Reinecke committed
898
    WgridHelper(const GridderConfig<T> &gconf, Serv &srv_, size_t verbosity_)
Martin Reinecke's avatar
Martin Reinecke committed
899
      : srv(srv_), supp(gconf.Supp()), verbosity(verbosity_), curplane(-1)
Martin Reinecke's avatar
Martin Reinecke committed
900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915
      {
      size_t nvis = srv.Nvis();
      size_t nthreads = gconf.Nthreads();
      double wmax;

      wminmax(srv, wmin, wmax);
      if (verbosity>0) cout << "Using " << nthreads << " thread"
                            << ((nthreads!=1) ? "s" : "") << endl;
      if (verbosity>0) cout << "W range: " << wmin << " to " << wmax << endl;

      double x0 = -0.5*gconf.Nxdirty()*gconf.Pixsize_x(),
             y0 = -0.5*gconf.Nydirty()*gconf.Pixsize_y();
      double nmin = sqrt(max(1.-x0*x0-y0*y0,0.))-1.;
      if (x0*x0+y0*y0>1.)
        nmin = -sqrt(abs(1.-x0*x0-y0*y0))-1.;
      dw = 0.25/abs(nmin);
Martin Reinecke's avatar
Martin Reinecke committed
916
      nplanes = size_t((wmax-wmin)/dw+supp);
Martin Reinecke's avatar
Martin Reinecke committed
917
      wmin = (wmin+wmax)*0.5 - 0.5*(nplanes-1)*dw;
Martin Reinecke's avatar
Martin Reinecke committed
918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951
      if (verbosity>0) cout << "Kernel support: " << supp << endl;
      if (verbosity>0) cout << "nplanes: " << nplanes << endl;

      minplane.resize(nplanes);
#if 0
      // extra short, but potentially inefficient version:
      for (size_t ipart=0; ipart<nvis; ++ipart)
        {
        int plane0 = max(0,int(1+(abs(srv.getCoord(ipart).w)-(0.5*supp*dw)-wmin)/dw));
        minplane[plane0].push_back(idx_t(ipart));
        }
#else
      // more efficient: precalculate final vector sizes and avoid reallocations
      vector<size_t> cnt(nplanes,0);
      for(size_t ipart=0; ipart<nvis; ++ipart)
        {
        int plane0 = max(0,int(1+(abs(srv.getCoord(ipart).w)-(0.5*supp*dw)-wmin)/dw));
        ++cnt[plane0];
        }

      // fill minplane
      for (size_t j=0; j<nplanes; ++j)
        minplane[j].resize(cnt[j]);
      vector<size_t> ofs(nplanes, 0);
      for (size_t ipart=0; ipart<nvis; ++ipart)
        {
        int plane0 = max(0,int(1+(abs(srv.getCoord(ipart).w)-(0.5*supp*dw)-wmin)/dw));
        minplane[plane0][ofs[plane0]++]=idx_t(ipart);
        }
#endif
      }

    typename Serv::Tsub getSubserv() const
      {
Martin Reinecke's avatar
stage 2  
Martin Reinecke committed
952
      auto subidx2 = mav<idx_t, 1>(subidx.data(), {subidx.size()});
Martin Reinecke's avatar
Martin Reinecke committed
953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969
      return srv.getSubserv(subidx2);
      }
    double W() const { return wmin+curplane*dw; }
    size_t Nvis() const { return subidx.size(); }
    double DW() const { return dw; }
    bool advance()
      {
      if (++curplane>=int(nplanes)) return false;
      update_idx(subidx, minplane[curplane], curplane>=int(supp) ? minplane[curplane-supp] : vector<idx_t>());
      if (verbosity>1)
        cout << "Working on plane " << curplane << " containing " << subidx.size()
             << " visibilities" << endl;
      return true;
      }
  };

template<typename T, typename Serv> void x2dirty(
Martin Reinecke's avatar
Martin Reinecke committed
970
  const GridderConfig<T> &gconf, Serv &srv, mav<T,2> &dirty,
Martin Reinecke's avatar
Martin Reinecke committed
971 972 973 974 975
  bool do_wstacking, size_t verbosity)
  {
  if (do_wstacking)
    {
    if (verbosity>0) cout << "Gridding using improved w-stacking" << endl;
Martin Reinecke's avatar
Martin Reinecke committed
976
    WgridHelper<T, Serv> hlp(gconf, srv, verbosity);
Martin Reinecke's avatar
Martin Reinecke committed
977 978
    double dw = hlp.DW();
    dirty.fill(0);
979
    mav<complex<T>,2> grid({gconf.Nu(),gconf.Nv()});
Martin Reinecke's avatar
Martin Reinecke committed
980 981 982 983
    while(hlp.advance())  // iterate over w planes
      {
      if (hlp.Nvis()==0) continue;
      grid.fill(0);
Martin Reinecke's avatar
stage 2  
Martin Reinecke committed
984 985
      auto serv = hlp.getSubserv();
      x2grid_c(gconf, serv, grid, hlp.W(), dw);
Martin Reinecke's avatar
Martin Reinecke committed
986 987 988
      gconf.grid2dirty_c_overwrite_wscreen_add(grid, dirty, T(hlp.W()));
      }
    // correct for w gridding etc.
Martin Reinecke's avatar
Martin Reinecke committed
989
    apply_global_corrections(gconf, dirty, dw, true);
Martin Reinecke's avatar
Martin Reinecke committed
990 991 992 993 994 995 996 997
    }
  else
    {
    if (verbosity>0)
      cout << "Gridding without w-stacking: " << srv.Nvis()
           << " visibilities" << endl;
    if (verbosity>0) cout << "Using " << gconf.Nthreads() << " threads" << endl;

998 999
    mav<complex<T>,2> grid({gconf.Nu(), gconf.Nv()});
    grid.fill(0.);
Martin Reinecke's avatar
Martin Reinecke committed
1000
    x2grid_c(gconf, srv, grid);
1001
    mav<T,2> rgrid(grid.shape());
Martin Reinecke's avatar
Martin Reinecke committed
1002 1003
    complex2hartley(grid, rgrid, gconf.Nthreads());
    gconf.grid2dirty(rgrid, dirty);
Martin Reinecke's avatar
Martin Reinecke committed
1004 1005 1006 1007
    }
  }

template<typename T, typename Serv> void dirty2x(
Martin Reinecke's avatar
Martin Reinecke committed
1008
  const GridderConfig<T> &gconf,  const mav<T,2> &dirty,
Martin Reinecke's avatar
stage 2  
Martin Reinecke committed
1009
  Serv &srv, bool do_wstacking, size_t verbosity)
Martin Reinecke's avatar
Martin Reinecke committed
1010 1011 1012 1013 1014
  {
  if (do_wstacking)
    {
    size_t nx_dirty=gconf.Nxdirty(), ny_dirty=gconf.Nydirty();
    if (verbosity>0) cout << "Degridding using improved w-stacking" << endl;
Martin Reinecke's avatar
Martin Reinecke committed
1015
    WgridHelper<T, Serv> hlp(gconf, srv, verbosity);
Martin Reinecke's avatar
Martin Reinecke committed
1016
    double dw = hlp.DW();
1017
    mav<T,2> tdirty({nx_dirty,ny_dirty});
Martin Reinecke's avatar
Martin Reinecke committed
1018 1019
    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
1020
        tdirty.v(i,j) = dirty(i,j);
Martin Reinecke's avatar
Martin Reinecke committed
1021
    // correct for w gridding etc.
Martin Reinecke's avatar
Martin Reinecke committed
1022
    apply_global_corrections(gconf, tdirty, dw, true);
1023
    mav<complex<T>,2> grid({gconf.Nu(),gconf.Nv()});
Martin Reinecke's avatar
Martin Reinecke committed
1024 1025 1026
    while(hlp.advance())  // iterate over w planes
      {
      if (hlp.Nvis()==0) continue;
Martin Reinecke's avatar
Martin Reinecke committed
1027
      gconf.dirty2grid_c_wscreen(tdirty, grid, T(hlp.W()));
Martin Reinecke's avatar
stage 2  
Martin Reinecke committed
1028 1029
      auto serv = hlp.getSubserv();
      grid2x_c(gconf, grid, serv, hlp.W(), dw);
Martin Reinecke's avatar
Martin Reinecke committed
1030 1031 1032 1033 1034 1035 1036 1037 1038
      }
    }
  else
    {
    if (verbosity>0)
      cout << "Degridding without w-stacking: " << srv.Nvis()
           << " visibilities" << endl;
    if (verbosity>0) cout << "Using " << gconf.Nthreads() << " threads" << endl;

1039
    mav<T,2> grid({gconf.Nu(), gconf.Nv()});
Martin Reinecke's avatar
Martin Reinecke committed
1040
    gconf.dirty2grid(dirty, grid);
1041
    mav<complex<T>,2> grid2(grid.shape());
Martin Reinecke's avatar
Martin Reinecke committed
1042 1043
    hartley2complex(grid, grid2, gconf.Nthreads());
    grid2x_c(gconf, grid2, srv);
Martin Reinecke's avatar
Martin Reinecke committed
1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057
    }
  }

void calc_share(size_t nshares, size_t myshare, size_t nwork, size_t &lo,
  size_t &hi)
  {
  size_t nbase = nwork/nshares;
  size_t additional = nwork%nshares;
  lo = myshare*nbase + ((myshare<additional) ? myshare : additional);
  hi = lo+nbase+(myshare<additional);
  }


template<typename T> vector<idx_t> getWgtIndices(const Baselines &baselines,
Martin Reinecke's avatar
Martin Reinecke committed
1058
  const GridderConfig<T> &gconf, const mav<T,2> &wgt,
Martin Reinecke's avatar
stage 2  
Martin Reinecke committed
1059
  const mav<complex<T>,2> &ms)
Martin Reinecke's avatar
Martin Reinecke committed
1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075
  {
  size_t nrow=baselines.Nrows(),
         nchan=baselines.Nchannels(),
         nsafe=gconf.Nsafe();
  bool have_wgt=wgt.size()!=0;
  if (have_wgt) checkShape(wgt.shape(),{nrow,nchan});
  bool have_ms=ms.size()!=0;
  if (have_ms) checkShape(ms.shape(), {nrow,nchan});
  constexpr int side=1<<logsquare;
  size_t nbu = (gconf.Nu()+1+side-1) >> logsquare,
         nbv = (gconf.Nv()+1+side-1) >> logsquare;
  vector<idx_t> acc(nbu*nbv+1,0);
  vector<idx_t> tmp(nrow*nchan);

  for (idx_t irow=0, idx=0; irow<nrow; ++irow)
    for (idx_t ichan=0; ichan<nchan; ++ichan, ++idx)
Martin Reinecke's avatar
stage 2  
Martin Reinecke committed
1076
      if (((!have_ms ) || (norm(ms(irow,ichan))!=0)) &&
Martin Reinecke's avatar
Martin Reinecke committed
1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102
          ((!have_wgt) || (wgt(irow,ichan)!=0)))
        {
        auto uvw = baselines.effectiveCoord(RowChan{irow,idx_t(ichan)});
        if (uvw.w<0) uvw.Flip();
        double u, v;
        int iu0, iv0;
        gconf.getpix(uvw.u, uvw.v, u, v, iu0, iv0);
        iu0 = (iu0+nsafe)>>logsquare;
        iv0 = (iv0+nsafe)>>logsquare;
        ++acc[nbv*iu0 + iv0 + 1];
        tmp[idx] = nbv*iu0 + iv0;
        }
      else
        tmp[idx] = ~idx_t(0);

  for (size_t i=1; i<acc.size(); ++i)
    acc[i] += acc[i-1];

  vector<idx_t> res(acc.back());
  for (size_t irow=0, idx=0; irow<nrow; ++irow)
    for (size_t ichan=0; ichan<nchan; ++ichan, ++idx)
      if (tmp[idx]!=(~idx_t(0)))
        res[acc[tmp[idx]]++] = baselines.getIdx(irow, ichan);
  return res;
  }

1103
template<typename T> void ms2dirty(const mav<double,2> &uvw,
Martin Reinecke's avatar
stage 2  
Martin Reinecke committed
1104 1105 1106
  const mav<double,1> &freq, const mav<complex<T>,2> &ms,
  const mav<T,2> &wgt, double pixsize_x, double pixsize_y, size_t nu, size_t nv, double epsilon,
  bool do_wstacking, size_t nthreads, mav<T,2> &dirty, size_t verbosity,
Martin Reinecke's avatar
Martin Reinecke committed
1107 1108 1109
  bool negate_v=false)
  {
  Baselines baselines(uvw, freq, negate_v);
1110 1111
  // adjust for increased error when gridding in 2 or 3 dimensions
  epsilon /= do_wstacking ? 3 : 2;
Martin Reinecke's avatar
cleanup  
Martin Reinecke committed
1112
  GridderConfig<T> gconf(dirty.shape(0), dirty.shape(1), nu, nv, epsilon, pixsize_x, pixsize_y, baselines, nthreads);
Martin Reinecke's avatar
Martin Reinecke committed
1113
  auto idx = getWgtIndices(baselines, gconf, wgt, ms);
Martin Reinecke's avatar
stage 2  
Martin Reinecke committed
1114 1115 1116
  auto idx2 = mav<idx_t,1>(idx.data(),{idx.size()});
  auto serv = makeMsServ(baselines,idx2,ms,wgt);
  x2dirty(gconf, serv, dirty, do_wstacking, verbosity);
Martin Reinecke's avatar
Martin Reinecke committed
1117 1118
  }

1119
template<typename T> void dirty2ms(const mav<double,2> &uvw,
Martin Reinecke's avatar
stage 2  
Martin Reinecke committed
1120 1121 1122
  const mav<double,1> &freq, const mav<T,2> &dirty,
  const mav<T,2> &wgt, double pixsize_x, double pixsize_y, size_t nu, size_t nv,double epsilon,
  bool do_wstacking, size_t nthreads, mav<complex<T>,2> &ms,
Martin Reinecke's avatar
Martin Reinecke committed
1123 1124 1125
  size_t verbosity, bool negate_v=false)
  {
  Baselines baselines(uvw, freq, negate_v);
1126 1127
  // adjust for increased error when gridding in 2 or 3 dimensions
  epsilon /= do_wstacking ? 3 : 2;
Martin Reinecke's avatar
cleanup  
Martin Reinecke committed
1128
  GridderConfig<T> gconf(dirty.shape(0), dirty.shape(1), nu, nv, epsilon, pixsize_x, pixsize_y, baselines, nthreads);
Martin Reinecke's avatar
stage 2  
Martin Reinecke committed
1129
  mav<complex<T>,2> null_ms(nullptr, {0,0}, true);
Martin Reinecke's avatar
Martin Reinecke committed
1130
  auto idx = getWgtIndices(baselines, gconf, wgt, null_ms);
Martin Reinecke's avatar
stage 2  
Martin Reinecke committed
1131
  auto idx2 = mav<idx_t,1>(idx.data(),{idx.size()});
Martin Reinecke's avatar
Martin Reinecke committed
1132
  ms.fill(0);
Martin Reinecke's avatar
stage 2  
Martin Reinecke committed
1133 1134
  auto serv = makeMsServ(baselines,idx2,ms,wgt);
  dirty2x(gconf, dirty, serv, do_wstacking, verbosity);