Merge branch '338-cyclotron-regression-tests-fail-broken-after-129' into 'master'

Resolve "Cyclotron Regression tests fail / broken after !129"

See merge request !143

optimizer/Util/SDDSParser.cpp

@@ -49,8 +49,8 @@ SDDS::file SDDS::SDDSParser::run() {
 
     if (!success || contentsIter != contentsEnd)
         {
-            throw SDDSParserException("StatisticalErrors::parseSDDSFile",
-                                    "could not parse SDDS file");
+            throw SDDSParserException("SDDSParser::parseSDDSFile",
+                                      "could not parse SDDS file");
         }
 
     unsigned int param_order = 0;
@@ -90,8 +90,8 @@ std::string SDDS::SDDSParser::readFile() {
         return contents;
     }
 
-    throw SDDSParserException("StatisticalErrors::readSDDSFile",
-                            "could not open file '" + sddsFileName_m + "'");
+    throw SDDSParserException("SDDSParser::readSDDSFile",
+                              "could not open file '" + sddsFileName_m + "'");
 
     return std::string("");
 }

src/Structure/GridLBalWriter.cpp

@@ -28,7 +28,7 @@ void GridLBalWriter::fillHeader(PartBunchBase<double, 3> *beam) {
 
     for (int lev = 0; lev < nLevel; ++lev) {
         std::stringstream tmp1;
-        tmp1 << "level-" << lev;
+        tmp1 << "\"level-" << lev << "\"";
 
         std::stringstream tmp2;
         tmp2 << "Number of boxes at level " << lev;
@@ -38,7 +38,7 @@ void GridLBalWriter::fillHeader(PartBunchBase<double, 3> *beam) {
 
     for (int p = 0; p < Ippl::getNodes(); ++p) {
         std::stringstream tmp1;
-        tmp1 << "processor-" << p;
+        tmp1 << "\"processor-" << p << "\"";
 
         std::stringstream tmp2;
         tmp2 << "Number of grid points per processor " << p;
@@ -94,7 +94,7 @@ void GridLBalWriter::write(PartBunchBase<double, 3> *beam) {
 
     for (int lev = 0; lev < nLevel; ++lev) {
         std::stringstream ss;
-        ss << "level-" << lev;
+        ss << "\"level-" << lev << "\"";
         // we need to cast due to boost::variant
         columns_m.addColumnValue(ss.str(), toString(gridsPerLevel[lev]));
     }
@@ -102,7 +102,7 @@ void GridLBalWriter::write(PartBunchBase<double, 3> *beam) {
     int nProcs = Ippl::getNodes();
     for (int p = 0; p < nProcs; ++p) {
         std::stringstream ss;
-        ss << "processor-" << p;
+        ss << "\"processor-" << p << "\"";
         // we need to cast due to boost::variant
         columns_m.addColumnValue(ss.str(), toString(gridPtsPerCore[p]));
     }

src/Structure/LBalWriter.cpp

@@ -23,7 +23,7 @@ void LBalWriter::fillHeader(PartBunchBase<double, 3> *beam) {
 
     for (int p = 0; p < Ippl::getNodes(); ++p) {
         std::stringstream tmp1;
-        tmp1 << "processor-" << p;
+        tmp1 << "\"processor-" << p << "\"";
 
         std::stringstream tmp2;
         tmp2 << "Number of particles of processor " << p;
@@ -38,7 +38,7 @@ void LBalWriter::fillHeader(PartBunchBase<double, 3> *beam) {
 
         for (int lev = 0; lev < nLevel; ++lev) {
             std::stringstream tmp1;
-            tmp1 << "level-" << lev;
+            tmp1 << "\"level-" << lev << "\"";
 
             std::stringstream tmp2;
             tmp2 << "Number of particles at level " << lev;
@@ -94,7 +94,7 @@ void LBalWriter::write(PartBunchBase<double, 3> *beam) {
     size_t nProcs = Ippl::getNodes();
     for (size_t p = 0; p < nProcs; ++ p) {
         std::stringstream ss;
-        ss << "processor-" << p;
+        ss << "\"processor-" << p << "\"";
         columns_m.addColumnValue(ss.str(), beam->getLoadBalance(p));
     }
 
@@ -103,7 +103,7 @@ void LBalWriter::write(PartBunchBase<double, 3> *beam) {
         int nLevel = (amrbeam->getAmrObject())->maxLevel() + 1;
         for (int lev = 0; lev < nLevel; ++lev) {
             std::stringstream ss;
-            ss << "level-" << lev;
+            ss << "\"level-" << lev << "\"";
             columns_m.addColumnValue(ss.str(), amrbeam->getLevelStatistics(lev));
         }
     }

src/Structure/MemoryWriter.cpp

@@ -23,7 +23,7 @@ void MemoryWriter::fillHeader() {
 
     for (int p = 0; p < Ippl::getNodes(); ++p) {
         std::stringstream tmp1;
-        tmp1 << "processor-" << p;
+        tmp1 << "\"processor-" << p << "\"";
 
         std::stringstream tmp2;
         tmp2 << "Memory per processor " << p;
@@ -88,7 +88,7 @@ void MemoryWriter::write(PartBunchBase<double, 3> *beam)
 
     for (int p = 0; p < nProcs; p++) {
         std::stringstream ss;
-        ss << "processor-" << p;
+        ss << "\"processor-" << p << "\"";
         columns_m.addColumnValue(ss.str(),  memory->getMemoryUsage(p));
     }