[Minuit2] Remove unused param in NumericalDerivator::SetInitialGradient

Author: guitargeek

math/minuit2/inc/Minuit2/NumericalDerivator.h

@@ -71,8 +71,7 @@ class NumericalDerivator {
    double Ext2int(const ROOT::Fit::ParameterSettings &parameter, double val) const;
    double DInt2Ext(const ROOT::Fit::ParameterSettings &parameter, double val) const;
 
-   void SetInitialGradient(const ROOT::Math::IBaseFunctionMultiDim *function,
-                           std::span<const ROOT::Fit::ParameterSettings> parameters,
+   void SetInitialGradient(std::span<const ROOT::Fit::ParameterSettings> parameters,
                            std::vector<DerivatorElement> &gradient);
 
    inline bool AlwaysExactlyMimicMinuit2() const { return fAlwaysExactlyMimicMinuit2; }

math/minuit2/src/NumericalDerivator.cxx

@@ -221,8 +221,7 @@ double NumericalDerivator::DInt2Ext(const ROOT::Fit::ParameterSettings &paramete
 // MODIFIED:
 /// This function was not implemented as in Minuit2. Now it copies the behavior
 /// of InitialGradientCalculator. See https://github.com/roofit-dev/root/issues/10
-void NumericalDerivator::SetInitialGradient(const ROOT::Math::IBaseFunctionMultiDim *,
-                                            std::span<const ROOT::Fit::ParameterSettings> parameters,
+void NumericalDerivator::SetInitialGradient(std::span<const ROOT::Fit::ParameterSettings> parameters,
                                             std::vector<DerivatorElement> &gradient)
 {
    // set an initial gradient using some given steps

roofit/roofitcore/inc/RooFit/TestStatistics/LikelihoodGradientWrapper.h

@@ -58,8 +58,8 @@ class LikelihoodGradientWrapper {
    /// Synchronize minimizer settings with calculators in child classes.
    virtual void synchronizeWithMinimizer(const ROOT::Math::MinimizerOptions &options);
    virtual void synchronizeParameterSettings(const std::vector<ROOT::Fit::ParameterSettings> &parameter_settings);
-   virtual void synchronizeParameterSettings(ROOT::Math::IMultiGenFunction *function,
-                                             const std::vector<ROOT::Fit::ParameterSettings> &parameter_settings) = 0;
+   virtual void
+   synchronizeParameterSettingsImpl(const std::vector<ROOT::Fit::ParameterSettings> &parameter_settings) = 0;
    /// Minuit passes in parameter values that may not conform to RooFit internal standards (like applying range
    /// clipping), but that the specific calculator does need. This function can be implemented to receive these
    /// Minuit-internal values.

roofit/roofitcore/src/TestStatistics/LikelihoodGradientJob.cxx

@@ -37,16 +37,10 @@ LikelihoodGradientJob::LikelihoodGradientJob(std::shared_ptr<RooAbsL> likelihood
    offsets_previous_ = shared_offset_.offsets();
 }
 
-void LikelihoodGradientJob::synchronizeParameterSettings(
+void LikelihoodGradientJob::synchronizeParameterSettingsImpl(
    const std::vector<ROOT::Fit::ParameterSettings> &parameter_settings)
 {
-   LikelihoodGradientWrapper::synchronizeParameterSettings(parameter_settings);
-}
-
-void LikelihoodGradientJob::synchronizeParameterSettings(
-   ROOT::Math::IMultiGenFunction *function, const std::vector<ROOT::Fit::ParameterSettings> &parameter_settings)
-{
-   gradf_.SetInitialGradient(function, parameter_settings, grad_);
+   gradf_.SetInitialGradient(parameter_settings, grad_);
 }
 
 void LikelihoodGradientJob::synchronizeWithMinimizer(const ROOT::Math::MinimizerOptions &options)

roofit/roofitcore/src/TestStatistics/LikelihoodGradientJob.h

@@ -43,10 +43,7 @@ class LikelihoodGradientJob : public MultiProcess::Job, public LikelihoodGradien
 private:
    void run_derivator(unsigned int i_component) const;
 
-   void synchronizeParameterSettings(ROOT::Math::IMultiGenFunction *function,
-                                     const std::vector<ROOT::Fit::ParameterSettings> &parameter_settings) override;
-   // this overload must also be overridden here so that the one above doesn't trigger a overloaded-virtual warning:
-   void synchronizeParameterSettings(const std::vector<ROOT::Fit::ParameterSettings> &parameter_settings) override;
+   void synchronizeParameterSettingsImpl(const std::vector<ROOT::Fit::ParameterSettings> &parameter_settings) override;
 
    void synchronizeWithMinimizer(const ROOT::Math::MinimizerOptions &options) override;
    void setStrategy(int istrat);

roofit/roofitcore/src/TestStatistics/LikelihoodGradientWrapper.cxx

@@ -55,7 +55,7 @@ void LikelihoodGradientWrapper::synchronizeWithMinimizer(const ROOT::Math::Minim
 void LikelihoodGradientWrapper::synchronizeParameterSettings(
    const std::vector<ROOT::Fit::ParameterSettings> &parameter_settings)
 {
-   synchronizeParameterSettings(minimizer_->getMultiGenFcn(), parameter_settings);
+   synchronizeParameterSettingsImpl(parameter_settings);
 }
 
 void LikelihoodGradientWrapper::updateMinuitInternalParameterValues(const std::vector<double> & /*minuit_internal_x*/)

roofit/roofitcore/src/TestStatistics/MinuitFcnGrad.cxx

@@ -100,7 +100,7 @@ MinuitFcnGrad::MinuitFcnGrad(const std::shared_ptr<RooFit::TestStatistics::RooAb
                                                  shared_offset);
 
    applyToLikelihood([&](auto &l) { l.synchronizeParameterSettings(parameters); });
-   _gradient->synchronizeParameterSettings(getMultiGenFcn(), parameters);
+   _gradient->synchronizeParameterSettingsImpl(parameters);
 
    // Note: can be different than RooGradMinimizerFcn/LikelihoodGradientSerial, where default options are passed
    // (ROOT::Math::MinimizerOptions::DefaultStrategy() and ROOT::Math::MinimizerOptions::DefaultErrorDef())