more unit tests and patches

Author: 20DM

cpp/purify/h5reader.h

@@ -3,7 +3,6 @@
 #include "purify/config.h"
 #include "purify/types.h"
 #include "purify/logging.h"
-//#include "purify/uvw_utilities.h"
 
 #include "highfive/H5File.hpp"
 

cpp/purify/uvw_utilities.cc

@@ -248,6 +248,9 @@ utilities::vis_params read_visibility_h5(const std::string &vis_name, const bool
     std::vector<t_real> wtemp = vis_file.read<t_real>("w");
     uv_vis.w = Eigen::Map<Vector<t_real>>(wtemp.data(), wtemp.size(), 1);
   }
+  else {
+    uv_vis.w = Vector<t_real>::Zero(utemp.size());
+  }
 
   std::vector<t_real> retemp = vis_file.read<t_real>("re");
   std::vector<t_real> imtemp = vis_file.read<t_real>("im");
@@ -270,11 +273,8 @@ utilities::vis_params read_visibility_h5(const std::string &vis_name, const bool
 
 utilities::vis_params read_visibility(const std::string &vis_name, const bool w_term) {
 
-  if (      has_suffix(vis_name, ".csv") )  return read_visibility_csv(vis_name, w_term);
-  else if ( has_suffix(vis_name,  ".h5") )  return read_visibility_h5(vis_name,  w_term);
-
-  throw std::runtime_error("File type not supported!");
-
+  if ( has_suffix(vis_name,  ".h5") )  return read_visibility_h5(vis_name, w_term);
+  return  read_visibility_csv(vis_name, w_term);
 }
 
 void write_visibility(const utilities::vis_params &uv_vis, const std::string &file_name,

cpp/tests/purify_h5.cc

@@ -15,7 +15,7 @@ using namespace purify::notinstalled;
 
 TEST_CASE("Purify H5", "[HDF5]") {
 
-  H5Handler f(atca_filename("0332-391") + ".h5");
+  H5Handler f(atca_filename("0332-391.h5"));
 
   const std::vector<double> u = f.read("u");
   const std::vector<double> v = f.read("v");

cpp/tests/utils.cc

@@ -110,10 +110,26 @@ TEST_CASE("utilities [read_write_vis]", "[read_write_vis]") {
   CHECK(new_random_uv_data.weights.isApprox(random_uv_data.weights, 1e-8));
 }
 TEST_CASE("read_mutiple_vis") {
-  std::string vis_file = vla_filename("at166B.3C129.c0.vis");
-  SECTION("one file") {
-    const std::vector<std::string> names = {vis_file};
-    const auto uv_data = utilities::read_visibility(vis_file);
+  std::string csv_file = vla_filename("at166B.3C129.c0.vis");
+  std::string h5_file = atca_filename("0332-391.h5");
+  SECTION("one csv file") {
+    const std::vector<std::string> names = {csv_file};
+    const auto uv_data = utilities::read_visibility(csv_file);
+    const auto uv_multi = utilities::read_visibility(names);
+    CAPTURE(names.size());
+    CAPTURE(uv_data.size());
+    CHECK(uv_data.size() * names.size() == uv_multi.size());
+    for (int i = 0; i < names.size(); i++) {
+      CHECK(uv_data.u.isApprox(uv_multi.u.segment(i * uv_data.size(), uv_data.size())));
+      CHECK(uv_data.v.isApprox(uv_multi.v.segment(i * uv_data.size(), uv_data.size())));
+      CHECK(uv_data.w.isApprox(uv_multi.w.segment(i * uv_data.size(), uv_data.size())));
+      CHECK(uv_data.vis.isApprox(uv_multi.vis.segment(i * uv_data.size(), uv_data.size())));
+      CHECK(uv_data.weights.isApprox(uv_multi.weights.segment(i * uv_data.size(), uv_data.size())));
+    }
+  }
+  SECTION("many csv files") {
+    const std::vector<std::string> names = {csv_file, csv_file, csv_file};
+    const auto uv_data = utilities::read_visibility(csv_file);
     const auto uv_multi = utilities::read_visibility(names);
     CAPTURE(names.size());
     CAPTURE(uv_data.size());
@@ -126,12 +142,17 @@ TEST_CASE("read_mutiple_vis") {
       CHECK(uv_data.weights.isApprox(uv_multi.weights.segment(i * uv_data.size(), uv_data.size())));
     }
   }
-  SECTION("many files") {
-    const std::vector<std::string> names = {vis_file, vis_file, vis_file};
-    const auto uv_data = utilities::read_visibility(vis_file);
+  SECTION("one HDF5 file") {
+    const std::vector<std::string> names = {h5_file};
+    const auto uv_data = utilities::read_visibility(h5_file);
     const auto uv_multi = utilities::read_visibility(names);
     CAPTURE(names.size());
     CAPTURE(uv_data.size());
+    CAPTURE(uv_data.u.size());
+    CAPTURE(uv_data.v.size());
+    CAPTURE(uv_data.w.size());
+    CAPTURE(uv_data.vis.size());
+    CAPTURE(uv_data.weights.size());
     CHECK(uv_data.size() * names.size() == uv_multi.size());
     for (int i = 0; i < names.size(); i++) {
       CHECK(uv_data.u.isApprox(uv_multi.u.segment(i * uv_data.size(), uv_data.size())));