up

cmantill · Feb 21, 2024 · e0a8ca9 · e0a8ca9
1 parent 532df56
commit e0a8ca9
Show file tree

Hide file tree

Showing 17 changed files with 3,098 additions and 505 deletions.
diff --git a/binder/combine.ipynb b/binder/combine.ipynb
diff --git a/binder/hists_plots.ipynb b/binder/hists_plots.ipynb
diff --git a/combine/config_make_templates_diffbins.yaml b/combine/config_make_templates_diffbins.yaml
@@ -18,7 +18,7 @@ regions_massbins:
     "VBF97": 20
     "ggF975pt250to300": 10
     "ggF975pt300to450": 10
-    "ggF975pt450toInf": 10
+    "ggF975pt450toInf": 20
 
     "WJetsCR": 10
     "TopCR": 10

diff --git a/combine/make_templates.py b/combine/make_templates.py
@@ -176,12 +176,32 @@ def get_templates(years, channels, samples, samples_dir, regions_sel, model_path
 
             for sample in os.listdir(samples_dir[year]):
 
-                for key in utils.combine_samples:
+                if "WJetsToLNu_1J" in sample:
+                    print(f"Skipping sample {sample}")
+                    continue
+                if "WJetsToLNu_2J" in sample:
+                    print(f"Skipping sample {sample}")
+                    continue
+
+                if "VBFHToWWToLNuQQ_" in sample:
+                    print(f"Skipping sample {sample}")
+                    continue
+
+                # first: check if the sample is in one of combine_samples_by_name
+                sample_to_use = None
+                for key in utils.combine_samples_by_name:
                     if key in sample:
-                        sample_to_use = utils.combine_samples[key]
+                        sample_to_use = utils.combine_samples_by_name[key]
                         break
-                    else:
-                        sample_to_use = sample
+
+                # second: if not, combine under common label
+                if sample_to_use is None:
+                    for key in utils.combine_samples:
+                        if key in sample:
+                            sample_to_use = utils.combine_samples[key]
+                            break
+                        else:
+                            sample_to_use = sample
 
                 if sample_to_use not in samples:
                     continue

diff --git a/combine/make_templates_diffbins.py b/combine/make_templates_diffbins.py
@@ -175,12 +175,32 @@ def get_templates(years, channels, samples, samples_dir, regions_sel, regions_ma
 
                 for sample in os.listdir(samples_dir[year]):
 
-                    for key in utils.combine_samples:
+                    if "WJetsToLNu_1J" in sample:
+                        print(f"Skipping sample {sample}")
+                        continue
+                    if "WJetsToLNu_2J" in sample:
+                        print(f"Skipping sample {sample}")
+                        continue
+
+                    if "VBFHToWWToLNuQQ_" in sample:
+                        print(f"Skipping sample {sample}")
+                        continue
+
+                    # first: check if the sample is in one of combine_samples_by_name
+                    sample_to_use = None
+                    for key in utils.combine_samples_by_name:
                         if key in sample:
-                            sample_to_use = utils.combine_samples[key]
+                            sample_to_use = utils.combine_samples_by_name[key]
                             break
-                        else:
-                            sample_to_use = sample
+
+                    # second: if not, combine under common label
+                    if sample_to_use is None:
+                        for key in utils.combine_samples:
+                            if key in sample:
+                                sample_to_use = utils.combine_samples[key]
+                                break
+                            else:
+                                sample_to_use = sample
 
                     if sample_to_use not in samples:
                         continue

diff --git a/combine/templates/v6/hists_templates_Run2.pkl b/combine/templates/v6/hists_templates_Run2.pkl
diff --git a/combine/templates/v6/make_templates.py b/combine/templates/v6/make_templates.py
@@ -176,12 +176,32 @@ def get_templates(years, channels, samples, samples_dir, regions_sel, model_path
 
             for sample in os.listdir(samples_dir[year]):
 
-                for key in utils.combine_samples:
+                if "WJetsToLNu_1J" in sample:
+                    print(f"Skipping sample {sample}")
+                    continue
+                if "WJetsToLNu_2J" in sample:
+                    print(f"Skipping sample {sample}")
+                    continue
+
+                if "VBFHToWWToLNuQQ_" in sample:
+                    print(f"Skipping sample {sample}")
+                    continue
+
+                # first: check if the sample is in one of combine_samples_by_name
+                sample_to_use = None
+                for key in utils.combine_samples_by_name:
                     if key in sample:
-                        sample_to_use = utils.combine_samples[key]
+                        sample_to_use = utils.combine_samples_by_name[key]
                         break
-                    else:
-                        sample_to_use = sample
+
+                # second: if not, combine under common label
+                if sample_to_use is None:
+                    for key in utils.combine_samples:
+                        if key in sample:
+                            sample_to_use = utils.combine_samples[key]
+                            break
+                        else:
+                            sample_to_use = sample
 
                 if sample_to_use not in samples:
                     continue

diff --git a/combine/templates/v6/utils.py b/combine/templates/v6/utils.py
@@ -12,21 +12,22 @@
 
 warnings.filterwarnings("ignore", message="Found duplicate branch ")
 
-# (name of sample, name in templates)
-combine_samples = {
-    # data
-    "SingleElectron_": "Data",
-    "SingleMuon_": "Data",
-    "EGamma_": "Data",
-    # signal
+combine_samples_by_name = {
     "GluGluHToWW_Pt-200ToInf_M-125": "ggF",
     "VBFHToWWToAny_M-125_TuneCP5_withDipoleRecoil": "VBF",
-    # "VBFHToWWToLNuQQ_M-125_withDipoleRecoil": "VBF",
     "ttHToNonbb_M125": "ttH",
     "HWminusJ_HToWW_M-125": "WH",
     "HWplusJ_HToWW_M-125": "WH",
     "HZJ_HToWW_M-125": "ZH",
     "GluGluZH_HToWW_M-125_TuneCP5_13TeV-powheg-pythia8": "ZH",
+    "GluGluHToTauTau": "HTauTau",
+}
+
+combine_samples = {
+    # data
+    "SingleElectron_": "Data",
+    "SingleMuon_": "Data",
+    "EGamma_": "Data",
     # bkg
     "QCD_Pt": "QCD",
     "DYJets": "DYJets",
@@ -38,9 +39,10 @@
     "ZZ": "Diboson",
     "JetsToQQ": "WZQQ",
     "EWK": "EWKvjets",
-    # "GluGluHToTauTau": "HTauTau",  # TODO: check how many events
 }
 
+signals = ["VBF", "ggF"]
+
 # (name in templates, name in cards)
 labels = {
     # sigs

diff --git a/combine/templates/v7/hists_templates_Run2.pkl b/combine/templates/v7/hists_templates_Run2.pkl
diff --git a/combine/utils.py b/combine/utils.py
@@ -12,21 +12,22 @@
 
 warnings.filterwarnings("ignore", message="Found duplicate branch ")
 
-# (name of sample, name in templates)
-combine_samples = {
-    # data
-    "SingleElectron_": "Data",
-    "SingleMuon_": "Data",
-    "EGamma_": "Data",
-    # signal
+combine_samples_by_name = {
     "GluGluHToWW_Pt-200ToInf_M-125": "ggF",
     "VBFHToWWToAny_M-125_TuneCP5_withDipoleRecoil": "VBF",
-    # "VBFHToWWToLNuQQ_M-125_withDipoleRecoil": "VBF",
     "ttHToNonbb_M125": "ttH",
     "HWminusJ_HToWW_M-125": "WH",
     "HWplusJ_HToWW_M-125": "WH",
     "HZJ_HToWW_M-125": "ZH",
     "GluGluZH_HToWW_M-125_TuneCP5_13TeV-powheg-pythia8": "ZH",
+    "GluGluHToTauTau": "HTauTau",
+}
+
+combine_samples = {
+    # data
+    "SingleElectron_": "Data",
+    "SingleMuon_": "Data",
+    "EGamma_": "Data",
     # bkg
     "QCD_Pt": "QCD",
     "DYJets": "DYJets",
@@ -38,9 +39,10 @@
     "ZZ": "Diboson",
     "JetsToQQ": "WZQQ",
     "EWK": "EWKvjets",
-    # "GluGluHToTauTau": "HTauTau",  # TODO: check how many events
 }
 
+signals = ["VBF", "ggF"]
+
 # (name in templates, name in cards)
 labels = {
     # sigs

diff --git a/python/make_stacked_hists.py b/python/make_stacked_hists.py
@@ -107,12 +107,25 @@ def make_events_dict(
                     print(f"Skipping sample {sample}")
                     continue
 
-                for key in utils.combine_samples:
+                if "VBFHToWWToLNuQQ_" in sample:
+                    print(f"Skipping sample {sample}")
+                    continue
+
+                # first: check if the sample is in one of combine_samples_by_name
+                sample_to_use = None
+                for key in utils.combine_samples_by_name:
                     if key in sample:
-                        sample_to_use = utils.combine_samples[key]
+                        sample_to_use = utils.combine_samples_by_name[key]
                         break
-                    else:
-                        sample_to_use = sample
+
+                # second: if not, combine under common label
+                if sample_to_use is None:
+                    for key in utils.combine_samples:
+                        if key in sample:
+                            sample_to_use = utils.combine_samples[key]
+                            break
+                        else:
+                            sample_to_use = sample
 
                 if sample_to_use not in samples:
                     continue

diff --git a/python/utils.py b/python/utils.py
@@ -17,21 +17,23 @@
 
 warnings.filterwarnings("ignore", message="Found duplicate branch ")
 
-# (name of sample, name in templates)
-combine_samples = {
-    # data
-    "SingleElectron_": "Data",
-    "SingleMuon_": "Data",
-    "EGamma_": "Data",
-    # signal
+
+combine_samples_by_name = {
     "GluGluHToWW_Pt-200ToInf_M-125": "ggF",
     "VBFHToWWToAny_M-125_TuneCP5_withDipoleRecoil": "VBF",
-    # "VBFHToWWToLNuQQ_M-125_withDipoleRecoil": "VBF",
     "ttHToNonbb_M125": "ttH",
     "HWminusJ_HToWW_M-125": "WH",
     "HWplusJ_HToWW_M-125": "WH",
     "HZJ_HToWW_M-125": "ZH",
     "GluGluZH_HToWW_M-125_TuneCP5_13TeV-powheg-pythia8": "ZH",
+    "GluGluHToTauTau": "HTauTau",
+}
+
+combine_samples = {
+    # data
+    "SingleElectron_": "Data",
+    "SingleMuon_": "Data",
+    "EGamma_": "Data",
     # bkg
     "QCD_Pt": "QCD",
     "DYJets": "DYJets",
@@ -43,8 +45,8 @@
     "ZZ": "Diboson",
     "JetsToQQ": "WZQQ",
     "EWK": "EWKvjets",
-    "GluGluHToTauTau": "HTauTau",
 }
+
 signals = ["VBF", "ggF"]
 
 

diff --git a/python/utilsAN.py b/python/utilsAN.py
@@ -18,21 +18,22 @@
 warnings.filterwarnings("ignore", message="Found duplicate branch ")
 
 
-# (name of sample, name in templates)
-combine_samples = {
-    # data
-    "SingleElectron_": "Data",
-    "SingleMuon_": "Data",
-    "EGamma_": "Data",
-    # signal
+combine_samples_by_name = {
     "GluGluHToWW_Pt-200ToInf_M-125": "ggF",
     "VBFHToWWToAny_M-125_TuneCP5_withDipoleRecoil": "VBF",
-    # "VBFHToWWToLNuQQ_M-125_withDipoleRecoil": "VBF",
     "ttHToNonbb_M125": "ttH",
     "HWminusJ_HToWW_M-125": "WH",
     "HWplusJ_HToWW_M-125": "WH",
     "HZJ_HToWW_M-125": "ZH",
     "GluGluZH_HToWW_M-125_TuneCP5_13TeV-powheg-pythia8": "ZH",
+    "GluGluHToTauTau": "HTauTau",
+}
+
+combine_samples = {
+    # data
+    "SingleElectron_": "Data",
+    "SingleMuon_": "Data",
+    "EGamma_": "Data",
     # bkg
     "QCD_Pt": "QCD",
     "DYJets": "DYJets",
@@ -44,8 +45,8 @@
     "ZZ": "Diboson",
     "JetsToQQ": "WZQQ",
     "EWK": "EWKvjets",
-    # "GluGluHToTauTau": "HTauTau",
 }
+
 signals = ["VBF", "ggF"]
 
 

diff --git a/python/utilsCombine.py b/python/utilsCombine.py
@@ -18,21 +18,22 @@
 warnings.filterwarnings("ignore", message="Found duplicate branch ")
 
 
-# (name of sample, name in templates)
-combine_samples = {
-    # data
-    "SingleElectron_": "Data",
-    "SingleMuon_": "Data",
-    "EGamma_": "Data",
-    # signal
+combine_samples_by_name = {
     "GluGluHToWW_Pt-200ToInf_M-125": "ggF",
     "VBFHToWWToAny_M-125_TuneCP5_withDipoleRecoil": "VBF",
-    # "VBFHToWWToLNuQQ_M-125_withDipoleRecoil": "VBF",
     "ttHToNonbb_M125": "ttH",
     "HWminusJ_HToWW_M-125": "WH",
     "HWplusJ_HToWW_M-125": "WH",
     "HZJ_HToWW_M-125": "ZH",
     "GluGluZH_HToWW_M-125_TuneCP5_13TeV-powheg-pythia8": "ZH",
+    "GluGluHToTauTau": "HTauTau",
+}
+
+combine_samples = {
+    # data
+    "SingleElectron_": "Data",
+    "SingleMuon_": "Data",
+    "EGamma_": "Data",
     # bkg
     "QCD_Pt": "QCD",
     "DYJets": "DYJets",
@@ -44,10 +45,9 @@
     "ZZ": "Diboson",
     "JetsToQQ": "WZQQ",
     "EWK": "EWKvjets",
-    # "GluGluHToTauTau": "HTauTau",
 }
 
-signals = ["ggF", "VBF"]
+signals = ["VBF", "ggF"]
 
 
 def get_sum_sumgenweight(pkl_files, year, sample):