From 120c48ff261cee9bfc7af5a6ce475dc2dfef8df1 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Wed, 10 May 2023 18:27:07 +0200
Subject: [PATCH] fileTypeMatchesLoaderSelector -> local ns
---
Device/IO/IOFactory.cpp | 39 ++++++++++++++++++++-------------------
Device/IO/IOFactory.h | 3 ---
2 files changed, 20 insertions(+), 22 deletions(-)
diff --git a/Device/IO/IOFactory.cpp b/Device/IO/IOFactory.cpp
index 9892bb80c33..64732caf426 100644
--- a/Device/IO/IOFactory.cpp
+++ b/Device/IO/IOFactory.cpp
@@ -108,14 +108,31 @@ void stream2file(const std::string& file_name, std::stringstream& s)
fout.close();
}
+bool fileTypeMatchesLoaderSelector(const std::string& fileName, IOFactory::LoaderSelector selector)
+{
+ switch (selector) {
+ case IOFactory::bornagain:
+ return DataUtil::Format::isIntFile(fileName);
+ case IOFactory::nicos:
+ return DataUtil::Format::isNicosFile(fileName);
+ case IOFactory::tiff:
+ return DataUtil::Format::isTiffFile(fileName);
+ case IOFactory::automatic:
+ return false;
+ }
+
+ return false;
+}
+
} // namespace
+
Datafield* IOFactory::readDatafield(const std::string& file_name, LoaderSelector selector)
{
const auto readAs = [=](LoaderSelector testForSelector) {
return (selector == testForSelector)
|| (selector == automatic
- && fileTypeMatchesLoaderSelector(file_name, testForSelector));
+ && ::fileTypeMatchesLoaderSelector(file_name, testForSelector));
};
auto s = ::file2stream(file_name);
@@ -140,7 +157,7 @@ Datafield* IOFactory::readDatafield(const std::string& file_name, LoaderSelector
Datafield* IOFactory::readReflectometryData(const std::string& file_name)
{
- auto s = file2stream(file_name);
+ auto s = ::file2stream(file_name);
return IO::readReflectometryTable(s);
}
@@ -158,29 +175,13 @@ void IOFactory::writeDatafield(const Datafield& data, const std::string& file_na
else
IO::writeNumpyTxt(data, s);
- stream2file(file_name, s);
+ ::stream2file(file_name, s);
} catch (const std::exception& ex) {
throw std::runtime_error("Failed writing to " + file_name + ": " + ex.what());
}
}
-bool IOFactory::fileTypeMatchesLoaderSelector(const std::string& fileName, LoaderSelector selector)
-{
- switch (selector) {
- case bornagain:
- return DataUtil::Format::isIntFile(fileName);
- case nicos:
- return DataUtil::Format::isNicosFile(fileName);
- case tiff:
- return DataUtil::Format::isTiffFile(fileName);
- case automatic:
- return false;
- }
-
- return false;
-}
-
bool IOUtil::filesAgree(const std::string& datFileName, const std::string& refFileName, double tol)
{
std::unique_ptr<Datafield> datDat;
diff --git a/Device/IO/IOFactory.h b/Device/IO/IOFactory.h
index d169a62b53d..8fac354423b 100644
--- a/Device/IO/IOFactory.h
+++ b/Device/IO/IOFactory.h
@@ -58,9 +58,6 @@ public:
//! Writes Datafield in file
static void writeDatafield(const Datafield& data, const std::string& file_name);
-
-private:
- static bool fileTypeMatchesLoaderSelector(const std::string& fileName, LoaderSelector selector);
};
namespace IOUtil {
--
GitLab