diff --git a/GUI/Model/Job/MinimizerItem.cpp b/GUI/Model/Job/MinimizerItem.cpp index 01c5bb304060a976ae31d6eafe6bc5256bcab315..1a1dadd2e348acc11c1ac8753565b3b74f8bba14 100644 --- a/GUI/Model/Job/MinimizerItem.cpp +++ b/GUI/Model/Job/MinimizerItem.cpp @@ -59,34 +59,35 @@ void create_algorithm_list_and_map(QString& default_common_algorithm, QStringLis // group 1 // group header. Can't be selected and have no mapped minimizer - algorithms_list.append("ROOT Minuit2"); - algorithms_descriptions.append("Minuit2 minimizer from CERN ROOT package"); + algorithms_list.append("Local optimization"); + algorithms_descriptions.append(""); add_algorithm_from_minimizer_to_list_and_map(MinuitMinimizerItem::M_TYPE, algorithms_list, algorithms_descriptions); - // group 2 - algorithms_list.append("ROOT TMVA"); - algorithms_descriptions.append("Genetic minimizer from TMVA package, part of CERN ROOT "); - - add_algorithm_from_minimizer_to_list_and_map(GeneticMinimizerItem::M_TYPE, algorithms_list, - algorithms_descriptions); - - // group 3 - algorithms_list.append("GSL MultiMin"); - algorithms_descriptions.append("Multidimensional Minimization from GSL library"); - add_algorithm_from_minimizer_to_list_and_map(GSLMultiMinimizerItem::M_TYPE, algorithms_list, algorithms_descriptions); - // group 4 - algorithms_list.append("GSL"); - algorithms_descriptions.append("Other minimizers from GSL library"); + add_algorithm_from_minimizer_to_list_and_map(GSLLMAMinimizerItem::M_TYPE, algorithms_list, + algorithms_descriptions); - add_algorithm_from_minimizer_to_list_and_map(SimAnMinimizerItem::M_TYPE, algorithms_list, + // group 2 + algorithms_list.append("Global optimization"); + algorithms_descriptions.append(""); + + // move "Scan" algorithm from the local group to the global + qsizetype scan_index = algorithms_list.indexOf("Scan"); + ASSERT(scan_index>=0); + QString name = algorithms_list.takeAt(scan_index); + QString descr = algorithms_descriptions.takeAt(scan_index); + algorithms_list.append(name); + algorithms_descriptions.append(descr); + + // other algorithms + add_algorithm_from_minimizer_to_list_and_map(GeneticMinimizerItem::M_TYPE, algorithms_list, algorithms_descriptions); - add_algorithm_from_minimizer_to_list_and_map(GSLLMAMinimizerItem::M_TYPE, algorithms_list, + add_algorithm_from_minimizer_to_list_and_map(SimAnMinimizerItem::M_TYPE, algorithms_list, algorithms_descriptions); default_common_algorithm = algorithms_list[1]; // after the first header: Minuit2 Migrad