Multi variable fitting #96

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

senkin merged 11 commits into BristolTopGroup:master from kreczko:multi_variable_fitting_2nd

Jul 16, 2014

.travis.yml

-Original file line number
+Diff line change
@@ Expand Up / @@ -72,9 +72,10 @@ script: @@
       - time python test/config_XSectionConfig.py
       - time python test/cross_section_measurement_00_pick_bins.py
       - time python test/fix_overflow.py
-      - time python test/RooFitFit.py
-      - time python test/TMinuitFit.py
       - time python test/tools_Calculation.py
+      - time python test/tools_Fitting_FitData.py
+      - time python test/tools_Fitting_Minuit.py
+      - time python test/tools_Fitting_RooFitFit.py
       - time python test/tools_hist_utilities.py
       - time python test/tools_Unfolding.py
       - time python test/Integral_GetBinContent_consistency.py

bin/plot_fit_tests

-Original file line number
+Diff line change
@@ -0,0 +1,18 @@
+    #!/bin/bash
+    echo "Run this only after run_fit_tests"
+    echo "This will take a while ... grab a coffee/tea/water."
+    mkdir -p logs
+    nohup python src/cross_section_measurement/98b_fit_cross_checks.py -p data/closure_test/ -o 'plots/fitchecks/closure_test' &> logs/plot_fit_checks_closure_test.log &
+    nohup python src/cross_section_measurement/98b_fit_cross_checks.py -p data/no_merging/closure_test/ -o 'plots/fitchecks/no_merging/closure_test' &> logs/plot_fit_checks_closure_test_no_merging.log &
+    nohup python src/cross_section_measurement/98b_fit_cross_checks.py -p data/no_constraints/closure_test/ -o 'plots/fitchecks/no_constraints/closure_test' &> logs/plot_fit_checks_closure_test_no_constraints.log &
+    nohup python src/cross_section_measurement/98b_fit_cross_checks.py -p data/no_constraints_no_merging/closure_test/ -o 'plots/fitchecks/no_constraints_no_merging/closure_test' &> logs/plot_fit_checks_closure_test_NCNM.log &
+    wait
+    nohup python src/cross_section_measurement/98b_fit_cross_checks.py -p data/ -o 'plots/fitchecks/' &> logs/plot_fit_checks.log &
+    nohup python src/cross_section_measurement/98b_fit_cross_checks.py -p data/no_merging/ -o 'plots/fitchecks/no_merging/' &> logs/plot_fit_checks_no_merging.log &
+    nohup python src/cross_section_measurement/98b_fit_cross_checks.py -p data/no_constraints/ -o 'plots/fitchecks/no_constraints/' &> logs/plot_fit_checks_no_constraints.log &
+    nohup python src/cross_section_measurement/98b_fit_cross_checks.py -p data/no_constraints_no_merging/ -o 'plots/fitchecks/no_constraints_no_merging/' &> logs/plot_fit_checks_NCNM.log &
+    wait
+    DATE=`date +%d.%m.%Y_%H.%M.%S`
+    tar -czf fit_check_plots_$DATE.tar.gz plots/fitchecks
+    echo "Created archive to upload and share: fit_check_plots_$DATE.tar.gz"
+    echo "All done!"

bin/run_fit_tests

-Original file line number
+Diff line change
@@ -0,0 +1,19 @@
+    #!/bin/bash
+    echo "This will take a while ... grab a coffee/tea/water"
+    mkdir -p logs
+    for var in absolute_eta M_bl M3 angle_bl absolute_eta,M_bl absolute_eta,M3 absolute_eta,angle_bl absolute_eta,M_bl,M3 absolute_eta,M3,angle_bl absolute_eta,M_bl,angle_bl absolute_eta,M_bl,M3,angle_bl; do
+    	nicevar=`echo $var | sed 's/,/_/g'`
+    	echo "Doing variable set: $nicevar"
+    	nohup time python src/cross_section_measurement/01_get_fit_results.py --fit-variables $var --closure_test &> logs/fit_closure_test_$nicevar.log &
+    	nohup time python src/cross_section_measurement/01_get_fit_results.py --fit-variables $var --closure_test --no_combined_signal -p data/no_merging &> logs/fit_closure_test_no_merging_$nicevar.log &
+    	nohup time python src/cross_section_measurement/01_get_fit_results.py --fit-variables $var --closure_test --disable-constraints -p data/no_constraints &> logs/fit_closure_test_no_constraints_$nicevar.log &
+    	nohup time python src/cross_section_measurement/01_get_fit_results.py --fit-variables $var --closure_test --disable-constraints --no_combined_signal -p data/no_constraints_no_merging &> logs/fit_closure_test_NCNM_$nicevar.log &
+    	wait
+    	nohup time python src/cross_section_measurement/01_get_fit_results.py --fit-variables $var --test &> logs/fit_test_$nicevar.log &
+    	nohup time python src/cross_section_measurement/01_get_fit_results.py --fit-variables $var --test --no_combined_signal -p data/no_merging &> logs/fit_test_no_merging_$nicevar.log &
+    	nohup time python src/cross_section_measurement/01_get_fit_results.py --fit-variables $var --test --disable-constraints -p data/no_constraints &> logs/fit_test_no_constraints_$nicevar.log &
+    	nohup time python src/cross_section_measurement/01_get_fit_results.py --fit-variables $var --test --disable-constraints --no_combined_signal -p data/no_constraints_no_merging &> logs/fit_test_NCNM_$nicevar.log &
+    	wait;
+    done
+    echo "All done!"

