Merge branch 'configurable-model-data-column' into 'master'

Make model data column configurable

See merge request !160

include/schaapcommon/reordering/reorderedhandle.h

@@ -32,7 +32,8 @@ struct ReorderedHandleData {
   ReorderedHandleData() = default;
 
   ReorderedHandleData(
-      const std::string& ms_path, const string& data_column_name,
+      const std::string& ms_path, const std::string& data_column_name,
+      const std::string& model_column_name,
       const std::string& temporary_directory,
       const std::vector<ChannelRange>& channels, bool initial_model_required,
       bool model_update_required,
@@ -42,6 +43,7 @@ struct ReorderedHandleData {
       std::function<void(ReorderedHandleData& handle)> cleanup_callback)
       : ms_path_(ms_path),
         data_column_name_(data_column_name),
+        model_column_name_(model_column_name),
         temporary_directory_(temporary_directory),
         channels_(channels),
         initial_model_required_(initial_model_required),
@@ -57,6 +59,7 @@ struct ReorderedHandleData {
 
   std::string ms_path_;
   std::string data_column_name_;
+  std::string model_column_name_;
   std::string temporary_directory_;
   std::vector<ChannelRange> channels_;
   bool initial_model_required_;

src/reordering/reorderedhandle.cc

@@ -57,6 +57,7 @@ ReorderedHandleData::~ReorderedHandleData() {
 void ReorderedHandleData::Serialize(aocommon::SerialOStream& stream) const {
   stream.String(ms_path_)
       .String(data_column_name_)
+      .String(model_column_name_)
       .String(temporary_directory_)
       .UInt64(channels_.size());
   for (const ChannelRange& range : channels_) {
@@ -76,6 +77,7 @@ void ReorderedHandleData::Unserialize(aocommon::SerialIStream& stream) {
   is_copy_ = true;
   stream.String(ms_path_)
       .String(data_column_name_)
+      .String(model_column_name_)
       .String(temporary_directory_);
   channels_.resize(stream.UInt64());
   for (ChannelRange& range : channels_) {

src/reordering/test/treordered_filewriter.cc

@@ -69,9 +69,9 @@ const aocommon::MultiBandData kBands;
 const std::string kTemporaryDirectory = "tmp";
 const double kStartTime = 1.0;
 
-const ReorderedHandleData kData("test.ms", "DATA", kTemporaryDirectory,
-                                kChannelRanges, true, false, kPolsOut,
-                                kSelection, kBands, 6, true,
+const ReorderedHandleData kData("test.ms", "DATA", "MODEL_DATA",
+                                kTemporaryDirectory, kChannelRanges, true,
+                                false, kPolsOut, kSelection, kBands, 6, true,
                                 [](ReorderedHandleData) {});
 
 const std::map<size_t, std::set<aocommon::PolarizationEnum>>
@@ -198,8 +198,9 @@ BOOST_FIXTURE_TEST_CASE(reordering_writer_assert_zeros_model_creation,
   {
     boost::filesystem::create_directory(kTemporaryDirectory);
     const ReorderedHandleData handle_no_model_column(
-        "test.ms", "DATA", kTemporaryDirectory, kChannelRanges, false, false,
-        kPolsOut, kSelection, kBands, 6, true, [](ReorderedHandleData) {});
+        "test.ms", "DATA", "MODEL_DATA", kTemporaryDirectory, kChannelRanges,
+        false, false, kPolsOut, kSelection, kBands, 6, true,
+        [](ReorderedHandleData) {});
 
     ReorderedFileWriter reordering_writer(
         handle_no_model_column, kMsPolarizationsPerDataDescId, kStartTime);