diff --git a/Core/Fitting/SimDataPair.cpp b/Core/Fitting/SimDataPair.cpp index 61ce1760249ac60c687c575ec5d76c67e6539156..865fbc5c01d9c747f7832d5e8c30027a0ff4e8a8 100644 --- a/Core/Fitting/SimDataPair.cpp +++ b/Core/Fitting/SimDataPair.cpp @@ -36,22 +36,22 @@ std::unique_ptr<OutputData<double>> initUserWeights(const OutputData<double>& sh } // namespace -SimDataPair::SimDataPair(simulation_builder_t builder, const OutputData<double>& data, - std::unique_ptr<OutputData<double>>&& uncertainties, double user_weight) +SimDataPair::SimDataPair(simulation_builder_t builder, const OutputData<double>& raw_data, + std::unique_ptr<OutputData<double>>&& raw_stdv, double user_weight) : m_simulation_builder(builder) - , m_raw_data(data.clone()) - , m_raw_uncertainties(std::move(uncertainties)) + , m_raw_data(raw_data.clone()) + , m_raw_uncertainties(std::move(raw_stdv)) { m_raw_user_weights = initUserWeights(*m_raw_data, user_weight); validate(); } -SimDataPair::SimDataPair(simulation_builder_t builder, const OutputData<double>& data, - std::unique_ptr<OutputData<double>>&& uncertainties, +SimDataPair::SimDataPair(simulation_builder_t builder, const OutputData<double>& raw_data, + std::unique_ptr<OutputData<double>>&& raw_stdv, std::unique_ptr<OutputData<double>>&& user_weights) : m_simulation_builder(builder) - , m_raw_data(data.clone()) - , m_raw_uncertainties(std::move(uncertainties)) + , m_raw_data(raw_data.clone()) + , m_raw_uncertainties(std::move(raw_stdv)) , m_raw_user_weights(std::move(user_weights)) { if (!m_raw_user_weights) diff --git a/Core/Fitting/SimDataPair.h b/Core/Fitting/SimDataPair.h index 69f03dc984556ffbb70b9de57b38038094ab20be..59f76fd3c8e8b3cc751b71ca7a6f74752dca9745 100644 --- a/Core/Fitting/SimDataPair.h +++ b/Core/Fitting/SimDataPair.h @@ -29,11 +29,11 @@ template <class T> class OutputData; class SimDataPair { public: - SimDataPair(simulation_builder_t builder, const OutputData<double>& data, - std::unique_ptr<OutputData<double>>&& uncertainties, double user_weight = 1.0); + SimDataPair(simulation_builder_t builder, const OutputData<double>& raw_data, + std::unique_ptr<OutputData<double>>&& raw_stdv, double user_weight = 1.0); - SimDataPair(simulation_builder_t builder, const OutputData<double>& data, - std::unique_ptr<OutputData<double>>&& uncertainties, + SimDataPair(simulation_builder_t builder, const OutputData<double>& raw_data, + std::unique_ptr<OutputData<double>>&& raw_stdv, std::unique_ptr<OutputData<double>>&& user_weights); SimDataPair(SimDataPair&& other); diff --git a/auto/Wrap/doxygenCore.i b/auto/Wrap/doxygenCore.i index c0a18f6d886b8952f3ab1cbf58ec9159efde61f4..bb50ed75718a80a7c1e65b21561629841c6c0c32 100644 --- a/auto/Wrap/doxygenCore.i +++ b/auto/Wrap/doxygenCore.i @@ -1876,10 +1876,10 @@ Holds pair of simulation/experimental data to fit. C++ includes: SimDataPair.h "; -%feature("docstring") SimDataPair::SimDataPair "SimDataPair::SimDataPair(simulation_builder_t builder, const OutputData< double > &data, std::unique_ptr< OutputData< double >> &&uncertainties, double user_weight=1.0) +%feature("docstring") SimDataPair::SimDataPair "SimDataPair::SimDataPair(simulation_builder_t builder, const OutputData< double > &raw_data, std::unique_ptr< OutputData< double >> &&raw_stdv, double user_weight=1.0) "; -%feature("docstring") SimDataPair::SimDataPair "SimDataPair::SimDataPair(simulation_builder_t builder, const OutputData< double > &data, std::unique_ptr< OutputData< double >> &&uncertainties, std::unique_ptr< OutputData< double >> &&user_weights) +%feature("docstring") SimDataPair::SimDataPair "SimDataPair::SimDataPair(simulation_builder_t builder, const OutputData< double > &raw_data, std::unique_ptr< OutputData< double >> &&raw_stdv, std::unique_ptr< OutputData< double >> &&user_weights) "; %feature("docstring") SimDataPair::SimDataPair "SimDataPair::SimDataPair(SimDataPair &&other)