From 39cf9854db4dc8ba5ae275bce621cda0de4bd06b Mon Sep 17 00:00:00 2001
From: Andreas Suter <andreas.suter@psi.ch>
Date: Wed, 21 Dec 2022 15:07:52 +0100
Subject: [PATCH] improved dat file read routine for mupp for the case columns
 are added after RUN.

---
 src/musredit_qt5/mupp/Pmupp.cpp | 29 ++++++++++++-----------------
 src/musredit_qt6/mupp/Pmupp.cpp | 29 ++++++++++++-----------------
 2 files changed, 24 insertions(+), 34 deletions(-)

diff --git a/src/musredit_qt5/mupp/Pmupp.cpp b/src/musredit_qt5/mupp/Pmupp.cpp
index ef4aa519..a2699604 100644
--- a/src/musredit_qt5/mupp/Pmupp.cpp
+++ b/src/musredit_qt5/mupp/Pmupp.cpp
@@ -586,7 +586,6 @@ PmuppCollection PParamDataHandler::ReadColumnParamFile(const QString fln, bool &
   QStringList token;
   bool done = false, ok;
   double dval = 0;
-  int ival;
   PmuppParam param;
   run.SetName(fln);
 
@@ -641,10 +640,7 @@ PmuppCollection PParamDataHandler::ReadColumnParamFile(const QString fln, bool &
       return collection;
     }
     for (int i=0; i<token.size(); i++) {
-      if (headerCode[i] == PMUPP_RUN)
-        ival = token[i].toInt(&ok);
-      else
-        dval = token[i].toDouble(&ok);
+      dval = token[i].toDouble(&ok);
       if (!ok) {
         errorMsg = QString("unrecognized token ('%1') in line %2 (line number: %3)").arg(token[i].toLatin1().data()).arg(line.toLatin1().data()).arg(lineNo);
         std::cerr << std::endl;
@@ -680,20 +676,19 @@ PmuppCollection PParamDataHandler::ReadColumnParamFile(const QString fln, bool &
         param.ResetParam();
       } else if (headerCode[i] == PMUPP_RUN) {
         param.ResetParam();
-        run.SetNumber(ival);
-        run.SetName(QString("%1").arg(ival));
-        QString collName("");
-        int pos = fln.lastIndexOf("/");
-        if (pos == -1)
-          collName = fln;
-        else
-          collName = fln.right(fln.length()-pos-1);
-        collection.SetName(collName);
-        collection.AddRun(run);
-        run.Clear();
+        run.SetNumber((int)dval);
+        run.SetName(QString("%1").arg((int)dval));
       }
-
     }
+    QString collName("");
+    int pos = fln.lastIndexOf("/");
+    if (pos == -1)
+      collName = fln;
+    else
+      collName = fln.right(fln.length()-pos-1);
+    collection.SetName(collName);
+    collection.AddRun(run);
+    run.Clear();
   }
   file.close();
 
diff --git a/src/musredit_qt6/mupp/Pmupp.cpp b/src/musredit_qt6/mupp/Pmupp.cpp
index 66425af3..67096784 100644
--- a/src/musredit_qt6/mupp/Pmupp.cpp
+++ b/src/musredit_qt6/mupp/Pmupp.cpp
@@ -583,7 +583,6 @@ PmuppCollection PParamDataHandler::ReadColumnParamFile(const QString fln, bool &
   QStringList token;
   bool done = false, ok;
   double dval = 0;
-  int ival;
   PmuppParam param;
   run.SetName(fln);
 
@@ -630,10 +629,7 @@ PmuppCollection PParamDataHandler::ReadColumnParamFile(const QString fln, bool &
       return collection;
     }
     for (int i=0; i<token.size(); i++) {
-      if (headerCode[i] == PMUPP_RUN)
-        ival = token[i].toInt(&ok);
-      else
-        dval = token[i].toDouble(&ok);
+      dval = token[i].toDouble(&ok);
       if (!ok) {
         errorMsg = QString("unrecognized token ('%1') in line %2 (line number: %3)").arg(token[i].toLatin1().data()).arg(line.toLatin1().data()).arg(lineNo);
         std::cerr << std::endl;
@@ -669,20 +665,19 @@ PmuppCollection PParamDataHandler::ReadColumnParamFile(const QString fln, bool &
         param.ResetParam();
       } else if (headerCode[i] == PMUPP_RUN) {
         param.ResetParam();
-        run.SetNumber(ival);
-        run.SetName(QString("%1").arg(ival));
-        QString collName("");
-        int pos = fln.lastIndexOf("/");
-        if (pos == -1)
-          collName = fln;
-        else
-          collName = fln.right(fln.length()-pos-1);
-        collection.SetName(collName);
-        collection.AddRun(run);
-        run.Clear();
+        run.SetNumber((int)dval);
+        run.SetName(QString("%1").arg((int)dval));
       }
-
     }
+    QString collName("");
+    int pos = fln.lastIndexOf("/");
+    if (pos == -1)
+      collName = fln;
+    else
+      collName = fln.right(fln.length()-pos-1);
+    collection.SetName(collName);
+    collection.AddRun(run);
+    run.Clear();
   }
   file.close();