Merge branch 'master' into more_hh2bbvv_updates

cmsdb/campaigns/run3_2022_preEE_nano_uhh_v12/hh2bbtautau.py

@@ -246,9 +246,9 @@
 )
 
 cpn.add_dataset(
-    name="hh_vbf_hbb_htt_kvm0p012_k2v0p030_kl10p2_madgraph",
+    name="hh_vbf_hbb_htt_kvm0p012_k2v0p03_kl10p2_madgraph",
     id=14874480,
-    processes=[procs.hh_vbf_hbb_htt_kvm0p012_k2v0p030_kl10p2],
+    processes=[procs.hh_vbf_hbb_htt_kvm0p012_k2v0p03_kl10p2],
     keys=[
         "/VBFHHto2B2Tau_CV-m0p012_C2V-0p030_C3-10p2_TuneCP5_13p6TeV_madgraph-pythia8/Run3Summer22MiniAODv4_NanoAODv12UHH-130X_mcRun3_2022_realistic_v5-v2/NANOAODSIM",  # noqa
     ],
@@ -310,9 +310,9 @@
 )
 
 cpn.add_dataset(
-    name="hh_vbf_hbb_htt_kvm1p60_k2v2p72_klm1p36_madgraph",
+    name="hh_vbf_hbb_htt_kvm1p6_k2v2p72_klm1p36_madgraph",
     id=14870882,
-    processes=[procs.hh_vbf_hbb_htt_kvm1p60_k2v2p72_klm1p36],
+    processes=[procs.hh_vbf_hbb_htt_kvm1p6_k2v2p72_klm1p36],
     keys=[
         "/VBFHHto2B2Tau_CV-m1p60_C2V-2p72_C3-m1p36_TuneCP5_13p6TeV_madgraph-pythia8/Run3Summer22MiniAODv4_NanoAODv12UHH-130X_mcRun3_2022_realistic_v5-v2/NANOAODSIM",  # noqa
     ],

cmsdb/processes/hh.py

@@ -36,9 +36,9 @@
     "hh_ggf_kl1_kt1_c23", "hh_ggf_kl1_kt1_c2m2",
     "hh_vbf", "hh_vbf_kv1_k2v1_kl1", "hh_vbf_kv1_k2v1_kl0", "hh_vbf_kv1_k2v1_kl2",
     "hh_vbf_kv1_k2v0_kl1", "hh_vbf_kv1_k2v2_kl1", "hh_vbf_kv0p5_k2v1_kl1", "hh_vbf_kv1p5_k2v1_kl1",
-    "hh_vbf_kv1p74_k2v1p37_kl14p4", "hh_vbf_kvm0p012_k2v0p030_kl10p2",
+    "hh_vbf_kv1p74_k2v1p37_kl14p4", "hh_vbf_kvm0p012_k2v0p03_kl10p2",
     "hh_vbf_kvm0p758_k2v1p44_klm19p3", "hh_vbf_kvm0p962_k2v0p959_klm1p43",
-    "hh_vbf_kvm1p21_k2v1p94_klm0p94", "hh_vbf_kvm1p60_k2v2p72_klm1p36",
+    "hh_vbf_kvm1p21_k2v1p94_klm0p94", "hh_vbf_kvm1p6_k2v2p72_klm1p36",
     "hh_vbf_kvm1p83_k2v3p57_klm3p39", "hh_vbf_kvm2p12_k2v3p87_klm5p96",
     "radion_hh_ggf", "graviton_hh_ggf",
     "radion_hh_vbf", "graviton_hh_vbf",
@@ -301,8 +301,8 @@
     aux={"production_mode_parent": hh_vbf},
 )
 
