   , const BlWMap permutations[BASELINES]                                                     \
   , Double4c grid[GRID_SIZE][GRID_SIZE]                                                      \
   , const complexd * gcf_layers[WPLANES]                                                     \
-  , const double3 uvw[BASELINES][TIMESTEPS]                                                  \
-  , const Double4c vis[BASELINES][TIMESTEPS]                                                 \
+  , const double3 uvw[BASELINES][TIMESTEPS*CHANNELS]                                         \
+  , const Double4c vis[BASELINES][TIMESTEPS*CHANNELS]                                        \
   ) {                                                                                        \
   addBaselinesToGrid<OVER, WPLANES, GRID_SIZE, BASELINES, TIMESTEPS, CHANNELS, ishalf, true> \
     ( scale                                                                                  \

  , const BlWMap permutations[BASELINES]                                                      \
  , Double4c grid[GRID_SIZE][GRID_SIZE]                                                       \
  , const complexd * gcf_layers[WPLANES]                                                      \
  , const double3 uvw[BASELINES][TIMESTEPS]                                                   \
  , const Double4c vis[BASELINES][TIMESTEPS]                                                  \
  ) {                                                                                         \
  addBaselinesToGrid<OVER, WPLANES, GRID_SIZE, BASELINES, TIMESTEPS, CHANNELS, ishalf, false> \
    ( scale                                                                                   \

  , int max_supp                                                           \
  , Double4c grid[GRID_SIZE][GRID_SIZE]                                    \
  , const complexd * gcf_layers[WPLANES]                                   \
  , const double3 uvw[TIMESTEPS*CHANNELS]                                  \
  , const Double4c vis[TIMESTEPS*CHANNELS]                                 \
  ) {                                                                      \
  addBaselineToGrid<OVER, WPLANES, GRID_SIZE, TIMESTEPS, CHANNELS, ishalf> \
    ( scale                                                                \
