Merge pull request cms-sw#21 from gpetruc/fix-discrete-nuis-crash

fix crash on workspaces that didn't have discrete nuisances
gdimperi · Aug 12, 2013 · 15c1ee2 · 15c1ee2
2 parents 75a155a + 6f9e3b1
commit 15c1ee2
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);
+    }
 }