replace addAxis, and simplify

Device/Data/DataUtils.cpp

@@ -71,24 +71,21 @@ DataUtils::Data::createRearrangedDataSet(const Powerfield<double>& data, int n)
     n = (4 + n % 4) % 4;
     if (n == 0)
         return std::unique_ptr<Powerfield<double>>(data.clone());
-    std::unique_ptr<Powerfield<double>> output(new Powerfield<double>());
 
-    // swapping axes if necessary
-    const IAxis& x_axis = data.axis(0);
-    const IAxis& y_axis = data.axis(1);
-    output->addAxis(n == 2 ? x_axis : y_axis);
-    output->addAxis(n == 2 ? y_axis : x_axis);
-
-    // creating index mapping
+    std::unique_ptr<Powerfield<double>> output;
     std::function<void(std::vector<int>&)> index_mapping;
-    if (n == 2) {
-        const int end_bin_x = static_cast<int>(x_axis.size()) - 1;
-        const int end_bin_y = static_cast<int>(y_axis.size()) - 1;
+
+    if (n==2) {
+        output.reset(new Powerfield<double>({data.axis(0).clone(), data.axis(1).clone()}));
+        const int end_bin_x = static_cast<int>(data.axis(0).size()) - 1;
+        const int end_bin_y = static_cast<int>(data.axis(1).size()) - 1;
         index_mapping = [end_bin_x, end_bin_y](std::vector<int>& inds) {
             inds[0] = end_bin_x - inds[0];
             inds[1] = end_bin_y - inds[1];
         };
+
     } else {
+        output.reset(new Powerfield<double>({data.axis(1).clone(), data.axis(0).clone()}));
         const size_t rev_axis_i = n % 3;
         const size_t end_bin = data.axis(rev_axis_i).size() - 1;
         index_mapping = [rev_axis_i, end_bin](std::vector<int>& inds) {
@@ -116,15 +113,16 @@ DataUtils::Data::createClippedDataSet(const Powerfield<double>& origin, double x
         throw std::runtime_error("DataUtils::Data::createClippedData()"
                                  " -> Error! Works only on two-dimensional data");
 
-    std::unique_ptr<Powerfield<double>> result(new Powerfield<double>);
+    std::vector<IAxis*> axes;
     for (size_t i_axis = 0; i_axis < origin.rank(); i_axis++) {
-        std::unique_ptr<IAxis> new_axis{origin.axis(i_axis).clone()};
+        IAxis* new_axis = origin.axis(i_axis).clone();
         if (i_axis == 0)
             new_axis->clip(x1, x2);
         else
             new_axis->clip(y1, y2);
-        result->addAxis(*new_axis);
+        axes.emplace_back(new_axis);
     }
+    std::unique_ptr<Powerfield<double>> result(new Powerfield<double>(axes));
     result->setAllTo(0.0);
 
     Powerfield<double>::const_iterator it_origin = origin.begin();
@@ -216,12 +214,13 @@ DataUtils::Data::create2DArrayfromPowerfield(const Powerfield<double>& data)
 std::unique_ptr<Powerfield<double>>
 DataUtils::Data::createPowerfieldfrom2DArray(const std::vector<std::vector<double>>& array_2d)
 {
-    std::unique_ptr<Powerfield<double>> result(new Powerfield<double>);
     size_t nrows = array_2d.size();
     size_t ncols = array_2d[0].size();
 
-    result->addAxis("x", nrows, 0.0, double(nrows));
-    result->addAxis("y", ncols, 0.0, double(ncols));
+    std::unique_ptr<Powerfield<double>> result(
+        new Powerfield<double>(
+            FixedBinAxis("x", nrows, 0.0, double(nrows)),
+            FixedBinAxis("y", ncols, 0.0, double(ncols))));
     std::vector<unsigned> axes_indices(2);
     for (unsigned row = 0; row < nrows; row++) {
         for (unsigned col = 0; col < ncols; col++) {