-hh_vbf_kvm0p012_k2v0p030_kl10p2 = hh_vbf.add_process(
-    name="hh_vbf_kvm0p012_k2v0p030_kl10p2",
+hh_vbf_kvm0p012_k2v0p03_kl10p2 = hh_vbf.add_process(
+    name="hh_vbf_kvm0p012_k2v0p03_kl10p2",
     id=22009,
     xsecs={
         # no 13p0TeV sample generated, but we could use the scaling formula in the hh tools
@@ -345,8 +345,8 @@
     aux={"production_mode_parent": hh_vbf},
 )
 
-hh_vbf_kvm1p60_k2v2p72_klm1p36 = hh_vbf.add_process(
-    name="hh_vbf_kvm1p60_k2v2p72_klm1p36",
+hh_vbf_kvm1p6_k2v2p72_klm1p36 = hh_vbf.add_process(
+    name="hh_vbf_kvm1p6_k2v2p72_klm1p36",
     id=22013,
     xsecs={
         # no 13p0TeV sample generated, but we could use the scaling formula in the hh tools

cmsdb/processes/hh2bbtautau.py

@@ -51,9 +51,9 @@
     "graviton_hh_ggf_hbb_htt_m5000",
     "hh_vbf_hbb_htt_kv1_k2v1_kl1", "hh_vbf_hbb_htt_kv1_k2v0_kl1", "hh_vbf_hbb_htt_kv1_k2v1_kl2",
     "hh_vbf_hbb_htt_kv1_k2v2_kl1", "hh_vbf_hbb_htt_kv1p74_k2v1p37_kl14p4",
-    "hh_vbf_hbb_htt_kvm0p012_k2v0p030_kl10p2", "hh_vbf_hbb_htt_kvm0p758_k2v1p44_klm19p3",
+    "hh_vbf_hbb_htt_kvm0p012_k2v0p03_kl10p2", "hh_vbf_hbb_htt_kvm0p758_k2v1p44_klm19p3",
     "hh_vbf_hbb_htt_kvm0p962_k2v0p959_klm1p43", "hh_vbf_hbb_htt_kvm1p21_k2v1p94_klm0p94",
-    "hh_vbf_hbb_htt_kvm1p60_k2v2p72_klm1p36", "hh_vbf_hbb_htt_kvm1p83_k2v3p57_klm3p39",
+    "hh_vbf_hbb_htt_kvm1p6_k2v2p72_klm1p36", "hh_vbf_hbb_htt_kvm1p83_k2v3p57_klm3p39",
     "hh_vbf_hbb_htt_kvm2p12_k2v3p87_klm5p96",
     "radion_hh_vbf_hbb_htt",
     "radion_hh_vbf_hbb_htt_m250", "radion_hh_vbf_hbb_htt_m260", "radion_hh_vbf_hbb_htt_m270",
@@ -90,9 +90,9 @@
     hh_ggf_kl1_kt1_c2m2, hh_ggf_kl2p45_kt1, hh_ggf_kl5_kt1,
     hh_vbf_kv1_k2v1_kl1, hh_vbf_kv1_k2v0_kl1, hh_vbf_kv1_k2v1_kl2,
     hh_vbf_kv1_k2v2_kl1, hh_vbf_kv1p74_k2v1p37_kl14p4,
-    hh_vbf_kvm0p012_k2v0p030_kl10p2, hh_vbf_kvm0p758_k2v1p44_klm19p3,
+    hh_vbf_kvm0p012_k2v0p03_kl10p2, hh_vbf_kvm0p758_k2v1p44_klm19p3,
     hh_vbf_kvm0p962_k2v0p959_klm1p43, hh_vbf_kvm1p21_k2v1p94_klm0p94,
-    hh_vbf_kvm1p60_k2v2p72_klm1p36, hh_vbf_kvm1p83_k2v3p57_klm3p39,
+    hh_vbf_kvm1p6_k2v2p72_klm1p36, hh_vbf_kvm1p83_k2v3p57_klm3p39,
     hh_vbf_kvm2p12_k2v3p87_klm5p96,
 )
 from cmsdb.xsec_bsm_nodes import calculate_xsec_node
@@ -782,11 +782,11 @@
     xsecs=multiply_xsecs(hh_vbf_kv1p74_k2v1p37_kl14p4, const.br_hh.bbtt),
 )
 
-hh_vbf_hbb_htt_kvm0p012_k2v0p030_kl10p2 = hh_vbf_kvm0p012_k2v0p030_kl10p2.add_process(
-    name="hh_vbf_hbb_htt_kvm0p012_k2v0p030_kl10p2",
+hh_vbf_hbb_htt_kvm0p012_k2v0p03_kl10p2 = hh_vbf_kvm0p012_k2v0p03_kl10p2.add_process(
+    name="hh_vbf_hbb_htt_kvm0p012_k2v0p03_kl10p2",
     id=22106,
-    label=r"$HH_{vbf} \rightarrow bb\tau\tau$ ($\kappa_{V}=-0.012$, $\kappa_{2V}=0.030$, $\kappa_{\lambda}=10.2$)",
-    xsecs=multiply_xsecs(hh_vbf_kvm0p012_k2v0p030_kl10p2, const.br_hh.bbtt),
+    label=r"$HH_{vbf} \rightarrow bb\tau\tau$ ($\kappa_{V}=-0.012$, $\kappa_{2V}=0.03$, $\kappa_{\lambda}=10.2$)",
+    xsecs=multiply_xsecs(hh_vbf_kvm0p012_k2v0p03_kl10p2, const.br_hh.bbtt),
 )
 
 hh_vbf_hbb_htt_kvm0p758_k2v1p44_klm19p3 = hh_vbf_kvm0p758_k2v1p44_klm19p3.add_process(
@@ -810,11 +810,11 @@
     xsecs=multiply_xsecs(hh_vbf_kvm1p21_k2v1p94_klm0p94, const.br_hh.bbtt),
 )
 
-hh_vbf_hbb_htt_kvm1p60_k2v2p72_klm1p36 = hh_vbf_kvm1p60_k2v2p72_klm1p36.add_process(
-    name="hh_vbf_hbb_htt_kvm1p60_k2v2p72_klm1p36",
+hh_vbf_hbb_htt_kvm1p6_k2v2p72_klm1p36 = hh_vbf_kvm1p6_k2v2p72_klm1p36.add_process(
+    name="hh_vbf_hbb_htt_kvm1p6_k2v2p72_klm1p36",
     id=22110,
-    label=r"$HH_{vbf} \rightarrow bb\tau\tau$ ($\kappa_{V}=-1.60$, $\kappa_{2V}=2.72$, $\kappa_{\lambda}=-1.36$)",
-    xsecs=multiply_xsecs(hh_vbf_kvm1p60_k2v2p72_klm1p36, const.br_hh.bbtt),
+    label=r"$HH_{vbf} \rightarrow bb\tau\tau$ ($\kappa_{V}=-1.6$, $\kappa_{2V}=2.72$, $\kappa_{\lambda}=-1.36$)",
+    xsecs=multiply_xsecs(hh_vbf_kvm1p6_k2v2p72_klm1p36, const.br_hh.bbtt),
 )
 
 hh_vbf_hbb_htt_kvm1p83_k2v3p57_klm3p39 = hh_vbf_kvm1p83_k2v3p57_klm3p39.add_process(