Merge pull request #627 from ajgilbert/ch-may-15

CombineHarvester May updates

Author: ajgilbert

CombineHarvester/CombinePdfs/test/MorphingMSSM.cpp

@@ -268,9 +268,7 @@ int main() {
   }
 
   cout << "Setting standardised bin names...";
-  cb.ForEachObs(ch::SetStandardBinName<ch::Observation>);
-  cb.ForEachProc(ch::SetStandardBinName<ch::Process>);
-  cb.ForEachSyst(ch::SetStandardBinName<ch::Systematic>);
+  ch::SetStandardBinNames(cb);
   cout << " done\n";
 
   RooWorkspace ws("htt", "htt");
@@ -300,8 +298,8 @@ int main() {
     }
   }
   demo.Close();
-  cb.AddWorkspace(&ws);
-  cb.cp().signals().ExtractPdfs("htt", "$BIN_$PROCESS_morph", &cb);
+  cb.AddWorkspace(ws);
+  cb.cp().signals().ExtractPdfs(cb, "htt", "$BIN_$PROCESS_morph");
   cb.PrintAll();
 
   // cout << "Adding bbb...\n";

CombineHarvester/CombinePdfs/test/ParametricMSSM.cpp

@@ -101,9 +101,7 @@ int main() {
   cb.era({"8TeV"});
 
   std::cout << "Setting standardised bin names...";
-  cb.ForEachObs(ch::SetStandardBinName<ch::Observation>);
-  cb.ForEachProc(ch::SetStandardBinName<ch::Process>);
-  cb.ForEachSyst(ch::SetStandardBinName<ch::Systematic>);
+  ch::SetStandardBinNames(cb);
   std::cout << " done\n";
 
   // cb.era({"8TeV"}).bin_id({8});
@@ -219,8 +217,8 @@ int main() {
     }
     cb_hm.process({"ggH", "bbH", "bkg"});
 
-    cb_hm.AddWorkspace(&ws);
-    cb_hm.cp().backgrounds().ExtractPdfs("htt", "$CHANNEL_bkgpdf");
+    cb_hm.AddWorkspace(ws);
+    cb_hm.cp().backgrounds().ExtractPdfs(cb_hm, "htt", "$CHANNEL_bkgpdf");
     // cb_hm.PrintAll();
   } else {
     cb_hm.cp().bin_id({8}).VariableRebin(

CombineHarvester/CombinePdfs/test/Test.cpp

@@ -297,8 +297,8 @@ int main() {
         }
       }
     }
-    cb.AddWorkspace(&ws);
-    cb.cp().signals().ExtractPdfs("htt", "$BIN_$PROCESS_morph", &cb);
+    cb.AddWorkspace(ws);
+    cb.cp().signals().ExtractPdfs(cb, "htt", "$BIN_$PROCESS_morph");
 
     string folder = "output/sm_cards_morphed";
     boost::filesystem::create_directories(folder);

CombineHarvester/CombineTools/Rules.mk

@@ -1,6 +1,8 @@
 SUBDIRS 	:=
 LIB_DEPS 	:=
-LIB_EXTRA := -lboost_python -L$(shell scramv1 tool tag python LIBDIR) -l$(shell scramv1 tool tag python LIB) -lPyROOT
+LIB_EXTRA := -lRooStats -lboost_python -L$(shell scramv1 tool tag python LIBDIR) -l$(shell scramv1 tool tag python LIB) -lPyROOT
+PY_MODULES := combineharvester
+PY_SRC_combineharvester := CombineHarvester_Python.pycc
 
 $(d)/interface/GitVersion.h: $(TOP)/../.git/logs/HEAD
 	@echo -e "Updating $@"
@@ -14,4 +16,3 @@ clean_$(d) : clean_$(d)/interface/GitVersion.h
 dir_$(d) : | $(d)/interface/GitVersion.h
 tree_$(d) : | $(d)/interface/GitVersion.h
 all_proxy :: | $(d)/interface/GitVersion.h
-

CombineHarvester/CombineTools/input/xsecs_brs/WH_7TeV_YR3.txt

@@ -1,3 +1,4 @@
+mH xsec scale_hi scale_lo pdf_hi pdf_lo
 80.0	2.341	+1.0	-1.0	+2.3	-2.3
 81.0	2.258	+0.9	-0.9	+2.3	-2.3
 82.0	2.179	+0.9	-0.9	+2.3	-2.3
@@ -282,4 +283,4 @@
 370.0	0.008106	+1.8	-1.8	+5.0	-5.0
 380.0	0.007225	+1.8	-1.8	+5.1	-5.1
 390.0	0.006457	+1.8	-1.8	+5.2	-5.2
