Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
BornAgain
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mlz
BornAgain
Commits
5436b916
Commit
5436b916
authored
11 years ago
by
Pospelov, Gennady
Browse files
Options
Downloads
Patches
Plain Diff
Defense against not complete ROOT installation
parent
d6241187
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Fit/FitKernel/src/ROOTMinimizer.cpp
+0
-34
0 additions, 34 deletions
Fit/FitKernel/src/ROOTMinimizer.cpp
cmake/modules/FindROOT.cmake
+6
-0
6 additions, 0 deletions
cmake/modules/FindROOT.cmake
with
6 additions
and
34 deletions
Fit/FitKernel/src/ROOTMinimizer.cpp
+
0
−
34
View file @
5436b916
...
...
@@ -26,11 +26,6 @@
#include
"MinimizerOptions.h"
#ifdef HAS_GENETIC_MINIMIZER
#include
"Math/GeneticMinimizer.h"
#endif
// ----------------------------------------------------------------------------
// ROOTMinimizer c-tor
//
...
...
@@ -44,35 +39,6 @@ ROOTMinimizer::ROOTMinimizer(const std::string& minimizer_name, const std::strin
,
m_chi2_func
(
0
)
,
m_gradient_func
(
0
)
{
// if( m_minimizer_name == "GSLMultiFit") {
// // hacked version of ROOT's GSL Levenberg-Marquardt minimizer
// m_root_minimizer = new ROOT::Patch::GSLNLSMinimizer(2);
// }else if( m_minimizer_name == "GSLSimAn") {
// // hacked version of ROOT's GSL Simulated annealing minimizer
// m_root_minimizer = new ROOT::Patch::GSLSimAnMinimizer();
// // changing default options to more appropriate
// setOptionString("ntries=100:niters=10:step_size=1.0:k=1:t_initial=50.0:mu=1.05:t_min=0.1");
// }else if( m_minimizer_name == "Minuit2") {
// m_root_minimizer = new ROOT::Minuit2::Minuit2Minimizer(algo_type.c_str());
// } else if( m_minimizer_name == "GSLMultiMin") {
// m_root_minimizer = new ROOT::Math::GSLMinimizer(algo_type.c_str());
//#ifdef HAS_GENETIC_MINIMIZER
// } else if (m_minimizer_name == "Genetic") {
// m_root_minimizer = new ROOT::Math::GeneticMinimizer();
//#endif
//// } else {
//// m_root_minimizer = ROOT::Math::Factory::CreateMinimizer(minimizer_name, algo_type );
// }
// if(!m_root_minimizer) {
// throw LogicErrorException("Can't create minimizer with name '"+minimizer_name+"', algo '" + algo_type+"'");
// }
}
...
...
This diff is collapsed.
Click to expand it.
cmake/modules/FindROOT.cmake
+
6
−
0
View file @
5436b916
...
...
@@ -54,6 +54,12 @@ else()
endif
()
endif
()
# check if ROOT installation is complete
if
(
NOT EXISTS
"
${
ROOT_INCLUDE_DIR
}
/Math/GeneticMinimizer.h"
)
message
(
"--> ROOT installation is not complete. Can't find file
${
ROOT_INCLUDE_DIR
}
/include/Math/GeneticMinimizer.h"
)
message
(
"--> Switching ROOT OFF"
)
set
(
ROOT_FOUND FALSE
)
endif
()
#include(CMakeMacroParseArguments)
find_program
(
ROOTCINT_EXECUTABLE rootcint PATHS $ENV{ROOTSYS}/bin
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment