cleanup

demo.py

@@ -44,7 +44,7 @@ freq = f0 + np.arange(nchan)*(f0/nchan)  # just use silly values for this exampl
 
 # Invent mock UVW data. For every row, there is one UVW triple
 # NOTE: I don't know how to set the w values properly, so I use zeros.
-uvmax = pixsize*np.max(freq)/sp
+#uvmax = pixsize*np.max(freq)/sp
 uvw = (np.random.rand(nrow,3)-0.5) / (pixsize*f0/speedoflight)
 uvw[:,2] = 0.
 

nifty_gridder.cc

@@ -626,9 +626,9 @@ template<typename T> class Helper
       }
   };
 
-template<typename T> pyarr_c<complex<T>> vis2grid_c(const Baselines<T> &baselines,
-  const GridderConfig<T> &gconf, const pyarr_c<uint32_t> &idx_,
-  const pyarr_c<complex<T>> &vis_)
+template<typename T> pyarr_c<complex<T>> vis2grid_c(
+  const Baselines<T> &baselines, const GridderConfig<T> &gconf,
+  const pyarr_c<uint32_t> &idx_, const pyarr_c<complex<T>> &vis_)
   {
   checkArray(vis_, "vis", {0});
   size_t nvis = size_t(vis_.shape(0));
@@ -678,9 +678,9 @@ template<typename T> pyarr_c<T> vis2grid(const Baselines<T> &baselines,
   const pyarr_c<complex<T>> &vis_)
   { return complex2hartley(vis2grid_c(baselines, gconf, idx_, vis_)); }
 
-template<typename T> pyarr_c<complex<T>> ms2grid_c(const Baselines<T> &baselines,
-  const GridderConfig<T> &gconf, const pyarr_c<uint32_t> &idx_,
-  const pyarr_c<complex<T>> &ms_)
+template<typename T> pyarr_c<complex<T>> ms2grid_c(
+  const Baselines<T> &baselines, const GridderConfig<T> &gconf,
+  const pyarr_c<uint32_t> &idx_, const pyarr_c<complex<T>> &ms_)
   {
   auto nrows = baselines.Nrows();
   auto nchan = baselines.Nchannels();
@@ -848,6 +848,9 @@ template<typename T> pyarr_c<uint32_t> getIndices(const Baselines<T> &baselines,
          nsafe=gconf.Nsafe();
   if (chbegin<0) chbegin=0;
   if (chend<0) chend=nchan;
+  myassert(chend>chbegin, "empty channel range selected");
+  myassert(chend<=int(nchan), "chend too large");
+  myassert(wmax>wmin, "empty w range selected");
   checkArray(flags_, "flags", {nrow, nchan});
   auto flags = flags_.data();
   constexpr int side=1<<logsquare;
@@ -1064,25 +1067,37 @@ PYBIND11_MODULE(nifty_gridder, m)
       "coord"_a, "freq"_a)
     .def ("Nrows",&Baselines<double>::Nrows)
     .def ("Nchannels",&Baselines<double>::Nchannels)
-    .def ("ms2vis",&Baselines<double>::ms2vis<complex<double>>, BL_ms2vis_DS, "ms"_a, "idx"_a)
-    .def ("vis2ms",&Baselines<double>::vis2ms<complex<double>>, BL_vis2ms_DS, "vis"_a, "idx"_a, "ms_in"_a=py::none());
+    .def ("ms2vis",&Baselines<double>::ms2vis<complex<double>>, BL_ms2vis_DS,
+      "ms"_a, "idx"_a)
+    .def ("vis2ms",&Baselines<double>::vis2ms<complex<double>>, BL_vis2ms_DS,
+      "vis"_a, "idx"_a, "ms_in"_a=py::none());
   py::class_<GridderConfig<double>> (m, "GridderConfig", GridderConfig_DS)
     .def(py::init<size_t, size_t, double, double, double>(),"nxdirty"_a,
       "nydirty"_a, "epsilon"_a, "pixsize_x"_a, "pixsize_y"_a)
     .def("Nu", &GridderConfig<double>::Nu)
     .def("Nv", &GridderConfig<double>::Nv)
-    .def("grid2dirty", &GridderConfig<double>::grid2dirty, grid2dirty_DS, "grid"_a)
+    .def("grid2dirty", &GridderConfig<double>::grid2dirty, grid2dirty_DS,
+      "grid"_a)
     .def("grid2dirty_c", &GridderConfig<double>::grid2dirty_c, "grid"_a)
-    .def("dirty2grid", &GridderConfig<double>::dirty2grid, dirty2grid_DS, "dirty"_a)
+    .def("dirty2grid", &GridderConfig<double>::dirty2grid, dirty2grid_DS,
+      "dirty"_a)
     .def("dirty2grid_c", &GridderConfig<double>::dirty2grid_c, "dirty"_a);
-  m.def("getIndices", getIndices<double>, getIndices_DS, "baselines"_a, "gconf"_a,
-    "flags"_a, "chbegin"_a=-1, "chend"_a=-1, "wmin"_a=-1e30, "wmax"_a=1e30);
-  m.def("vis2grid",&vis2grid<double>, vis2grid_DS, "baselines"_a, "gconf"_a, "idx"_a, "vis"_a);
+  m.def("getIndices", getIndices<double>, getIndices_DS, "baselines"_a,
+    "gconf"_a, "flags"_a, "chbegin"_a=-1, "chend"_a=-1,
+    "wmin"_a=-1e30, "wmax"_a=1e30);
+  m.def("vis2grid",&vis2grid<double>, vis2grid_DS, "baselines"_a, "gconf"_a,
+    "idx"_a, "vis"_a);
   m.def("ms2grid",&ms2grid<double>, "baselines"_a, "gconf"_a, "idx"_a, "ms"_a);
-  m.def("grid2vis",&grid2vis<double>, grid2vis_DS, "baselines"_a, "gconf"_a, "idx"_a, "grid"_a);
-  m.def("grid2ms",&grid2ms<double>, "baselines"_a, "gconf"_a, "idx"_a, "grid"_a, "ms_in"_a=py::none());
-  m.def("vis2grid_c",&vis2grid_c<double>, "baselines"_a, "gconf"_a, "idx"_a, "vis"_a);
-  m.def("ms2grid_c",&ms2grid_c<double>, "baselines"_a, "gconf"_a, "idx"_a, "ms"_a);
-  m.def("grid2vis_c",&grid2vis_c<double>, "baselines"_a, "gconf"_a, "idx"_a, "grid"_a);
-  m.def("grid2ms_c",&grid2ms_c<double>, "baselines"_a, "gconf"_a, "idx"_a, "grid"_a, "ms_in"_a=py::none());
+  m.def("grid2vis",&grid2vis<double>, grid2vis_DS, "baselines"_a, "gconf"_a,
+    "idx"_a, "grid"_a);
+  m.def("grid2ms",&grid2ms<double>, "baselines"_a, "gconf"_a, "idx"_a,
+    "grid"_a, "ms_in"_a=py::none());
+  m.def("vis2grid_c",&vis2grid_c<double>, "baselines"_a, "gconf"_a, "idx"_a,
+    "vis"_a);
+  m.def("ms2grid_c",&ms2grid_c<double>, "baselines"_a, "gconf"_a, "idx"_a,
+    "ms"_a);
+  m.def("grid2vis_c",&grid2vis_c<double>, "baselines"_a, "gconf"_a, "idx"_a,
+    "grid"_a);
+  m.def("grid2ms_c",&grid2ms_c<double>, "baselines"_a, "gconf"_a, "idx"_a,
+    "grid"_a, "ms_in"_a=py::none());
   }