-400.0	0.005783	+1.8	-1.8	+5.1	-5.1
+400.0	0.005783	+1.8	-1.8	+5.1	-5.1

CombineHarvester/CombineTools/input/xsecs_brs/WH_8TeV_YR3.txt

@@ -1,3 +1,4 @@
+mH xsec scale_hi scale_lo pdf_hi pdf_lo
 80.0	2.808	+1.1	-1.1	+2.2	-2.2
 81.0	2.711	+1.1	-1.1	+2.2	-2.2
 82.0	2.619	+1.0	-1.0	+2.2	-2.2
@@ -282,4 +283,4 @@
 370.0	0.01076	+1.7	-1.7	+4.5	-4.5
 380.0	0.009627	+1.7	-1.7	+4.6	-4.6
 390.0	0.008629	+1.7	-1.7	+4.6	-4.6
-400.0	0.007765	+1.7	-1.7	+4.6	-4.6
+400.0	0.007765	+1.7	-1.7	+4.6	-4.6

CombineHarvester/CombineTools/input/xsecs_brs/ZH_7TeV_YR3.txt

@@ -1,3 +1,4 @@
+mH xsec scale_hi scale_lo pdf_hi pdf_lo
 80.0	1.244	+1.8	-1.8	+2.3	-2.3
 81.0	1.203	+1.8	-1.8	+2.3	-2.3
 82.0	1.163	+1.8	-1.8	+2.4	-2.4
@@ -282,4 +283,4 @@
 370.0	0.004734	+2.7	-2.7	+5.4	-5.4
 380.0	0.004212	+2.8	-2.8	+5.5	-5.5
 390.0	0.003757	+2.8	-2.8	+5.6	-5.6
-400.0	0.003357	+2.8	-2.8	+5.5	-5.5
+400.0	0.003357	+2.8	-2.8	+5.5	-5.5

CombineHarvester/CombineTools/input/xsecs_brs/ZH_8TeV_YR3.txt

@@ -1,3 +1,4 @@
+mH xsec scale_hi scale_lo pdf_hi pdf_lo
 80.0	1.508	+1.9	-1.9	+2.1	-2.1
 81.0	1.459	+1.9	-1.9	+2.1	-2.1
 82.0	1.411	+2.0	-2.0	+2.1	-2.1
@@ -282,4 +283,4 @@
 370.0	0.006364	+2.7	-2.7	+4.9	-4.9
 380.0	0.005684	+2.8	-2.8	+5.0	-5.0
 390.0	0.005090	+2.8	-2.8	+5.0	-5.0
-400.0	0.004568	+2.8	-2.8	+5.0	-5.0
+400.0	0.004568	+2.8	-2.8	+5.0	-5.0

CombineHarvester/CombineTools/input/xsecs_brs/ggH_7TeV_YR3.txt

@@ -1,3 +1,4 @@
+mH xsec scale_hi scale_lo pdf_hi pdf_lo
 80.0	36.59	+8.3	-8.8	+7.8	-6.7
 81.0	35.71	+8.3	-8.8	+7.8	-6.7
 82.0	34.86	+8.3	-8.8	+7.8	-6.7
@@ -318,4 +319,4 @@
 950.0	0.0257	+6.8	-5.7	+13.5	-12.7
 960.0	0.0242	+6.8	-5.7	+13.7	-12.9
 980.0	0.0216	+6.9	-5.7	+14.0	-13.2
-1000.0	0.0192	+7.0	-5.7	+14.2	-13.5
+1000.0	0.0192	+7.0	-5.7	+14.2	-13.5

CombineHarvester/CombineTools/input/xsecs_brs/ggH_8TeV_YR3.txt

@@ -1,3 +1,4 @@
+mH xsec scale_hi scale_lo pdf_hi pdf_lo
 80.0	45.37	+8.8	-9.2	+7.9	-6.7
 81.0	44.31	+8.8	-9.1	+7.9	-6.7
 82.0	43.28	+8.7	-9.1	+7.9	-6.6
@@ -318,4 +319,4 @@
 950.0	0.0424	+6.4	-5.4	+11.5	-10.7
 960.0	0.0400	+6.4	-5.4	+11.6	-10.8
 980.0	0.0357	+6.5	-5.4	+11.8	-11.0
-1000.0	0.0320	+6.9	-5.4	+12.0	-11.2
+1000.0	0.0320	+6.9	-5.4	+12.0	-11.2