CWR Comments WIP

bin/plot

@@ -84,6 +84,8 @@ from tools.ROOT_utils import set_root_defaults
 from tools.file_utilities import write_data_to_JSON, read_data_from_JSON
 from tools.HistSet import HistSet
 from copy import deepcopy
+from tools.ROOT_utils import get_histogram_from_file
+from math import sqrt
 
 supported_commands = ['compare-files', 'compare-hists']
 
@@ -95,7 +97,7 @@ plot_options = {}
 global_options = ['files', 'file-aliases', 'histograms', 'labels', 'plot_type', 'output_folder',
                   'output_format', 'command', 'data_index', 'normalise',
                   'show_ratio', 'show_stat_errors_on_mc', 'colours', 'name_prefix',
-                  'fill_area', 'alpha']
+                  'fill_area', 'alpha', 'subtractFiles']
 
 def main():
     options, input_values_sets, json_input_files = parse_options()
@@ -173,7 +175,63 @@ def _exit_( msg ):
 def prepare_inputs( input_values ):
     input_values = check_and_fix_inputs( input_values )
     global files, histograms, global_options
+
+    subtractFiles = []
+    if input_values.has_key('subtractFiles'):
+       subtractFiles =  input_values['subtractFiles']
+
     sets = group_by_command( input_values['command'] )
+
+    for s in sets:
+        print s.histograms
+        # subtractFiles_sets = getBackgroundHists( subtractFiles, )
+
+    # if input_values['command'] == 'compare-hists' and len( input_values['subtractFiles'] ) > 0:
+
+    #     subtract_background( input_values['subtractFiles'] )
+    if len( subtractFiles ) > 0:
+        hist_sets = []
+        i = 0
+
+        for h in input_values['histograms']:
+            print h
+            # name = h.replace( '/', '_' )
+            # name = name.replace( ' ', '' )
+
+            uncDict = {'VJets' : 0.3,
+                        'TTJet' : 0.06,
+                        'SingleTop' : 0.3 }
+
+            for f in subtractFiles:
+                hist = get_histogram_from_file( histogram_path = h,
+                                               input_file = f )
+                print f
+                print hist
+                unc = 0
+                if 'VJets' in f or 'SingleTop' in f:
+                    unc = 0.3
+                elif 'TTJet' in f:
+                    unc = 0.3
+
+                for bin in range(1,hist.GetNbinsX()):
+                    binContent = hist.GetBinContent(bin)
+                    binError = hist.GetBinError(bin)
+                    newError = sqrt( binError ** 2 + ( binContent * unc ) ** 2 )
+                    # print 'Errors :',binError,newError
+                    hist.SetBinError( bin, newError )
+
+                sets[0].histograms[i] -= hist
+            i += 1
+            # hist_sets.append( HistSet( h, hist_inputs = hist_set, output_hist_labels = labels ) )
+
+
+    # print hist_sets
+    # print 'Looping sets'
+    # for s in sets:
+    #     for h in s.histograms:
+    #         print s.inputs            
+        # print s.histograms
+
     if input_values.has_key('name_prefix'):
         for s in sets:
             s.name = input_values['name_prefix'] + s.name