bin/run_x_section_measurement

-Original file line number
+Diff line change
@@ -0,0 +1,14 @@
+    #!/bin/bash
+    echo "Running differential cross-section analysis for 7 and 8 TeV data"
+    bash x_01_all_vars
+    wait
+    bash x_02_all_vars
+    wait
+    bash x_03_all_vars
+    wait
+    bash x_04_all_vars
+    wait
+    bash x_05_all_vars
+    wait
+    echo "Everything is done. Time to run make_analysis_note and go home!"

bin/x_01_all_vars

-Original file line number
+Diff line change
@@ -1,13 +1,24 @@
     #!/bin/bash
+    echo "This will take a while ... grab a coffee/tea/water"
     mkdir -p logs
-    python src/cross_section_measurement/01_get_fit_results.py -V &> logs/MET_fit_8TeV.log &
-    python src/cross_section_measurement/01_get_fit_results.py -V -v HT &> logs/HT_fit_8TeV.log &
-    python src/cross_section_measurement/01_get_fit_results.py -V -v ST &> logs/ST_fit_8TeV.log &
-    python src/cross_section_measurement/01_get_fit_results.py -V -v MT &> logs/MT_fit_8TeV.log &
-    python src/cross_section_measurement/01_get_fit_results.py -V -v WPT &> logs/WPT_fit_8TeV.log &
-    # 7 TeV
-    python src/cross_section_measurement/01_get_fit_results.py -V -c 7&> logs/MET_fit_7TeV.log &
-    python src/cross_section_measurement/01_get_fit_results.py -V -c 7 -v HT &> logs/HT_fit_7TeV.log &
-    python src/cross_section_measurement/01_get_fit_results.py -V -c 7 -v ST &> logs/ST_fit_7TeV.log &
-    python src/cross_section_measurement/01_get_fit_results.py -V -c 7 -v MT &> logs/MT_fit_7TeV.log &
-    python src/cross_section_measurement/01_get_fit_results.py -V -c 7 -v WPT &> logs/WPT_fit_7TeV.log &
+    fit_var="absolute_eta,M3,angle_bl"
+    nice_fit_var=`echo $fit_var | sed 's/,/_/g'`
+    N_JOBS=4
+    echo "Using the fit variable(s): $fit_var"
+    i=0
+    for var in MET HT ST WPT MT; 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 &> logs/${var}_fit_7TeV_${nice_fit_var}.log &
+    	let i+=1
+    	nohup time python src/cross_section_measurement/01_get_fit_results.py -V -v $var --no_combined_signal -c 8 --fit-variables $fit_var &> logs/${var}_fit_8TeV_${nice_fit_var}.log &
+    	let i+=1
+    	if (( $i % N_JOBS == 0 ))
+    	then
+    		echo "Waiting on the above to finish."
+        	wait;
+    	fi
+    done
+    echo "All done! Time to run x_02_all_vars."

bin/x_02_all_vars

-Original file line number
+Diff line change
@@ -1,12 +1,24 @@
     #!/bin/bash
