Remove the remnants of ChiSquaredModule machinery from the GUI

GUI/coregui/Models/ItemCatalogue.cpp

@@ -64,7 +64,6 @@
 #include "SpecularDataItem.h"
 #include "SphericalDetectorItem.h"
 #include "TransformationItem.h"
-#include "VarianceFunctionItems.h"
 #include "VectorItem.h"
 
 ItemCatalogue::ItemCatalogue()
@@ -244,9 +243,6 @@ ItemCatalogue::ItemCatalogue()
     add(Constants::ProjectionContainerType, create_new<ProjectionContainerItem>);
 
     add(Constants::DepthProbeInstrumentType, create_new<DepthProbeInstrumentItem>);
-
-    add(Constants::VarianceConstantFunctionType, create_new<VarianceConstantFunctionItem>);
-    add(Constants::VarianceSimFunctionType, create_new<VarianceSimFunctionItem>);
 }
 
 bool ItemCatalogue::contains(const QString& modelType) const

GUI/coregui/Models/MinimizerItem.cpp

@@ -16,7 +16,6 @@
 #include "GSLLevenbergMarquardtMinimizer.h"
 #include "GSLMultiMinimizer.h"
 #include "GeneticMinimizer.h"
-#include "IIntensityFunction.h"
 #include "MinimizerConstants.h"
 #include "MinimizerItemCatalogue.h"
 #include "Minuit2Minimizer.h"
@@ -24,17 +23,6 @@
 #include "ObjectiveMetricUtils.h"
 #include "SimAnMinimizer.h"
 #include "TestMinimizer.h"
-#include "VarianceFunctionItems.h"
-#include "VarianceFunctions.h"
-
-namespace
-{
-const QString none_fun = "None";
-const QString sqrt_fun = "sqrt";
-const QString log10_fun = "log";
-} // namespace
-
-// ----------------------------------------------------------------------------
 
 MinimizerItem::MinimizerItem(const QString& model_type) : SessionItem(model_type) {}
 

GUI/coregui/Models/MinimizerItem.h

@@ -18,8 +18,6 @@
 #include "SessionItem.h"
 
 class IMinimizer;
-class IIntensityFunction;
-class IVarianceFunction;
 class ObjectiveMetric;
 
 //! The MinimizerItem class is the base item to hold minimizer settings.

GUI/coregui/Models/VarianceFunctionItems.cpp

-// ************************************************************************** //
-//
-//  BornAgain: simulate and fit scattering at grazing incidence
-//
-//! @file      GUI/coregui/Models/VarianceFunctionItems.cpp
-//! @brief     Implements classes VarianceFunctionItems
-//!
-//! @homepage  http://www.bornagainproject.org
-//! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum Jülich GmbH 2018
-//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
-//
-// ************************************************************************** //
-
-#include "VarianceFunctionItems.h"
-#include "item_constants.h"
-#include "VarianceFunctions.h"
-
-IVarianceFunctionItem::IVarianceFunctionItem(const QString& model_type)
-    : SessionItem(model_type)
-{
-
-}
-
-VarianceConstantFunctionItem::VarianceConstantFunctionItem()
-    : IVarianceFunctionItem(Constants::VarianceConstantFunctionType)
-{
-    setToolTip("Leaves residual value unnormalized");
-
-}
-
-std::unique_ptr<IVarianceFunction> VarianceConstantFunctionItem::createVarianceFunction() const
-{
-    return std::make_unique<VarianceConstantFunction>();
-}
-
-const QString VarianceSimFunctionItem::P_EPSILON = "epsilon";
-
-VarianceSimFunctionItem::VarianceSimFunctionItem()
-    : IVarianceFunctionItem(Constants::VarianceSimFunctionType)
-{
-    setToolTip("Normalizes residual on max(sim, epsilon)");
-    addProperty(P_EPSILON, 1.0)->setToolTip(QStringLiteral(
-            "Defines threshold on simulated amplitude in max(sim, epsilon)"));
-}
-
-std::unique_ptr<IVarianceFunction> VarianceSimFunctionItem::createVarianceFunction() const
-{
-    return std::make_unique<VarianceSimFunction>(getItemValue(P_EPSILON).toDouble());
-}

GUI/coregui/Models/VarianceFunctionItems.h

-// ************************************************************************** //
-//
-//  BornAgain: simulate and fit scattering at grazing incidence
-//
-//! @file      GUI/coregui/Models/VarianceFunctionItems.h
-//! @brief     Defines classes VarianceFunctionItems
-//!
-//! @homepage  http://www.bornagainproject.org
-//! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum Jülich GmbH 2018
-//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
-//
-// ************************************************************************** //
-
-#ifndef VARIANTFUNCTIONITEMS_H
-#define VARIANTFUNCTIONITEMS_H
-
-#include "SessionItem.h"
-#include <QString>
-#include <memory>
-
-class IVarianceFunction;
-
-//! Base class for variance in Minimizer's residual settings.
-
-class BA_CORE_API_ IVarianceFunctionItem : public SessionItem
-{
-public:
-    virtual std::unique_ptr<IVarianceFunction> createVarianceFunction() const = 0;
-protected:
-    IVarianceFunctionItem(const QString& model_type);
-};
-
-class BA_CORE_API_ VarianceConstantFunctionItem : public IVarianceFunctionItem
-{
-public:
-    VarianceConstantFunctionItem();
-
-    std::unique_ptr<IVarianceFunction> createVarianceFunction() const;
-};
-
-class BA_CORE_API_ VarianceSimFunctionItem : public IVarianceFunctionItem
-{
-public:
-    static const QString P_EPSILON;
-    VarianceSimFunctionItem();
-
-    std::unique_ptr<IVarianceFunction> createVarianceFunction() const;
-};
-
-#endif // VARIANTFUNCTIONITEMS_H