@@ -234,6 +292,7 @@ def group_by_file():
         [{name:{f:h}, ...] where f = file and h = histogram path. The name is taken from the file name
     '''
     global files, file_aliases, histograms, labels
+
     hist_sets = []
     for f,name in zip(files, file_aliases):
         hist_set = []

bin/plots2tdr

@@ -15,24 +15,22 @@ from glob import glob
 plot_map_common = {}
 
 plot_map_paper = {
-            # <src relative to DPS plots folder> : <dst relative to TDR plots folder>,
-            # results 8 TeV
-            '7TeV/MET/central/normalised_xsection_combined_*.pdf': '7TeV/MET/',
-            '7TeV/HT/central/normalised_xsection_combined_*.pdf': '7TeV/HT/',
-            '7TeV/ST/central/normalised_xsection_combined_*.pdf': '7TeV/ST/',
-            '7TeV/WPT/central/normalised_xsection_combined_*.pdf': '7TeV/WPT/',
-            # results 8 TeV
-            '8TeV/MET/central/normalised_xsection_combined_*.pdf': '8TeV/MET/',
-            '8TeV/HT/central/normalised_xsection_combined_*.pdf': '8TeV/HT/',
-            '8TeV/ST/central/normalised_xsection_combined_*.pdf': '8TeV/ST/',
-            '8TeV/WPT/central/normalised_xsection_combined_*.pdf': '8TeV/WPT/',
-            # control plots 8 TeV
-            'control_plots/after_fit/8TeV/*_HT_2orMoreBtags_with_ratio.pdf': 'control/',
-            'control_plots/after_fit/8TeV/*_patType1CorrectedPFMet_2orMoreBtags_with_ratio.pdf': 'control/',
-            # fit variables 8 TeV
-            'control_plots/after_fit/8TeV/*_angle_bl_2orMoreBtags_with_ratio.pdf': 'control/fit_variables/8TeV/',
-            'control_plots/after_fit/8TeV/*_AbsEta_2orMoreBtags_with_ratio.pdf': 'control/fit_variables/8TeV/',
-            'control_plots/after_fit/8TeV/*_M3_2orMoreBtags_with_ratio.pdf': 'control/fit_variables/8TeV/',
+            # # <src relative to DPS plots folder> : <dst relative to TDR plots folder>,
+            # # results 8 TeV
+            # 'background_subtraction/7TeV/MET/central/normalised_xsection_combined_*.pdf': '7TeV/MET/',
+            # 'background_subtraction/7TeV/HT/central/normalised_xsection_combined_*.pdf': '7TeV/HT/',
+            # 'background_subtraction/7TeV/ST/central/normalised_xsection_combined_*.pdf': '7TeV/ST/',
+            # 'background_subtraction/7TeV/WPT/central/normalised_xsection_combined_*.pdf': '7TeV/WPT/',
+            # # # results 8 TeV
+            # 'background_subtraction/8TeV/MET/central/normalised_xsection_combined_*.pdf': '8TeV/MET/',
+            # 'background_subtraction/8TeV/HT/central/normalised_xsection_combined_*.pdf': '8TeV/HT/',
+            # 'background_subtraction/8TeV/ST/central/normalised_xsection_combined_*.pdf': '8TeV/ST/',
+            # 'background_subtraction/8TeV/WPT/central/normalised_xsection_combined_*.pdf': '8TeV/WPT/',
+            # # control plots 8 TeV
+            # 'control_plots/before_fit/8TeV/*_patType1CorrectedPFMet_2orMoreBtags_with_ratio.pdf': 'control/',
+            # 'control_plots/before_fit/8TeV/*_*T_2orMoreBtags_with_ratio.pdf': 'control/',
+
+            '../tables/background_subtraction/*/*/*_normalised_xsection_*combined.tex': '../tables/'
             }
 
 plot_map_AN = {}

bin/x_01_all_vars

@@ -1,14 +1,17 @@
 #!/bin/bash
 echo "This will take a while ... grab a coffee/tea/water/cocktail"
 mkdir -p logs
-fit_var="absolute_eta,M3,angle_bl"
+# fit_var="absolute_eta,M3,angle_bl"
+# fit_var="absolute_eta"
+# fit_var="M3"
+fit_var="angle_bl"
 nice_fit_var=`echo $fit_var | sed 's/,/_/g'`
 N_JOBS=6
 
 echo "Using the fit variable(s): $fit_var"
 
 i=0
-for var in MET HT ST WPT MT; do
+for var in MET HT ST WPT; do
 	echo "Fitting distribution: $var"
 	nohup time python src/cross_section_measurement/01_get_fit_results.py -V -v $var --no_combined_signal -c 7 --fit-variables $fit_var --disable-constraints &> logs/01_${var}_fit_7TeV_${nice_fit_var}.log &
 	let i+=1

bin/x_01b_all_vars

@@ -1,11 +1,11 @@
 #!/bin/bash
 echo "This will take a while ... grab a coffee/tea/water/cocktail"
 mkdir -p logs
-N_JOBS=5
+N_JOBS=4
 
 
 i=0
-for var in MET HT ST WPT MT; do
+for var in MET HT ST WPT; do
 	echo "Fitting distribution: $var"
 	nohup time python src/cross_section_measurement/01_get_ttjet_normalisation.py -v $var -c 7 -i config/measurements/background_subtraction &> logs/01b_${var}_bgs_7TeV.log &
 	let i+=1

bin/x_02_all_vars

@@ -2,6 +2,9 @@
 echo "This will take a while ... grab a coffee/tea/water"
 mkdir -p logs
 fit_var="absolute_eta,M3,angle_bl"
+# fit_var="absolute_eta"
+# fit_var="M3"
+# fit_var="angle_bl"
 nice_fit_var=`echo $fit_var | sed 's/,/_/g'`
 N_JOBS=6
 

bin/x_02b_all_vars

@@ -5,9 +5,9 @@ N_JOBS=5
 
 i=0
 
-for var in MET HT ST WPT MT; do
+for var in MET HT ST WPT; do
 	echo "Unfolding distribution: $var"
-	nohup time python src/cross_section_measurement/02_unfold_and_measure.py -v $var -c 7 -p data/normalisation/background_subtraction/ &> logs/02b_${var}_unfold_7TeV.log &
+	nohup time python src/cross_section_measurement/02_unfold_and_measure.py -v $var -c 7 -p data/normalisation/background_subtraction/ --test  &> logs/02b_${var}_unfold_7TeV.log &
 	let i+=1
 	if (( $i % N_JOBS == 0 ))
 	then
@@ -16,7 +16,7 @@ for var in MET HT ST WPT MT; do
 	fi
 
 
-	nohup time python src/cross_section_measurement/02_unfold_and_measure.py -v $var -c 8 -p data/normalisation/background_subtraction/ &> logs/02b_${var}_unfold_8TeV.log &
+	nohup time python src/cross_section_measurement/02_unfold_and_measure.py -v $var -c 8 -p data/normalisation/background_subtraction/ --test &> logs/02b_${var}_unfold_8TeV.log &
 	let i+=1
 	if (( $i % N_JOBS == 0 ))
 	then

bin/x_03_all_vars

@@ -2,6 +2,9 @@
 echo "This will take a while ... grab a coffee/tea/water"
 mkdir -p logs
 fit_var="absolute_eta,M3,angle_bl"
+# fit_var="absolute_eta"
+# fit_var="M3"
+# fit_var="angle_bl"
 nice_fit_var=`echo $fit_var | sed 's/,/_/g'`
 N_JOBS=6
 

bin/x_03b_all_vars

@@ -4,7 +4,7 @@ mkdir -p logs
 N_JOBS=5
 
 i=0
-for var in MET HT ST WPT MT; do
+for var in MET HT ST WPT; do
 	echo "Calculating diff. x-section for distribution: $var"
 	nohup time python src/cross_section_measurement/03_calculate_systematics.py -s -v $var -c 7 -p data/normalisation/background_subtraction/ &> logs/03b_${var}_calculate_7TeV.log &
 	let i+=1

bin/x_04_all_vars

@@ -3,6 +3,9 @@ echo "This will take a while ... grab a coffee/tea/water"
 mkdir -p logs
 mkdir -p plots
 fit_var="absolute_eta,M3,angle_bl"
+# fit_var="absolute_eta"
+# fit_var="M3"
+# fit_var="angle_bl"
 nice_fit_var=`echo $fit_var | sed 's/,/_/g'`
 N_JOBS=5
 
@@ -11,15 +14,15 @@ echo "Using the fit variable(s): $fit_var"
 i=0
 for var in MET HT ST MT WPT; do
 	echo "Plotting diff. x-section for distribution: $var"
-	nohup time python src/cross_section_measurement/04_make_plots_matplotlib.py -v $var -c 7 -p data/$nice_fit_var -o plots/fit &> logs/04_${var}_plot_7TeV_${nice_fit_var}.log & # -a -s <--add -a option for additional plots, -s option to include the final results from background subtraction as well as from fitting
+	nohup time python src/cross_section_measurement/04_make_plots_matplotlib.py -v $var -c 7 -p data/$nice_fit_var -o plots/fit/ &> logs/04_${var}_plot_7TeV_${nice_fit_var}.log & # -a -s <--add -a option for additional plots, -s option to include the final results from background subtraction as well as from fitting
 	let i+=1
 	if (( $i % N_JOBS == 0 ))
 	then
 		echo "Waiting on the above to finish."
     	wait;
 	fi
 
-	nohup time python src/cross_section_measurement/04_make_plots_matplotlib.py -v $var -c 8 -p data/$nice_fit_var -o plots/fit &> logs/04_${var}_plot_8TeV_${nice_fit_var}.log & # -a -s <--add -a option for additional plots, -s option to include the final results from background subtraction as well as from fitting
+	nohup time python src/cross_section_measurement/04_make_plots_matplotlib.py -v $var -c 8 -p data/$nice_fit_var -o plots/fit/ &> logs/04_${var}_plot_8TeV_${nice_fit_var}.log & # -a -s <--add -a option for additional plots, -s option to include the final results from background subtraction as well as from fitting
 	let i+=1
 	if (( $i % N_JOBS == 0 ))
 	then

bin/x_04b_all_vars

@@ -6,7 +6,7 @@ N_JOBS=5
 
 i=0
 echo "Visible phase space"
-for var in MET HT ST WPT MT; do
+for var in MET HT ST WPT; do
 	echo "Plotting diff. x-section for distribution: $var"
 	nohup time python src/cross_section_measurement/04_make_plots_matplotlib.py -v $var -c 7 -p data/normalisation/background_subtraction/ -o plots/background_subtraction &> logs/04b_${var}_plot_7TeV.log & # -a  <--add this option for additional plots
 	let i+=1

bin/x_05_all_vars

@@ -19,13 +19,13 @@ for var in MET HT ST MT WPT; do
     	wait;
 	fi
 
-	nohup time python src/cross_section_measurement/05_make_tables.py -v $var -c 8 -p data/$nice_fit_var -a -o tables/fit &> logs/05_${var}_table_8TeV_${nice_fit_var}.log &
-	let i+=1
-	if (( $i % N_JOBS == 0 ))
-	then
-		echo "Waiting on the above to finish."
-    	wait;
-	fi
+	# nohup time python src/cross_section_measurement/05_make_tables.py -v $var -c 8 -p data/$nice_fit_var -a -o tables/fit &> logs/05_${var}_table_8TeV_${nice_fit_var}.log &
+	# let i+=1
+	# if (( $i % N_JOBS == 0 ))
+	# then
+	# 	echo "Waiting on the above to finish."
+ #    	wait;
+	# fi
 done
 
 wait;

bin/x_05b_all_vars

@@ -2,26 +2,24 @@
 echo "This will take a while ... grab a coffee/tea/water"
 mkdir -p logs
 mkdir -p plots
-N_JOBS=5
+N_JOBS=1
 
 i=0
-for var in MET HT ST WPT MT; do
+for var in MET HT ST WPT; do
 	echo "Tabulating diff. x-section for distribution: $var"
-	nohup time python src/cross_section_measurement/05_make_tables.py -v $var -c 7 -p data/normalisation/background_subtraction/ -a -o tables/background_subtraction &> logs/05b_${var}_table_7TeV.log &
-	let i+=1
-	if (( $i % N_JOBS == 0 ))
-	then
-		echo "Waiting on the above to finish."
-    	wait;
-	fi
+	# nohup time 
+	echo $var
+	echo "7"
+	python src/cross_section_measurement/05_make_tables.py -v $var -c 7 -p data/normalisation/background_subtraction/ -a -o tables/background_subtraction 
+	# &> logs/05b_${var}_table_7TeV.log &
+	# wait;
 
-	nohup time python src/cross_section_measurement/05_make_tables.py -v $var -c 8 -p data/normalisation/background_subtraction/ -a -o tables/background_subtraction &> logs/05b_${var}_table_8TeV.log &
-	let i+=1
-	if (( $i % N_JOBS == 0 ))
-	then
-		echo "Waiting on the above to finish."
-    	wait;
-	fi
+	# nohup time 
+	echo $var
+	echo "8"
+	python src/cross_section_measurement/05_make_tables.py -v $var -c 8 -p data/normalisation/background_subtraction/ -a -o tables/background_subtraction 
+	# &> logs/05b_${var}_table_8TeV.log &
+	wait;
 done
 
 wait;

config/CMS.py

@@ -15,7 +15,7 @@
               }
 
 y_axis_title = {
-              'fontsize':50,
+              'fontsize':40,
               'position' : (0., 1.),
               'verticalalignment': 'bottom',
               'horizontalalignment': 'right'
@@ -43,7 +43,7 @@
               'pad': 12
               }
 
-legend_properties = {'size':35}
+legend_properties = {'size':33}
 
 figsize = (16,16)
 dpi = 400