Mor17 DPS Updates

bin/x_04b_all_vars

@@ -15,7 +15,8 @@ i=0
 echo "Visible phase space"
 for var in MET HT ST WPT lepton_pt abs_lepton_eta NJets; do
 	echo "Plotting diff. x-section for distribution: $var"
-	nohup time python dps/analysis/xsection/04_make_plots_matplotlib.py --visiblePS --show-generator-ratio -v $var -c 13 -p data/normalisation/background_subtraction/ -o plots/background_subtraction &> logs/04_${var}_plot_Vis_13TeV.log & # -a  <--add this option for additional plots
+	# nohup time python dps/analysis/xsection/04_make_plots_matplotlib.py --visiblePS --show-generator-ratio -v $var -c 13 -p data/normalisation/background_subtraction/ -o plots/background_subtraction &> logs/04_${var}_plot_Vis_13TeV.log & # -a  <--add this option for additional plots
+	nohup time python dps/analysis/xsection/04_make_plots_matplotlib.py --visiblePS -v $var -c 13 -p data/normalisation/background_subtraction/ -o plots/background_subtraction &> logs/04_${var}_plot_Vis_13TeV.log & # -a  <--add this option for additional plots
 	let i+=1
 	shallIwait $i $N_JOBS
 done

bin/x_05b_all_vars

@@ -20,7 +20,7 @@ echo "Now visible phase space"
 
 for var in MET HT ST WPT lepton_pt abs_lepton_eta NJets; do
 	echo "Tabulating diff. x-section for distribution: $var"
-	nohup time python dps/analysis/xsection/05_make_tables.py -v $var -c 13 -p data/normalisation/background_subtraction/ -a --visiblePS -o tables/background_subtraction &> logs/05_${var}_table_13TeV.log &
+	nohup time python dps/analysis/xsection/05_make_systematic_plots.py -v $var --visiblePS &> logs/05_${var}_table_13TeV.log &
 	let i+=1
 	if (( $i % N_JOBS == 0 ))
 	then

dps/analysis/BLTUnfold/runJobsCrab.py

@@ -7,21 +7,45 @@
         '--centreOfMassEnergy 13 -f',
 
         '--centreOfMassEnergy 13 -s central',
+        # '--centreOfMassEnergy 13 -s central --topPtReweighting 1',
+        # '--centreOfMassEnergy 13 -s central --topPtReweighting -1',
+        # '--centreOfMassEnergy 13 -s central --topEtaReweighting 1',
+        # '--centreOfMassEnergy 13 -s central --topEtaReweighting -1',
 
         # '--centreOfMassEnergy 13 -s amcatnlo',
         # '--centreOfMassEnergy 13 -s madgraph',
         '--centreOfMassEnergy 13 -s powhegherwigpp',
         # # '--centreOfMassEnergy 13 -s amcatnloherwigpp',
 
-        # # ME scale weights
+        # Top pt
+        '--centreOfMassEnergy 13 -s topPtSystematic',
+
+        # Underlying event samples
+        '--centreOfMassEnergy 13 -s ueup',
+        '--centreOfMassEnergy 13 -s uedown',
+
+        # isr/fsr variations
+        '--centreOfMassEnergy 13 -s isrup',
+        '--centreOfMassEnergy 13 -s isrdown',
+        '--centreOfMassEnergy 13 -s fsrup',
+        '--centreOfMassEnergy 13 -s fsrdown',
+
+        # ME scale weights
         '--centreOfMassEnergy 13 --muFmuRWeight 1',
         '--centreOfMassEnergy 13 --muFmuRWeight 2',
         '--centreOfMassEnergy 13 --muFmuRWeight 3',
         '--centreOfMassEnergy 13 --muFmuRWeight 4',
         '--centreOfMassEnergy 13 --muFmuRWeight 6',
         '--centreOfMassEnergy 13 --muFmuRWeight 8',
 
-        # # # Top mass
+        '--centreOfMassEnergy 13 --alphaSWeight 0',
+        '--centreOfMassEnergy 13 --alphaSWeight 1',
+
+        # ME-PS matching weight
+        '--centreOfMassEnergy 13 --matchingWeight 9',
+        '--centreOfMassEnergy 13 --matchingWeight 18',
+
+        # # Top mass
         '--centreOfMassEnergy 13 -s massup',
         '--centreOfMassEnergy 13 -s massdown',
 

dps/analysis/BLTUnfold/submitBLTUnfold.description

@@ -15,4 +15,4 @@ request_memory=500
 # use the ENV that is provided
 getenv = true
 
-queue 138
+queue 142

dps/analysis/unfolding_tests/makeConfig.py → dps/analysis/unfolding_tests/00_makeConfig.py

@@ -3,11 +3,9 @@
 from dps.utils.file_utilities import make_folder_if_not_exists
 
 com = 13
-fitVars = "M3_angle_bl"
-
 config = XSectionConfig( com )
 
-make_folder_if_not_exists('config/unfolding/FullPS/')
+# make_folder_if_not_exists('config/unfolding/FullPS/')
 make_folder_if_not_exists('config/unfolding/VisiblePS/')
 
 for channel in config.analysis_types.keys():
@@ -48,7 +46,7 @@
 		histogramTemplate = "%s_%s" % ( variable, channel )
 		outputJson = {
 		    "output_folder": "plots/unfolding/bestRegularisation/VisiblePS", 
-		    "output_format": ["png", "pdf"], 
+		    "output_format": ["pdf"], 
 		    "centre-of-mass energy" : com,
 		    "channel": "%s" % channel,
 		    "variable": "%s" % variable,
@@ -66,7 +64,7 @@
 				# "histogram": "%s/measuredVis" % ( histogramTemplate ),
 				},
 			"data" : { 
-				"file": "data/normalisation/background_subtraction/%sTeV/%s/VisiblePS/central/normalisation_%s_patType1CorrectedPFMet.txt" % ( com, variable, channel),
+				"file": "data/normalisation/background_subtraction/%sTeV/%s/VisiblePS/central/normalisation_%s.txt" % ( com, variable, channel),
 				"histogram": "TTJet"
 				},
 			}