Skip to content

Commit abf2959

Browse files
kreczkokreczko
committed
Merge pull request #163 from kreczko/updated-commands
Updated commands
2 parents c4e8feb + 58e5b7c commit abf2959

File tree

10 files changed

+83
-17
lines changed

10 files changed

+83
-17
lines changed

‎bin/x_01_all_vars‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ echo "This will take a while ... grab a coffee/tea/water/cocktail"
33
mkdir -p logs
44
fit_var="absolute_eta,M3,angle_bl"
55
nice_fit_var=`echo $fit_var | sed 's/,/_/g'`
6-
N_JOBS=5
6+
N_JOBS=8
77

88
echo "Using the fit variable(s): $fit_var"
99

@@ -12,6 +12,12 @@ for var in MET HT ST WPT MT; do
1212
echo "Fitting distribution: $var"
1313
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 &
1414
let i+=1
15+
if (( $i % N_JOBS == 0 ))
16+
then
17+
echo "Waiting on the above to finish."
18+
wait;
19+
fi
20+
1521
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 &
1622
let i+=1
1723
if (( $i % N_JOBS == 0 ))
@@ -21,4 +27,5 @@ for var in MET HT ST WPT MT; do
2127
fi
2228
done
2329

30+
wait;
2431
echo "All done! Time to run x_02_all_vars."

‎bin/x_02_all_vars‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ echo "This will take a while ... grab a coffee/tea/water"
33
mkdir -p logs
44
fit_var="absolute_eta,M3,angle_bl"
55
nice_fit_var=`echo $fit_var | sed 's/,/_/g'`
6-
N_JOBS=5
6+
N_JOBS=8
77

88
echo "Using the fit variable(s): $fit_var"
99

@@ -12,6 +12,12 @@ for var in MET HT ST MT WPT; do
1212
echo "Unfolding distribution: $var"
1313
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 &
1414
let i+=1
15+
if (( $i % N_JOBS == 0 ))
16+
then
17+
echo "Waiting on the above to finish."
18+
wait;
19+
fi
20+
1521
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 &
1622
let i+=1
1723
if (( $i % N_JOBS == 0 ))
@@ -20,5 +26,6 @@ for var in MET HT ST MT WPT; do
2026
wait;
2127
fi
2228
done
29+
2330
wait;
2431
echo "All done! Time to run x_03_all_vars."

‎bin/x_03_all_vars‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ echo "This will take a while ... grab a coffee/tea/water"
33
mkdir -p logs
44
fit_var="absolute_eta,M3,angle_bl"
55
nice_fit_var=`echo $fit_var | sed 's/,/_/g'`
6-
N_JOBS=5
6+
N_JOBS=8
77

88
echo "Using the fit variable(s): $fit_var"
99

@@ -12,6 +12,12 @@ for var in MET HT ST MT WPT; do
1212
echo "Calculating diff. x-section for distribution: $var"
1313
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 &
1414
let i+=1
15+
if (( $i % N_JOBS == 0 ))
16+
then
17+
echo "Waiting on the above to finish."
18+
wait;
19+
fi
20+
1521
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 &
1622
let i+=1
1723
if (( $i % N_JOBS == 0 ))

‎bin/x_04_all_vars‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,22 @@ mkdir -p logs
44
mkdir -p plots
55
fit_var="absolute_eta,M3,angle_bl"
66
nice_fit_var=`echo $fit_var | sed 's/,/_/g'`
7-
N_JOBS=5
7+
N_JOBS=8
88

99
echo "Using the fit variable(s): $fit_var"
1010

1111
i=0
1212
for var in MET HT ST MT WPT; do
1313
echo "Plotting diff. x-section for distribution: $var"
14-
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 &
14+
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
1515
let i+=1
16-
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 &
16+
if (( $i % N_JOBS == 0 ))
17+
then
18+
echo "Waiting on the above to finish."
19+
wait;
20+
fi
21+
22+
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
1723
let i+=1
1824
if (( $i % N_JOBS == 0 ))
1925
then

‎bin/x_05_all_vars‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,22 @@ mkdir -p logs
44
mkdir -p plots
55
fit_var="absolute_eta,M3,angle_bl"
66
nice_fit_var=`echo $fit_var | sed 's/,/_/g'`
7-
N_JOBS=5
7+
N_JOBS=8
88

99
echo "Using the fit variable(s): $fit_var"
1010

1111
i=0
1212
for var in MET HT ST MT WPT; do
1313
echo "Tabulating diff. x-section for distribution: $var"
14-
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 &
14+
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 &
1515
let i+=1
16-
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 &
16+
if (( $i % N_JOBS == 0 ))
17+
then
18+
echo "Waiting on the above to finish."
19+
wait;
20+
fi
21+
22+
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 &
1723
let i+=1
1824
if (( $i % N_JOBS == 0 ))
1925
then

‎bin/x_98_all_vars‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ mkdir -p logs
44
mkdir -p plots
55
fit_var="absolute_eta,M3,angle_bl"
66
nice_fit_var=`echo $fit_var | sed 's/,/_/g'`
7-
N_JOBS=5
7+
N_JOBS=8
88

