fix crash on workspaces that didn't have discrete nuisances

gdimperi · Aug 12, 2013 · 6f9e3b1 · 6f9e3b1
1 parent b2732ab
commit 6f9e3b1
Show file tree

Hide file tree

Showing 2 changed files with 1,976 additions and 351 deletions.
diff --git a/src/Combine.cc b/src/Combine.cc
@@ -649,6 +649,9 @@ void Combine::addDiscreteNuisances(RooWorkspace *w){
     //}
 
     CascadeMinimizerGlobalConfigs::O().pdfCategories = RooArgList();
-    TIterator *dp = discreteParameters->createIterator();
-    while (RooAbsArg *arg = (RooAbsArg*)dp->Next()) (CascadeMinimizerGlobalConfigs::O().pdfCategories).add(*arg);
+
+    if (discreteParameters != 0) {
+        TIterator *dp = discreteParameters->createIterator();
+        while (RooAbsArg *arg = (RooAbsArg*)dp->Next()) (CascadeMinimizerGlobalConfigs::O().pdfCategories).add(*arg);
+    }
 }