Add output support for csv format, change default to csv

Domenico Tiziani
1 parent adc6fa6c
Showing 2 changed files with 54 additions and 32 deletions
include/GObservations.hpp
src/obs/GObservations_likelihood.cpp
@@ -158,7 +158,7 @@ public:
         double        npred(void) const;
         GMatrixSparse hessian(const GOptimizerPars& pars);
         GMatrixSparse covariance(void) const;
-        void          save(const GFilename& filename) const;
+        void          save(const GFilename& filename, bool csv = true) const;
  
     protected:
         // Protected methods
@@ -38,6 +38,7 @@
 #include "GFitsBinTable.hpp"
 #include "GFitsTableStringCol.hpp"
 #include "GFitsTableDoubleCol.hpp"
+#include "GCsv.hpp"
  
 /* __ OpenMP section _____________________________________________________ */
 #ifdef _OPENMP
@@ -627,7 +628,7 @@ GMatrixSparse GObservations::likelihood::covariance(void) const
  * Saves the likelihood fit results into a FITS file. For the moment the
  * method only writes the covariance matrix.
  ***************************************************************************/
-void GObservations::likelihood::save(const GFilename& filename) const
+void GObservations::likelihood::save(const GFilename& filename, bool csv) const
 {
     // Get covariance matrix
     GMatrixSparse covmat = covariance();
@@ -643,44 +644,65 @@ void GObservations::likelihood::save(const GFilename&amp; filename) const
  
     // Create binary table and columns
     int size = covmat_entries.size();
-    GFitsBinTable       covmat_table;
-    GFitsTableStringCol par("Parameters", 1, 50, size);
-    GFitsTableDoubleCol cov("Covariance", 1, size*size);
-
-    // Fill tables
-    int counter = 0;
-    for (int i = 0; i < size; ++i) {
-        par(0, i) = covmat_entries[i];
-        for (int j = 0; j < size; ++j) {
-            cov(0, counter) = covmat(i,j);
-            ++counter;
+
+    if (csv) {
+        GCsv table(size + 1, size);
+
+        // Fill CSV header
+        for (int i = 0; i < size; ++i) {
+            table.string(0, i, covmat_entries[i]);
+        }
+
+        // Fill CSV table
+        for (int i = 0; i < size; ++i) {
+            for (int j = 0; j < size; j ++) {
+                table.real(i+1, j, covmat(i,j));
+            }
         }
-    }
  
-    // Set dimension for covariance matrix column
-    std::vector<int> dim;
-    dim.push_back(size);
-    dim.push_back(size);
-    cov.dim(dim);
+        // Save CSV table
+        table.save(filename, " ", true);
+    } else {
+
+        GFitsBinTable       covmat_table;
+        GFitsTableStringCol par("Parameters", 1, 50, size);
+        GFitsTableDoubleCol cov("Covariance", 1, size*size);
+
+        // Fill tables
+        int counter = 0;
+        for (int i = 0; i < size; ++i) {
+            par(0, i) = covmat_entries[i];
+            for (int j = 0; j < size; ++j) {
+                cov(0, counter) = covmat(i,j);
+                ++counter;
+            }
+        }
  
-    // Append columns to table
-    covmat_table.append(par);
-    covmat_table.append(cov);
+        // Set dimension for covariance matrix column
+        std::vector<int> dim;
+        dim.push_back(size);
+        dim.push_back(size);
+        cov.dim(dim);
  
-    // Set extension name
-    covmat_table.extname("Covariance Matrix");
+        // Append columns to table
+        covmat_table.append(par);
+        covmat_table.append(cov);
  
-    // Allocate FITS object
-    GFits fits;
+        // Set extension name
+        covmat_table.extname("Covariance Matrix");
  
-    // Append covariance matrix table to FITS object
-    fits.append(covmat_table);
+        // Allocate FITS object
+        GFits fits;
  
-    // Save FITS file to disk
-    fits.saveto(filename, true);
+        // Append covariance matrix table to FITS object
+        fits.append(covmat_table);
  
-    // Close FITS object
-    fits.close();
+        // Save FITS file to disk
+        fits.saveto(filename, true);
+
+        // Close FITS object
+        fits.close();
+    }
  
     // Return
     return;