-    python src/cross_section_measurement/02_unfold_and_measure.py &> logs/MET_unfold_8TeV.log &
-    python src/cross_section_measurement/02_unfold_and_measure.py -v HT &> logs/HT_unfold_8TeV.log &
-    python src/cross_section_measurement/02_unfold_and_measure.py -v ST &> logs/ST_unfold_8TeV.log &
-    python src/cross_section_measurement/02_unfold_and_measure.py -v MT &> logs/MT_unfold_8TeV.log &
-    python src/cross_section_measurement/02_unfold_and_measure.py -v WPT &> logs/WPT_unfold_8TeV.log &
-    # 7 TeV
-    python src/cross_section_measurement/02_unfold_and_measure.py -c 7 &> logs/MET_unfold_7TeV.log &
-    python src/cross_section_measurement/02_unfold_and_measure.py -c 7 -v HT &> logs/HT_unfold_7TeV.log &
-    python src/cross_section_measurement/02_unfold_and_measure.py -c 7 -v ST &> logs/ST_unfold_7TeV.log &
-    python src/cross_section_measurement/02_unfold_and_measure.py -c 7 -v MT &> logs/MT_unfold_7TeV.log &
-    python src/cross_section_measurement/02_unfold_and_measure.py -c 7 -v WPT &> logs/WPT_unfold_7TeV.log &
+    echo "This will take a whil	e ... grab a coffee/tea/water"
+    mkdir -p logs
+    fit_var="absolute_eta,M3,angle_bl"
+    nice_fit_var=`echo $fit_var | sed 's/,/_/g'`
+    N_JOBS=4
+    echo "Using the fit variable(s): $fit_var"
+    i=0
+    for var in MET HT ST MT WPT; do
+    	echo "Unfolding distribution: $var"
+    	nohup time python src/cross_section_measurement/02_unfold_and_measure.py -v $var -c 7 -p data/$nice_fit_var &> logs/${var}_unfold_7TeV_${nice_fit_var}.log &
+    	let i+=1
+    	nohup time python src/cross_section_measurement/02_unfold_and_measure.py -v $var -c 8 -p data/$nice_fit_var &> logs/${var}_unfold_8TeV_${nice_fit_var}.log &
+    	let i+=1
+    	if (( $i % N_JOBS == 0 ))
+    	then
+    		echo "Waiting on the above to finish."
+        	wait;
+    	fi
+    done
+    echo "All done! Time to run x_03_all_vars."

bin/x_03_all_vars

-Original file line number
+Diff line change
@@ -1,12 +1,24 @@
     #!/bin/bash
-    python src/cross_section_measurement/03_calculate_systematics.py -s &> logs/MET_calculate_8TeV.log &
-    python src/cross_section_measurement/03_calculate_systematics.py -s -v HT &> logs/HT_calculate_8TeV.log &
-    python src/cross_section_measurement/03_calculate_systematics.py -s -v ST &> logs/ST_calculate_8TeV.log &
-    python src/cross_section_measurement/03_calculate_systematics.py -s -v MT &> logs/MT_calculate_8TeV.log &
-    python src/cross_section_measurement/03_calculate_systematics.py -s -v WPT &> logs/WPT_calculate_8TeV.log &
-    # 7 TeV
-    python src/cross_section_measurement/03_calculate_systematics.py -c 7 -s &> logs/MET_calculate_7TeV.log &
-    python src/cross_section_measurement/03_calculate_systematics.py -c 7 -s -v HT &> logs/HT_calculate_7TeV.log &
-    python src/cross_section_measurement/03_calculate_systematics.py -c 7 -s -v ST &> logs/ST_calculate_7TeV.log &
-    python src/cross_section_measurement/03_calculate_systematics.py -c 7 -s -v MT &> logs/MT_calculate_7TeV.log &
-    python src/cross_section_measurement/03_calculate_systematics.py -c 7 -s -v WPT &> logs/WPT_calculate_7TeV.log &
+    echo "This will take a whil	e ... grab a coffee/tea/water"
+    mkdir -p logs
+    fit_var="absolute_eta,M3,angle_bl"
+    nice_fit_var=`echo $fit_var | sed 's/,/_/g'`
+    N_JOBS=4
+    echo "Using the fit variable(s): $fit_var"
+    i=0
+    for var in MET HT ST MT 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/$nice_fit_var &> logs/${var}_calculate_7TeV_${nice_fit_var}.log &
+    	let i+=1
+    	nohup time python src/cross_section_measurement/03_calculate_systematics.py -s -v $var -c 8 -p data/$nice_fit_var &> logs/${var}_calculate_8TeV_${nice_fit_var}.log &
+    	let i+=1
+    	if (( $i % N_JOBS == 0 ))
+    	then
+    		echo "Waiting on the above to finish."
+        	wait;
+    	fi
+    done
+    echo "All done! Time to run x_04_all_vars and x_04_all_vars."

