Skip to content

Commit 86c689f

Browse files
committed
Get fitting optimizer from config, not predefined value (I swear I did this before...)
1 parent 49ff47e commit 86c689f

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

src/sas/qtgui/Perspectives/Fitting/FittingPerspective.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88
from PySide6 import QtWidgets
99

1010
from bumps import options
11-
from bumps import fitters
11+
12+
from sas.system.config import config
1213

1314
import sas.qtgui.Utilities.ObjectLibrary as ObjectLibrary
1415
import sas.qtgui.Utilities.GuiUtils as GuiUtils
@@ -50,9 +51,6 @@ def __init__(self, parent=None, data=None):
5051
# Max index for adding new, non-clashing tab names
5152
self.maxIndex = 1
5253

53-
# The default optimizer
54-
self.optimizer = 'Levenberg-Marquardt'
55-
5654
# Dataset index -> Fitting tab mapping
5755
self.dataToFitTab = {}
5856

@@ -79,7 +77,8 @@ def __init__(self, parent=None, data=None):
7977
# Fit options - uniform for all tabs
8078
self.fit_options = options.FIT_CONFIG
8179
self.fit_options_widget = FittingOptions(config=self.fit_options)
82-
self.fit_options.selected_id = fitters.MPFit.id
80+
self.fit_options.selected_id = config.config.FITTING_DEFAULT_OPTIMIZER
81+
self.optimizer = self.fit_options.selected_name
8382

8483
# Listen to GUI Manager signal updating fit options
8584
self.fit_options_widget.fit_option_changed.connect(self.onFittingOptionsChange)

0 commit comments

Comments
 (0)