Merge branch easyjet:main into main

EasyjetHub/python/output/ttree/small_R_jets.py

@@ -105,6 +105,7 @@ def get_small_R_jet_branches(
                 "JVFCorr",
                 "NNJvt",
                 "NNJvtRpt",
+                "DFCommonJets_fJvt",
             ]
 
             if flags.Input.isMC:

EasyjetHub/python/output/ttree/truth_electrons.py

@@ -7,6 +7,6 @@ def get_truthelectron_branches(flags, input_container, output_prefix):
         output_prefix,
     )
 
-    truthelectron_branches.variables = ["px", "py", "pz", "e", "m", "charge"]
+    truthelectron_branches.variables = ["px", "py", "pz", "e", "m", "pdgId"]
 
     return truthelectron_branches.get_output_list()

EasyjetHub/python/output/ttree/truth_muons.py

@@ -7,6 +7,6 @@ def get_truthmuon_branches(flags, input_container, output_prefix):
         output_prefix,
     )
 
-    truthmuon_branches.variables = ["px", "py", "pz", "e", "m", "charge"]
+    truthmuon_branches.variables = ["px", "py", "pz", "e", "m", "pdgId"]
 
     return truthmuon_branches.get_output_list()

XbbCalib/share/RunConfig_Zll.yaml

@@ -2,6 +2,7 @@ include: EasyjetHub/base-config.yaml
 
 # Which analysis to consider
 do_ttbarCalib: false
+do_ZbbyCalib: false
 do_ZbbjCalib: false
 do_ZllCalib: true
 # We would use Alg in src/ZllCalibSelectionAlg

vbshiggsAnalysis/share/RunConfig-fullLep-syst_Set1.yaml

@@ -56,7 +56,7 @@ ttree_output:
       btag_info: false
 
     large_R_jets:
-      btag_details: false
+      btag_details: true
 
 CutList :
       - PASS_EXACTLY_TWO_LEPTONS

vbshiggsAnalysis/share/RunConfig-fullLep-syst_Set2.yaml

@@ -61,7 +61,7 @@ ttree_output:
       btag_info: false
 
     large_R_jets:
-      btag_details: false
+      btag_details: true
 
 CutList :
       - PASS_EXACTLY_TWO_LEPTONS