99
echo "Using the fit variable(s): $fit_var"
1010

@@ -13,6 +13,12 @@ for var in MET HT ST WPT MT; do
1313
echo "Plotting fit correlations for distribution: $var"
1414
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 &
1515
let i+=1
16+
if (( $i % N_JOBS == 0 ))
17+
then
18+
echo "Waiting on the above to finish."
19+
wait;
20+
fi
21+
1622
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 &
1723
let i+=1
1824
if (( $i % N_JOBS == 0 ))
@@ -21,6 +27,8 @@ for var in MET HT ST WPT MT; do
2127
wait;
2228
fi
2329
done
30+
31+
wait;
2432
echo "98_fit_cross_checks all done!"
2533

2634
# For this check, fit results for all combinations of fit variables are needed. Uncomment manually before running.

‎bin/x_99_QCD_cross_checks‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,25 @@ mkdir -p logs
44
mkdir -p plots
55
fit_var="absolute_eta,M3,angle_bl"
66
nice_fit_var=`echo $fit_var | sed 's/,/_/g'`
7-
N_JOBS=5
7+
N_JOBS=8
88

99
i=0
1010
echo "Making 99_QCD_cross_checks plots"
1111
nohup time python src/cross_section_measurement/99_QCD_cross_checks.py -e 7 &> logs/99_QCD_cross_checks_7TeV.log &
1212
let i+=1
13+
if (( $i % N_JOBS == 0 ))
14+
then
15+
echo "Waiting on the above to finish."
16+
wait;
17+
fi
18+
1319
nohup time python src/cross_section_measurement/99_QCD_cross_checks.py -e 8 &> logs/99_QCD_cross_checks_8TeV.log &
1420
let i+=1
1521
if (( $i % N_JOBS == 0 ))
1622
then
1723
echo "Waiting on the above to finish."
1824
wait;
1925
fi
26+
27+
wait;
2028
echo "99_QCD_cross_checks all done!"

‎bin/x_make_binning_plots‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,25 @@ mkdir -p logs
44
mkdir -p plots
55
fit_var="absolute_eta,M3,angle_bl"
66
nice_fit_var=`echo $fit_var | sed 's/,/_/g'`
7-
N_JOBS=5
7+
N_JOBS=8
88

99
i=0
1010
echo "Making binning plots"
1111
nohup time python src/cross_section_measurement/make_binning_plots.py -c 7 &> logs/make_binning_plots_7TeV.log &
1212
let i+=1
13+
if (( $i % N_JOBS == 0 ))
14+
then
15+
echo "Waiting on the above to finish."
16+
wait;
17+
fi
18+
1319
nohup time python src/cross_section_measurement/make_binning_plots.py -c 8 &> logs/make_binning_plots_8TeV.log &
1420
let i+=1
15-
if (( $i % N_JOBS == 0 ))
21+
if (( $i % N_JOBS == 0 ))
1622
then
1723
echo "Waiting on the above to finish."
1824
wait;
1925
fi
26+
27+
wait;
2028
echo "make_binning_plots all done!"

‎bin/x_make_control_plots‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,25 @@ mkdir -p logs
44
mkdir -p plots
55
fit_var="absolute_eta,M3,angle_bl"
66
nice_fit_var=`echo $fit_var | sed 's/,/_/g'`
7-
N_JOBS=5
7+
N_JOBS=8
88

99
i=0
1010
echo "Making control plots"
1111
nohup time python src/cross_section_measurement/make_control_plots.py -c 7 &> logs/make_control_plots_7TeV.log &
1212
let i+=1
13+
if (( $i % N_JOBS == 0 ))
14+
then
15+
echo "Waiting on the above to finish."
16+
wait;
17+
fi
18+
1319
nohup time python src/cross_section_measurement/make_control_plots.py -c 8 &> logs/make_control_plots_8TeV.log &
1420
let i+=1
15-
if (( $i % N_JOBS == 0 ))
21+
if (( $i % N_JOBS == 0 ))
1622
then
1723
echo "Waiting on the above to finish."
1824
wait;
1925
fi
26+
27+
wait;
2028
echo "make_control_plots all done!"

‎bin/x_make_fit_variable_plots‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,19 @@ mkdir -p logs
44
mkdir -p plots
55
fit_var="absolute_eta,M3,angle_bl"
66
nice_fit_var=`echo $fit_var | sed 's/,/_/g'`
7-
N_JOBS=5
7+
N_JOBS=8
88

99
i=0
1010
echo "Making fit variable plots"
1111
nohup time python src/cross_section_measurement/make_fit_variable_plots.py -c 7 &> logs/make_fit_variable_plots_7TeV.log &
1212
let i+=1
1313
nohup time python src/cross_section_measurement/make_fit_variable_plots.py -c 8 &> logs/make_fit_variable_plots_8TeV.log &
1414
let i+=1
15-
if (( $i % N_JOBS == 0 ))
15+
if (( $i % N_JOBS == 0 ))
1616
then
1717
echo "Waiting on the above to finish."
1818
wait;
1919
fi
20+
21+
wait;
2022
echo "make_fit_variable_plots all done!"

0 commit comments

Comments
 (0)