From 6bfb45fc1b04e7f1ece59e410c2b5631d5a58660 Mon Sep 17 00:00:00 2001
From: Giovanni <gpetruc@gmail.com>
Date: Tue, 13 Aug 2013 10:17:35 +0200
Subject: [PATCH] avoid conflict with --run option of Asymptotic

---
 src/CascadeMinimizer.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/CascadeMinimizer.cc b/src/CascadeMinimizer.cc
index 7f9c09d1528..0b342fa7748 100644
--- a/src/CascadeMinimizer.cc
+++ b/src/CascadeMinimizer.cc
@@ -373,7 +373,7 @@ void CascadeMinimizer::initOptions()
         ("cminOldRobustMinimize", boost::program_options::value<bool>(&oldFallback_)->default_value(oldFallback_), "Use the old 'robustMinimize' logic in addition to the cascade")
 	("cminDefaultMinimizerType",boost::program_options::value<std::string>(&defaultMinimizerType_)->default_value(defaultMinimizerType_), "Set the default minimizer Type")
 	("cminDefaultMinimizerAlgo",boost::program_options::value<std::string>(&defaultMinimizerAlgo_)->default_value(defaultMinimizerAlgo_), "Set the default minimizer Algo")
-        ("runAllDiscreteCombinations",  "Run all combinations for discrete nuisances")
+        ("cminRunAllDiscreteCombinations",  "Run all combinations for discrete nuisances")
         //("cminNuisancePruning", boost::program_options::value<float>(&nuisancePruningThreshold_)->default_value(nuisancePruningThreshold_), "if non-zero, discard constrained nuisances whose effect on the NLL when changing by 0.2*range is less than the absolute value of the threshold; if threshold is negative, repeat afterwards the fit with these floating")
 
         //("cminDefaultIntegratorEpsAbs", boost::program_options::value<double>(), "RooAbsReal::defaultIntegratorConfig()->setEpsAbs(x)")
@@ -395,7 +395,7 @@ void CascadeMinimizer::applyOptions(const boost::program_options::variables_map
     poiOnlyFit_ = vm.count("cminPoiOnlyFit");
     singleNuisFit_ = vm.count("cminSingleNuisFit");
     setZeroPoint_  = vm.count("cminSetZeroPoint");
-    runShortCombinations = !(vm.count("runAllDiscreteCombinations"));
+    runShortCombinations = !(vm.count("cminRunAllDiscreteCombinations"));
     if (vm.count("cminFallbackAlgo")) {
         vector<string> falls(vm["cminFallbackAlgo"].as<vector<string> >());
         for (vector<string>::const_iterator it = falls.begin(), ed = falls.end(); it != ed; ++it) {