Merge pull request #162 from nucleosynthesis/nckw_cherry_pick_not_groups

Nckw cherry pick not groups
cms-analysis · Nov 25, 2014 · bcd353f · bcd353f
2 parents dccffdf + 53fcf82
commit bcd353f
Showing 1 changed file with 22 additions and 2 deletions.
diff --git a/src/Combine.cc b/src/Combine.cc
@@ -449,14 +449,34 @@ void Combine::run(TString hlfFile, const std::string &dataset, double &limit, do
       std::vector<string> nuisanceGroups;
       boost::algorithm::split(nuisanceGroups,freezeNuisanceGroups_,boost::algorithm::is_any_of(","));
       for (std::vector<string>::iterator ng_it=nuisanceGroups.begin();ng_it!=nuisanceGroups.end();ng_it++){
-        RooArgSet toFreeze(*(w->set(Form("group_%s",(*ng_it).c_str()))));
+        bool freeze_complement=false;
+      	if (((*ng_it).at(0)==std::string("^"))){
+	  freeze_complement=true;
+	  (*ng_it).erase(0,1);
+	} 
+
+	if (! w->set(Form("group_%s",(*ng_it).c_str()))){
+          std::cerr << "Unknown nuisance group: " << (*ng_it) << std::endl;
+          throw std::invalid_argument("Unknown nuisance group name");
+	}
+        RooArgSet groupNuisances(*(w->set(Form("group_%s",(*ng_it).c_str()))));
+	RooArgSet toFreeze;
+
+	if (freeze_complement) {
+	  RooArgSet still_floating(*mc->GetNuisanceParameters());
+	  still_floating.remove(groupNuisances,true,true);	
+	  toFreeze.add(still_floating);
+	} else {
+	  toFreeze.add(groupNuisances);
+	}
+
         if (verbose > 0) std::cout << "Freezing the following nuisance parameters: "; toFreeze.Print("");
         utils::setAllConstant(toFreeze, true);
         if (nuisances) {
           RooArgSet newnuis(*nuisances);
           newnuis.remove(toFreeze, /*silent=*/true, /*byname=*/true);      
           mc->SetNuisanceParameters(newnuis);
-          mc_bonly->SetNuisanceParameters(newnuis);
+          if (mc_bonly) mc_bonly->SetNuisanceParameters(newnuis);
           nuisances = mc->GetNuisanceParameters();
        }
       }