MinimizerContainerItem: pass algorithm to minimizer: fix

GUI/Model/Job/MinimizerItem.cpp

@@ -43,10 +43,9 @@ void add_algorithm_from_minimizer_to_list_and_map(const QString& minimizer,
     ASSERT(algorithms.size() == descriptions.size())
 
     for (int i = 0; i < algorithms.size(); i++) {
-        QString name = "   " + algorithms[i];
-        common_algorithms_list.append(name);
+        common_algorithms_list.append(algorithms[i]);
         common_algorithms_descriptions.append(descriptions[i]);
-        algorithm_minimizer_map.insert(name, minimizer_names_map.key(minimizer));
+        algorithm_minimizer_map.insert(algorithms[i], minimizer_names_map.key(minimizer));
     }
 }
 void create_algorithm_list_and_map(QString& default_common_algorithm, QStringList& algorithms_list,
@@ -90,7 +89,7 @@ void create_algorithm_list_and_map(QString& default_common_algorithm, QStringLis
     add_algorithm_from_minimizer_to_list_and_map(GSLLMAMinimizerItem::M_TYPE, algorithms_list,
                                                  algorithms_descriptions);
 
-    default_common_algorithm = algorithms_list[1]; // after the first header
+    default_common_algorithm = algorithms_list[1]; // after the first header: Minuit2 Migrad
 }
 #endif
 
@@ -204,12 +203,33 @@ void MinimizerContainerItem::setCurrentCommonAlgorithm(const QString& name)
 
     ASSERT(algorithmHasMinimizer(name));
     setCurrentMinimizer(algorithm_minimizer_map.value(name));
+    applyAlgorithmToMinimizer(name);
 }
 
 ComboProperty MinimizerContainerItem::commonAlgorithmCombo() const
 {
     return getItemValue(P_COMMON_ALGORITHMS).value<ComboProperty>();
 }
+
+void MinimizerContainerItem::applyAlgorithmToMinimizer(const QString &name)
+{
+    // Minuit2
+    if (currentMinimizerM_TYPE() == MinuitMinimizerItem::M_TYPE)
+        minimizerItemMinuit()->setCurrentAlgorithm(name);
+
+    // GSL MultiMin
+    if (currentMinimizerM_TYPE() == GSLMultiMinimizerItem::M_TYPE)
+        minimizerItemGSLMulti()->setCurrentAlgorithm(name);
+
+    // TMVA Genetic
+    // do nothing
+
+    // GSL Simulated Annealing
+    // do nothing
+
+    // GSL Levenberg-Marquardt
+    // do nothing
+}
 #endif
 QString MinimizerContainerItem::currentObjectiveMetric() const
 {

GUI/Model/Job/MinimizerItem.h

@@ -70,6 +70,7 @@ public:
     bool algorithmHasMinimizer(const QString& name);
     void setCurrentCommonAlgorithm(const QString& name);
     ComboProperty commonAlgorithmCombo() const;
+    void applyAlgorithmToMinimizer(const QString& name);
 #endif
 
     // Objective metric to use for estimating distance between simulated and experimental data

GUI/View/Fit/MinimizerSettingsWidget.cpp

@@ -139,6 +139,7 @@ void MinimizerSettingsWidget::createGroupedAlgorithmsCombo()
             int prev = comboBox->currentIndex() - 2;
             int next = comboBox->currentIndex() + 2;
 
+            QSignalBlocker b(comboBox);
             if (previous_state < comboBox->currentIndex() && next < comboBox->count())
                 comboBox->setCurrentIndex(next);
             else if (previous_state > comboBox->currentIndex() && prev >= 0)