Merge pull request #163 from kreczko/updated-commands

Updated commands
BristolTopGroup · Jan 7, 2015 · abf2959 · abf2959
2 parents c4e8feb + 58e5b7c
commit abf2959
Show file tree

Hide file tree

Showing 10 changed files with 83 additions and 17 deletions.
diff --git a/bin/x_01_all_vars b/bin/x_01_all_vars
@@ -3,7 +3,7 @@ echo "This will take a while ... grab a coffee/tea/water/cocktail"
 mkdir -p logs
 fit_var="absolute_eta,M3,angle_bl"
 nice_fit_var=`echo $fit_var | sed 's/,/_/g'`
-N_JOBS=5
+N_JOBS=8
 
 echo "Using the fit variable(s): $fit_var"
 
@@ -12,6 +12,12 @@ 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/01_${var}_fit_7TeV_${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/01_get_fit_results.py -V -v $var --no_combined_signal -c 8 --fit-variables $fit_var &> logs/01_${var}_fit_8TeV_${nice_fit_var}.log &
 	let i+=1
 	if (( $i % N_JOBS == 0 ))
@@ -21,4 +27,5 @@ for var in MET HT ST WPT MT; do
 	fi
 done
 
+wait;
 echo "All done! Time to run x_02_all_vars."
diff --git a/bin/x_02_all_vars b/bin/x_02_all_vars
@@ -3,7 +3,7 @@ echo "This will take a while ... 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=5
+N_JOBS=8
 
 echo "Using the fit variable(s): $fit_var"
 
@@ -12,6 +12,12 @@ 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/02_${var}_unfold_7TeV_${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/02_unfold_and_measure.py -v $var -c 8 -p data/$nice_fit_var &> logs/02_${var}_unfold_8TeV_${nice_fit_var}.log &
 	let i+=1
 	if (( $i % N_JOBS == 0 ))
@@ -20,5 +26,6 @@ for var in MET HT ST MT WPT; do
     	wait;
 	fi
 done
+
 wait;
 echo "All done! Time to run x_03_all_vars."
diff --git a/bin/x_03_all_vars b/bin/x_03_all_vars
@@ -3,7 +3,7 @@ echo "This will take a while ... 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=5
+N_JOBS=8
 
 echo "Using the fit variable(s): $fit_var"
 
@@ -12,6 +12,12 @@ 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/03_${var}_calculate_7TeV_${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/03_calculate_systematics.py -s -v $var -c 8 -p data/$nice_fit_var &> logs/03_${var}_calculate_8TeV_${nice_fit_var}.log &
 	let i+=1
 	if (( $i % N_JOBS == 0 ))

diff --git a/bin/x_04_all_vars b/bin/x_04_all_vars
@@ -4,16 +4,22 @@ mkdir -p logs
 mkdir -p plots
 fit_var="absolute_eta,M3,angle_bl"
 nice_fit_var=`echo $fit_var | sed 's/,/_/g'`
-N_JOBS=5
+N_JOBS=8
 
 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/04_${var}_plot_7TeV_${nice_fit_var}.log &
+	nohup time python src/cross_section_measurement/04_make_plots_matplotlib.py -v $var -c 7 -p data/$nice_fit_var &> logs/04_${var}_plot_7TeV_${nice_fit_var}.log & #-a
 	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/04_${var}_plot_8TeV_${nice_fit_var}.log &
+	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 &> logs/04_${var}_plot_8TeV_${nice_fit_var}.log & #-a
 	let i+=1
 	if (( $i % N_JOBS == 0 ))
 	then

diff --git a/bin/x_05_all_vars b/bin/x_05_all_vars
@@ -4,16 +4,22 @@ mkdir -p logs
 mkdir -p plots
 fit_var="absolute_eta,M3,angle_bl"
 nice_fit_var=`echo $fit_var | sed 's/,/_/g'`
-N_JOBS=5
+N_JOBS=8
 
 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/05_${var}_table_7TeV_${nice_fit_var}.log &
+	nohup time python src/cross_section_measurement/05_make_tables.py -v $var -c 7 -p data/$nice_fit_var -a &> logs/05_${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/05_${var}_table_8TeV_${nice_fit_var}.log &
+	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 &> logs/05_${var}_table_8TeV_${nice_fit_var}.log &
 	let i+=1
 	if (( $i % N_JOBS == 0 ))
 	then

diff --git a/bin/x_98_all_vars b/bin/x_98_all_vars
@@ -4,7 +4,7 @@ mkdir -p logs
 mkdir -p plots
 fit_var="absolute_eta,M3,angle_bl"
 nice_fit_var=`echo $fit_var | sed 's/,/_/g'`
-N_JOBS=5
+N_JOBS=8
 
 echo "Using the fit variable(s): $fit_var"
 
@@ -13,6 +13,12 @@ for var in MET HT ST WPT MT; do
 	echo "Plotting fit correlations for distribution: $var"
 	nohup time python src/cross_section_measurement/98_fit_cross_checks.py -v $var -e 7 --fit-variables $fit_var &> logs/98_${var}_fit_cross_checks_7TeV_${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/98_fit_cross_checks.py -v $var -e 8 --fit-variables $fit_var &> logs/98_${var}_fit_cross_checks_8TeV_${nice_fit_var}.log &
 	let i+=1
 	if (( $i % N_JOBS == 0 ))
@@ -21,6 +27,8 @@ for var in MET HT ST WPT MT; do
     	wait;
 	fi
 done
+
+wait;
 echo "98_fit_cross_checks all done!"
 
 # For this check, fit results for all combinations of fit variables are needed. Uncomment manually before running.

diff --git a/bin/x_99_QCD_cross_checks b/bin/x_99_QCD_cross_checks
@@ -4,17 +4,25 @@ mkdir -p logs
 mkdir -p plots
 fit_var="absolute_eta,M3,angle_bl"
 nice_fit_var=`echo $fit_var | sed 's/,/_/g'`
-N_JOBS=5
+N_JOBS=8
 
 i=0
 echo "Making 99_QCD_cross_checks plots"
 nohup time python src/cross_section_measurement/99_QCD_cross_checks.py -e 7 &> logs/99_QCD_cross_checks_7TeV.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/99_QCD_cross_checks.py -e 8 &> logs/99_QCD_cross_checks_8TeV.log &
 let i+=1
 if (( $i % N_JOBS == 0 ))
 then
 	echo "Waiting on the above to finish."
    	wait;
 fi
+
+wait;
 echo "99_QCD_cross_checks all done!"
diff --git a/bin/x_make_binning_plots b/bin/x_make_binning_plots
@@ -4,17 +4,25 @@ mkdir -p logs
 mkdir -p plots
 fit_var="absolute_eta,M3,angle_bl"
 nice_fit_var=`echo $fit_var | sed 's/,/_/g'`
-N_JOBS=5
+N_JOBS=8
 
 i=0
 echo "Making binning plots"
 nohup time python src/cross_section_measurement/make_binning_plots.py -c 7 &> logs/make_binning_plots_7TeV.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/make_binning_plots.py -c 8 &> logs/make_binning_plots_8TeV.log &
 let i+=1
-if (( $i % N_JOBS == 0 ))
+	if (( $i % N_JOBS == 0 ))
 then
 	echo "Waiting on the above to finish."
    	wait;
 fi
+
+wait;
 echo "make_binning_plots all done!"
diff --git a/bin/x_make_control_plots b/bin/x_make_control_plots
@@ -4,17 +4,25 @@ mkdir -p logs
 mkdir -p plots
 fit_var="absolute_eta,M3,angle_bl"
 nice_fit_var=`echo $fit_var | sed 's/,/_/g'`
-N_JOBS=5
+N_JOBS=8
 
 i=0
 echo "Making control plots"
 nohup time python src/cross_section_measurement/make_control_plots.py -c 7 &> logs/make_control_plots_7TeV.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/make_control_plots.py -c 8 &> logs/make_control_plots_8TeV.log &
 let i+=1
-if (( $i % N_JOBS == 0 ))
+	if (( $i % N_JOBS == 0 ))
 then
 	echo "Waiting on the above to finish."
    	wait;
 fi
+
+wait;
 echo "make_control_plots all done!"
diff --git a/bin/x_make_fit_variable_plots b/bin/x_make_fit_variable_plots
@@ -4,17 +4,19 @@ mkdir -p logs
 mkdir -p plots
 fit_var="absolute_eta,M3,angle_bl"
 nice_fit_var=`echo $fit_var | sed 's/,/_/g'`
-N_JOBS=5
+N_JOBS=8
 
 i=0
 echo "Making fit variable plots"
 nohup time python src/cross_section_measurement/make_fit_variable_plots.py -c 7 &> logs/make_fit_variable_plots_7TeV.log &
 let i+=1
 nohup time python src/cross_section_measurement/make_fit_variable_plots.py -c 8 &> logs/make_fit_variable_plots_8TeV.log &
 let i+=1
-if (( $i % N_JOBS == 0 ))
+	if (( $i % N_JOBS == 0 ))
 then
 	echo "Waiting on the above to finish."
    	wait;
 fi
+
+wait;
 echo "make_fit_variable_plots all done!"