From f3d7b9c7ffd7d0160f69ae01be8b2c6ee1c27832 Mon Sep 17 00:00:00 2001
From: Andreas Suter <andreas.suter@psi.ch>
Date: Fri, 14 Feb 2025 09:06:55 +0100
Subject: [PATCH] header of exported data adopted for easier read in with
 pandas.

---
 src/classes/PMusrCanvas.cpp                   | 39 +++++++------------
 src/musredit_qt5/mupp/plotter/PMuppCanvas.cpp |  7 ++--
 src/musredit_qt6/mupp/plotter/PMuppCanvas.cpp |  7 ++--
 3 files changed, 20 insertions(+), 33 deletions(-)

diff --git a/src/classes/PMusrCanvas.cpp b/src/classes/PMusrCanvas.cpp
index 2f984a3a..c9ac362f 100644
--- a/src/classes/PMusrCanvas.cpp
+++ b/src/classes/PMusrCanvas.cpp
@@ -1931,9 +1931,8 @@ void PMusrCanvas::ExportData(const Char_t *fileName)
       case PV_DATA:
         if (fAveragedView) {
           fout << "% from averaged view" << std::endl;
-          fout << "% x, diff, errDiff" << std::endl;
+          fout << "x, diff, errDiff" << std::endl;
         } else {
-          fout << "% ";
           for (UInt_t i=0; i<dumpVector.size()-1; i++) {
             fout << "x" << i << " , diff" << i << ", errDiff" << i << ", ";
           }
@@ -1943,9 +1942,8 @@ void PMusrCanvas::ExportData(const Char_t *fileName)
       case PV_FOURIER_REAL:
         if (fAveragedView) {
           fout << "% from averaged view" << std::endl;
-          fout << "% x, F_diffRe" << std::endl;
+          fout << "x, F_diffRe" << std::endl;
         } else {
-          fout << "% ";
           for (UInt_t i=0; i<dumpVector.size()-1; i++) {
             fout << "freq" << i << ", F_diffRe" << i << ", ";
           }
@@ -1955,9 +1953,8 @@ void PMusrCanvas::ExportData(const Char_t *fileName)
       case PV_FOURIER_IMAG:
         if (fAveragedView) {
           fout << "% from averaged view" << std::endl;
-          fout << "% x, F_diffIm" << std::endl;
+          fout << "x, F_diffIm" << std::endl;
         } else {
-          fout << "% ";
           for (UInt_t i=0; i<dumpVector.size()-1; i++) {
             fout << "freq" << i << ", F_diffIm" << i << ", ";
           }
@@ -1967,9 +1964,8 @@ void PMusrCanvas::ExportData(const Char_t *fileName)
       case PV_FOURIER_REAL_AND_IMAG:
         if (fAveragedView) {
           fout << "% from averaged view" << std::endl;
-          fout << "% x, F_diffRe, F_diffIm" << std::endl;
+          fout << "x, F_diffRe, F_diffIm" << std::endl;
         } else {
-          fout << "% ";
           for (UInt_t i=0; i<dumpVector.size()/2; i++) {
             fout << "freq" << i << ", F_diffRe" << i << ", ";
           }
@@ -1982,9 +1978,8 @@ void PMusrCanvas::ExportData(const Char_t *fileName)
       case PV_FOURIER_PWR:
         if (fAveragedView) {
           fout << "% from averaged view" << std::endl;
-          fout << "% x, F_diffPwr" << std::endl;
+          fout << "x, F_diffPwr" << std::endl;
         } else {
-          fout << "% ";
           for (UInt_t i=0; i<dumpVector.size()-1; i++) {
             fout << "freq" << i << ", F_diffPwr" << i << ", ";
           }
@@ -1994,9 +1989,8 @@ void PMusrCanvas::ExportData(const Char_t *fileName)
       case PV_FOURIER_PHASE:
         if (fAveragedView) {
           fout << "% from averaged view" << std::endl;
-          fout << "% x, F_diffPhase" << std::endl;
+          fout << "x, F_diffPhase" << std::endl;
         } else {
-          fout << "% ";
           for (UInt_t i=0; i<dumpVector.size()-1; i++) {
             fout << "freq" << i << ", F_diffPhase" << i << ", ";
           }
@@ -2045,24 +2039,22 @@ void PMusrCanvas::ExportData(const Char_t *fileName)
           fout << "% from averaged view" << std::endl;
           fout << "% xData, data, errData, xTheory, theory" << std::endl;
         } else {
-          fout << "% ";
           for (UInt_t i=0; i<dumpVector.size(); i++) {
             if (i % 2 == 0)
-              fout << "xData" << i/2 << " , data" << i/2 << ", errData" << i/2 << ", ";
+              fout << "xData" << i/2 << ", data" << i/2 << ", errData" << i/2 << ", ";
             else
               if (i == dumpVector.size()-1)
-                fout << "xTheory" << (i-1)/2 << " , theory" << (i-1)/2 << std::endl;
+                fout << "xTheory" << (i-1)/2 << ", theory" << (i-1)/2 << std::endl;
               else
-                fout << "xTheory" << (i-1)/2 << " , theory" << (i-1)/2 << ", ";
+                fout << "xTheory" << (i-1)/2 << ", theory" << (i-1)/2 << ", ";
           }
         }
         break;
       case PV_FOURIER_REAL:
         if (fAveragedView) {
           fout << "% from averaged view" << std::endl;
-          fout << "% freq, F_Re, freqTheo, F_theoRe" << std::endl;
+          fout << "freq, F_Re, freqTheo, F_theoRe" << std::endl;
         } else {
-          fout << "% ";
           for (UInt_t i=0; i<dumpVector.size(); i++) {
             if (i % 2 == 0)
               fout << "freq" << i/2 << ", F_Re" << i/2 << ", ";
@@ -2077,7 +2069,7 @@ void PMusrCanvas::ExportData(const Char_t *fileName)
       case PV_FOURIER_IMAG:
         if (fAveragedView) {
           fout << "% from averaged view" << std::endl;
-          fout << "% freq, F_Im, freqTheo, F_theoIm" << std::endl;
+          fout << "freq, F_Im, freqTheo, F_theoIm" << std::endl;
         } else {
           fout << "% ";
           for (UInt_t i=0; i<dumpVector.size(); i++) {
@@ -2094,9 +2086,8 @@ void PMusrCanvas::ExportData(const Char_t *fileName)
       case PV_FOURIER_REAL_AND_IMAG:
         if (fAveragedView) {
           fout << "% from averaged view" << std::endl;
-          fout << "% freq, F_Re, freqTheo, F_theoRe, freq, F_Im, freqTheo, F_theoIm" << std::endl;
+          fout << "freq, F_Re, freqTheo, F_theoRe, freq, F_Im, freqTheo, F_theoIm" << std::endl;
         } else {
-          fout << "% ";
           for (UInt_t i=0; i<dumpVector.size(); i++) {
             if (i % 4 == 0)
               fout << "freq" << i/4 << ", F_Re" << i/4 << ", ";
@@ -2115,9 +2106,8 @@ void PMusrCanvas::ExportData(const Char_t *fileName)
       case PV_FOURIER_PWR:
         if (fAveragedView) {
           fout << "% from averaged view" << std::endl;
-          fout << "% freq, F_Pwr, freqTheo, F_theoPwr" << std::endl;
+          fout << "freq, F_Pwr, freqTheo, F_theoPwr" << std::endl;
         } else {
-          fout << "% ";
           for (UInt_t i=0; i<dumpVector.size(); i++) {
             if (i % 2 == 0)
               fout << "freq" << i/2 << ", F_Pwr" << i/2 << ", ";
@@ -2132,9 +2122,8 @@ void PMusrCanvas::ExportData(const Char_t *fileName)
       case PV_FOURIER_PHASE:
         if (fAveragedView) {
           fout << "% from averaged view" << std::endl;
-          fout << "% freq, F_Phase, freqTheo, F_theoPhase" << std::endl;
+          fout << "freq, F_Phase, freqTheo, F_theoPhase" << std::endl;
         } else {
-          fout << "% ";
           for (UInt_t i=0; i<dumpVector.size(); i++) {
             if (i % 2 == 0)
               fout << "freq" << i/2 << ", F_Phase" << i/2 << ", ";
diff --git a/src/musredit_qt5/mupp/plotter/PMuppCanvas.cpp b/src/musredit_qt5/mupp/plotter/PMuppCanvas.cpp
index ee3ab450..7069fbe6 100644
--- a/src/musredit_qt5/mupp/plotter/PMuppCanvas.cpp
+++ b/src/musredit_qt5/mupp/plotter/PMuppCanvas.cpp
@@ -633,14 +633,13 @@ void PMuppCanvas::ExportData()
   if (fi.fFilename && strlen(fi.fFilename)) {
     std::ofstream fout(fi.fFilename, std::ios_base::out);
     // write header
-    fout << "% ";
     for (int i=0; i<fPlotData.size(); i++) {
-      fout << fPlotData[i].xLabel.Data() << ", ";
+      fout << fPlotData[i].xLabel.Strip(TString::kLeading).Data().Data() << ", ";
       for (int j=0; j<fPlotData[i].yLabel.size(); j++) {
         if ((i == fPlotData.size()-1) && (j == fPlotData[i].yLabel.size()-1))
-          fout << fPlotData[i].yLabel[j].Data() << ", " << fPlotData[i].yLabel[j].Data() << "ErrPos, " << fPlotData[i].yLabel[j].Data() << "ErrNeg";
+          fout << fPlotData[i].yLabel[j].Strip(TString::kLeading).Data().Data() << ", " << fPlotData[i].yLabel[j].Strip(TString::kLeading).Data().Data() << "ErrPos, " << fPlotData[i].yLabel[j].Strip(TString::kLeading).Data().Data() << "ErrNeg";
         else
-          fout << fPlotData[i].yLabel[j].Data() << ", " << fPlotData[i].yLabel[j].Data() << "ErrPos, " << fPlotData[i].yLabel[j].Data() << "ErrNeg, ";
+          fout << fPlotData[i].yLabel[j].Strip(TString::kLeading).Data().Data() << ", " << fPlotData[i].yLabel[j].Strip(TString::kLeading).Data().Data() << "ErrPos, " << fPlotData[i].yLabel[j].Strip(TString::kLeading).Data().Data() << "ErrNeg, ";
       }
     }
     fout << std::endl;
diff --git a/src/musredit_qt6/mupp/plotter/PMuppCanvas.cpp b/src/musredit_qt6/mupp/plotter/PMuppCanvas.cpp
index ee3ab450..3fa1f91f 100644
--- a/src/musredit_qt6/mupp/plotter/PMuppCanvas.cpp
+++ b/src/musredit_qt6/mupp/plotter/PMuppCanvas.cpp
@@ -633,14 +633,13 @@ void PMuppCanvas::ExportData()
   if (fi.fFilename && strlen(fi.fFilename)) {
     std::ofstream fout(fi.fFilename, std::ios_base::out);
     // write header
-    fout << "% ";
     for (int i=0; i<fPlotData.size(); i++) {
-      fout << fPlotData[i].xLabel.Data() << ", ";
+      fout << fPlotData[i].xLabel.Strip(TString::kLeading).Data() << ", ";
       for (int j=0; j<fPlotData[i].yLabel.size(); j++) {
         if ((i == fPlotData.size()-1) && (j == fPlotData[i].yLabel.size()-1))
-          fout << fPlotData[i].yLabel[j].Data() << ", " << fPlotData[i].yLabel[j].Data() << "ErrPos, " << fPlotData[i].yLabel[j].Data() << "ErrNeg";
+          fout << fPlotData[i].yLabel[j].Strip(TString::kLeading).Data() << ", " << fPlotData[i].yLabel[j].Strip(TString::kLeading).Data() << "ErrPos, " << fPlotData[i].yLabel[j].Strip(TString::kLeading).Data() << "ErrNeg";
         else
-          fout << fPlotData[i].yLabel[j].Data() << ", " << fPlotData[i].yLabel[j].Data() << "ErrPos, " << fPlotData[i].yLabel[j].Data() << "ErrNeg, ";
+          fout << fPlotData[i].yLabel[j].Strip(TString::kLeading).Data() << ", " << fPlotData[i].yLabel[j].Strip(TString::kLeading).Data() << "ErrPos, " << fPlotData[i].yLabel[j].Strip(TString::kLeading).Data() << "ErrNeg, ";
       }
     }
     fout << std::endl;