From 14b29eb0baad988ed00e65c280b0da6cfe6642af Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Tue, 23 Nov 2021 10:55:17 +0100
Subject: [PATCH] Reset OutputDataReadWriteNicos to state before tidy3
---
Device/InputOutput/OutputDataReadWriteNicos.cpp | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/Device/InputOutput/OutputDataReadWriteNicos.cpp b/Device/InputOutput/OutputDataReadWriteNicos.cpp
index 82d5fe98798..d61a3f2b2fe 100644
--- a/Device/InputOutput/OutputDataReadWriteNicos.cpp
+++ b/Device/InputOutput/OutputDataReadWriteNicos.cpp
@@ -33,12 +33,16 @@ OutputData<double>* OutputDataReadWriteNicos::readOutputData(std::istream& input
if (!inFileSection && BaseUtils::String::startsWith(line, "%File")) {
inFileSection = true;
fileSectionFound = true;
+ continue;
}
+
if (!inFileSection)
continue;
- if (BaseUtils::String::startsWith(line, "%"))
+ if (BaseUtils::String::startsWith(line, "%")) {
+ inFileSection = false;
break;
+ }
if (BaseUtils::String::startsWith(line, "DataSizeX"))
width = readAssignedPositiveIntValue(line);
@@ -70,12 +74,16 @@ OutputData<double>* OutputDataReadWriteNicos::readOutputData(std::istream& input
if (!inCountSection && BaseUtils::String::startsWith(line, "%Counts")) {
inCountSection = true;
countSectionFound = true;
+ continue;
}
+
if (!inCountSection)
continue;
- if (BaseUtils::String::startsWith(line, "%"))
+ if (BaseUtils::String::startsWith(line, "%")) {
+ inCountSection = false;
break;
+ }
// line is a data line
line = BaseUtils::String::trim(line, " ");
--
GitLab