bin/x_04_all_vars

-Original file line number
+Diff line change
@@ -1,13 +1,25 @@
     #!/bin/bash
+    echo "This will take a whil	e ... grab a coffee/tea/water"
+    mkdir -p logs
     mkdir -p plots
-    python src/cross_section_measurement/04_make_plots_matplotlib.py &> logs/MET_plot_8TeV.log &
-    python src/cross_section_measurement/04_make_plots_matplotlib.py -v HT &> logs/HT_plot_8TeV.log &
-    python src/cross_section_measurement/04_make_plots_matplotlib.py -v ST &> logs/ST_plot_8TeV.log &
-    python src/cross_section_measurement/04_make_plots_matplotlib.py -v MT &> logs/MT_plot_8TeV.log &
-    python src/cross_section_measurement/04_make_plots_matplotlib.py -v WPT &> logs/WPT_plot_8TeV.log &
-    # 7 TeV
-    python src/cross_section_measurement/04_make_plots_matplotlib.py -c 7 &> logs/MET_plot_7TeV.log &
-    python src/cross_section_measurement/04_make_plots_matplotlib.py -c 7 -v HT &> logs/HT_plot_7TeV.log &
-    python src/cross_section_measurement/04_make_plots_matplotlib.py -c 7 -v ST &> logs/ST_plot_7TeV.log &
-    python src/cross_section_measurement/04_make_plots_matplotlib.py -c 7 -v MT &> logs/MT_plot_7TeV.log &
-    python src/cross_section_measurement/04_make_plots_matplotlib.py -c 7 -v WPT &> logs/WPT_plot_7TeV.log &
+    fit_var="absolute_eta,M3,angle_bl"
+    nice_fit_var=`echo $fit_var | sed 's/,/_/g'`
+    N_JOBS=4
+    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 &> logs/${var}_plot_7TeV_${nice_fit_var}.log &
+    	let i+=1
+    	nohup time python src/cross_section_measurement/04_make_plots_matplotlib.py -v $var -c 8 -p data/$nice_fit_var &> logs/${var}_plot_8TeV_${nice_fit_var}.log &
+    	let i+=1
+    	if (( $i % N_JOBS == 0 ))
+    	then
+    		echo "Waiting on the above to finish."
+        	wait;
+    	fi
+    done
+    echo "All done!"

bin/x_05_all_vars

-Original file line number
+Diff line change
@@ -1,12 +1,25 @@
     #!/bin/bash
-    python src/cross_section_measurement/05_make_tables.py &> logs/MET_table_8TeV.log &
-    python src/cross_section_measurement/05_make_tables.py -v HT &> logs/HT_table_8TeV.log &
-    python src/cross_section_measurement/05_make_tables.py -v ST &> logs/ST_table_8TeV.log &
-    python src/cross_section_measurement/05_make_tables.py -v MT &> logs/MT_table_8TeV.log &
-    python src/cross_section_measurement/05_make_tables.py -v WPT &> logs/WPT_table_8TeV.log &
-    # 7 TeV
-    python src/cross_section_measurement/05_make_tables.py -c 7 &> logs/MET_table_7TeV.log &
-    python src/cross_section_measurement/05_make_tables.py -c 7 -v HT &> logs/HT_table_7TeV.log &
-    python src/cross_section_measurement/05_make_tables.py -c 7 -v ST &> logs/ST_table_7TeV.log &
-    python src/cross_section_measurement/05_make_tables.py -c 7 -v MT &> logs/MT_table_7TeV.log &
-    python src/cross_section_measurement/05_make_tables.py -c 7 -v WPT &> logs/WPT_table_7TeV.log &
+    echo "This will take a whil	e ... grab a coffee/tea/water"
+    mkdir -p logs
+    mkdir -p plots
+    fit_var="absolute_eta,M3,angle_bl"
+    nice_fit_var=`echo $fit_var | sed 's/,/_/g'`
+    N_JOBS=4
+    echo "Using the fit variable(s): $fit_var"
+    i=0
+    for var in MET HT ST MT 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/$nice_fit_var &> logs/${var}_table_7TeV_${nice_fit_var}.log &
+    	let i+=1
+    	nohup time python src/cross_section_measurement/05_make_tables.py -v $var -c 8 -p data/$nice_fit_var &> logs/${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
+    echo "All done!"

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Multi variable fitting #96

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!