diff --git a/Core/Fitting/FitObjective.cpp b/Core/Fitting/FitObjective.cpp index 16b667afdf6316d33e92c177d8d51a0c9ab5bf92..96e911855e74de0ef90aeb2354abcbd7ded01e70 100644 --- a/Core/Fitting/FitObjective.cpp +++ b/Core/Fitting/FitObjective.cpp @@ -68,14 +68,14 @@ FitObjective::~FitObjective() = default; //! Constructs simulation/data pair for later fit. //! @param builder: simulation builder capable of producing simulations //! @param data: experimental data array -//! @param uncertainties: data uncertainties array +//! @param stdv: data uncertainties array //! @param weight: weight of dataset in metric calculations void FitObjective::addSimulationAndData(simulation_builder_t builder, const OutputData<double>& data, - std::unique_ptr<OutputData<double>> uncertainties, + std::unique_ptr<OutputData<double>>&& stdv, double weight) { - m_fit_objects.emplace_back(builder, data, std::move(uncertainties), weight); + m_fit_objects.emplace_back(builder, data, std::move(stdv), weight); } double FitObjective::evaluate(const mumufit::Parameters& params) diff --git a/Core/Fitting/FitObjective.h b/Core/Fitting/FitObjective.h index 143edb0b0248443206cc7ec74b2485cea3adf91f..c53e70ffd4b87916015885744b55f0b4817bbcc5 100644 --- a/Core/Fitting/FitObjective.h +++ b/Core/Fitting/FitObjective.h @@ -39,7 +39,7 @@ public: #ifndef SWIG void addSimulationAndData(simulation_builder_t builder, const OutputData<double>& data, - std::unique_ptr<OutputData<double>> uncertainties, + std::unique_ptr<OutputData<double>>&& stdv, double weight = 1.0); #endif //! Constructs simulation/data pair for later fit. diff --git a/auto/Wrap/doxygenCore.i b/auto/Wrap/doxygenCore.i index bb50ed75718a80a7c1e65b21561629841c6c0c32..40beb55fa81c3a3b1a5e887561381b11fa3dd092 100644 --- a/auto/Wrap/doxygenCore.i +++ b/auto/Wrap/doxygenCore.i @@ -469,7 +469,7 @@ C++ includes: FitObjective.h %feature("docstring") FitObjective::~FitObjective "FitObjective::~FitObjective() "; -%feature("docstring") FitObjective::addSimulationAndData "void FitObjective::addSimulationAndData(simulation_builder_t builder, const OutputData< double > &data, std::unique_ptr< OutputData< double >> uncertainties, double weight=1.0) +%feature("docstring") FitObjective::addSimulationAndData "void FitObjective::addSimulationAndData(simulation_builder_t builder, const OutputData< double > &data, std::unique_ptr< OutputData< double >> &&stdv, double weight=1.0) Constructs simulation/data pair for later fit.