diff --git a/include/ufo/plot.hpp b/include/ufo/plot.hpp index 6f29b0c..bb0fb85 100644 --- a/include/ufo/plot.hpp +++ b/include/ufo/plot.hpp @@ -23,13 +23,13 @@ namespace ufo }; std::vector Figures; - struct SourceType : public UnfoldSolver::OutputType + struct UnfoldedDataType : public UnfoldSolver::OutputType { - SourceType(std::string filename); - SourceType() = default; + UnfoldedDataType(std::string filename); + UnfoldedDataType() = default; }; - std::string SourceFilename; - SourceType Source; + std::string UnfoldedDataFilename; + UnfoldedDataType UnfoldedData; InputType(std::string config_file); }; @@ -56,7 +56,7 @@ namespace ufo static std::vector> search_qpoints ( const std::pair& path, - const decltype(InputType::SourceType::QpointData)& available_qpoints, + const decltype(InputType::UnfoldedDataType::QpointData)& available_qpoints, double threshold, bool exclude_endpoint = false ); // 根据搜索到的 q 点, 计算每个点的数值 diff --git a/src/plot.cpp b/src/plot.cpp index 81bd3a9..6b6bf8a 100644 --- a/src/plot.cpp +++ b/src/plot.cpp @@ -2,7 +2,7 @@ namespace ufo { - PlotSolver::InputType::SourceType::SourceType(std::string filename) + PlotSolver::InputType::UnfoldedDataType::UnfoldedDataType(std::string filename) { static_cast(*this) = zpp_read(filename); } @@ -49,8 +49,8 @@ namespace ufo } } } - SourceFilename = input["SourceFilename"].as(); - Source = SourceType(SourceFilename); + UnfoldedDataFilename = input["UnfoldedDataFilename"].as(); + UnfoldedData = UnfoldedDataType(UnfoldedDataFilename); } const PlotSolver::OutputType& PlotSolver::OutputType::write(std::string filename, std::string format) const { @@ -85,7 +85,7 @@ namespace ufo lines.emplace_back(path[i], path[i + 1]); qpoints.push_back(search_qpoints ( - lines.back(), Input_.Source.QpointData, + lines.back(), Input_.UnfoldedData.QpointData, 0.001, i != path.size() - 2 )); } @@ -113,7 +113,7 @@ namespace ufo std::vector> PlotSolver::search_qpoints ( const std::pair& path, - const decltype(InputType::SourceType::QpointData)& available_qpoints, + const decltype(InputType::UnfoldedDataType::QpointData)& available_qpoints, double threshold, bool exclude_endpoint ) {