Merge branch 'master' into BTVbranch

cms-btv-pog · Nov 14, 2023 · 9e6e9cd · 9e6e9cd
2 parents 25cc257 + b124a69
commit 9e6e9cd
Show file tree

Hide file tree

Showing 5 changed files with 1,251 additions and 17 deletions.
diff --git a/.github/workflows/ttbar_workflow.yml b/.github/workflows/ttbar_workflow.yml
@@ -111,7 +111,6 @@ jobs:
         fi
         python runner.py --workflow ttsemilep_sf --json metadata/test_bta_run3.json --limit 1 --executor iterative --campaign Summer22Run3 $opts
     
-
 
     - name: btag dileptonic ttbar workflows with correctionlib
       run: |

diff --git a/README.md b/README.md
@@ -643,12 +643,17 @@ Yout can find the secret configuration in the direcotry : `Settings>>Secrets>>Ac
 - `GRID_USERCERT` & `GRID_USERKEY`:  Encrypt your grid user certification `base64 -i ~/.globus/userkey.pem | awk NF=NF RS= OFS=` and `base64 -i ~/.globus/usercert.pem | awk NF=NF RS= OFS=` and copy the output to the entry. 
 
 Special commit head messages could run different commands in actions (add the flag in front of your commit)
+The default configureation is doing 
+```
+python runner.py --workflow emctag_ttdilep_sf --json metadata/test_bta_run3.json --limit 1 --executor iterative --campaign Summer22Run3 --isArray --isSyst all
+```
 
 - `[skip ci]`: not running ci at all in the commit message
-- `[run array]` : add `--isArray` option
-- `[run syst all]` : add `--isSyst all`
-- `[run syst jerc]` : add `--isSyst JERC_split`
-- `[run syst wei]` : add `--isSyst weight_only`
+- `ci:skip array` : remove `--isArray` option
+- `ci:skip syst` : remove `--isSyst all` option
+- `ci:JERC_split` : change systematic option to split JERC uncertainty sources `--isSyst JERC_split`
+- `ci:weight_only` : change systematic option to weight only variations `--isSyst weight_only`
+
 
 ### Running jupyter remotely
 1. On your local machine, edit `.ssh/config`:

diff --git a/src/BTVNanoCommissioning/helpers/xs_scaler.py b/src/BTVNanoCommissioning/helpers/xs_scaler.py
@@ -3,6 +3,8 @@
 from coffea.processor import accumulate
 import os
 from BTVNanoCommissioning.helpers.xsection import xsection
+
+# from BTVNanoCommissioning.helpers.xsection_13TeV import xsection_13TeV
 import numpy as np
 
 
@@ -44,7 +46,10 @@ def scaleSumW(output, lumi):
                     if ("data" in sample) or ("Run" in sample) or ("Double" in sample):
                         h = h
                     else:
-                        raise KeyError(sample, "is not found in xsection.py")
+                        raise KeyError(
+                            sample,
+                            "is not found in xsection.py. If you're using 13TeV samples, please use xsection_13TeV.py",
+                        )
 
                 scaled[sample][key] = h
     return scaled

diff --git a/src/BTVNanoCommissioning/helpers/xsection.py b/src/BTVNanoCommissioning/helpers/xsection.py
@@ -1191,6 +1191,7 @@
         "energy": "13",
     },
     {
+
         "process_name": "DYJetsToLL_M-10to50_TuneCP5_13p6TeV-madgraphMLM-pythia8",
         "cross_section": "19317.5",
         "DAS": "/DYJetsToLL_M-10to50_TuneCP5_13p6TeV-madgraphMLM-pythia8/Run3Winter22NanoAOD-122X_mcRun3_2021_realistic_v9-v1/NANOAODSIM",
@@ -1199,7 +1200,7 @@
     },
     {
         "process_name": "DYJetsToLL_M-50_TuneCP5_13p6TeV-madgraphMLM-pythia8",
-        "cross_section": "6221.3",
+        "cross_section": "6346",
         "DAS": "/DYJetsToLL_M-50_TuneCP5_13p6TeV-madgraphMLM-pythia8/Run3Winter22NanoAOD-122X_mcRun3_2021_realistic_v9_ext1-v1/NANOAODSIM",
         "energy": "13.6",
         "comment": "from TOP-22-012",
@@ -1312,28 +1313,28 @@
     },
     {
         "process_name": "TTTo2J1L1Nu_CP5_13p6TeV_powheg-pythia8",
-        "cross_section": "404.0",
+        "cross_section": "422.3",
         "DAS": "/TTTo2J1L1Nu_CP5_13p6TeV_powheg-pythia8/Run3Winter22NanoAOD-122X_mcRun3_2021_realistic_v9-v1/NANOAODSIM",
         "energy": "13.6",
     },
     {
         "process_name": "TTToSemiLeptonic_TuneCP5_13p6TeV-powheg-pythia8",
-        "cross_section": "761.9",
+        "cross_section": "404.0",
         "DAS": "/TTToSemiLeptonic_TuneCP5_13p6TeV-powheg-pythia8/Run3Winter22NanoAOD-FlatPU0to70_pilot_122X_mcRun3_2021_realistic_v9-v1/NANOAODSIM",
         "energy": "13.6",
         "comment": "from GenXSecAnalyzer",
     },
     {
         "process_name": "TTtoLNu2Q_TuneCP5_13p6TeV_powheg-pythia8",
-        "cross_section": "761.9",
+        "cross_section": "404.0",
         "DAS": "/TTToSemiLeptonic_TuneCP5_13p6TeV-powheg-pythia8/Run3Winter22NanoAOD-FlatPU0to70_pilot_122X_mcRun3_2021_realistic_v9-v1/NANOAODSIM",
         "energy": "13.6",
         "comment": "from GenXSecAnalyzer",
     },
     {
         "id": "6420506329461764a903c1c9",
         "process_name": "TTto4Q_TuneCP5_13p6TeV_powheg-pythia8",
-        "cross_section": "762.1",
+        "cross_section": "422.3",
         "total_uncertainty": "0.1345",
         "accuracy": "NLO",
         "DAS": "/TTto4Q_TuneCP5_13p6TeV_powheg-pythia8/Run3Summer22MiniAODv3-124X_mcRun3_2022_realistic_v12-v4/MINIAODSIM",
@@ -1355,24 +1356,45 @@
         "energy": "13.6",
         "comment": "from TOP-22-012",
     },
+    {
+        "process_name": "WtoLNu-4Jets_1J_TuneCP5_13p6TeV_madgraphMLM-pythia8",
+        "cross_section": "9193",
+        "DAS": "/WtoLNu-4Jets_1J_TuneCP5_13p6TeV_madgraphMLM-pythia8/Run3Summer22NanoAODv11-126X_mcRun3_2022_realistic_v2-v2/NANOAODSIM",
+        "energy": "13.6",
+        "comment": "running genxsanalyzer",
+    },
+    {
+        "process_name": "WtoLNu-4Jets_2J_TuneCP5_13p6TeV_madgraphMLM-pythia8",
+        "cross_section": "2944",
+        "DAS": "/WtoLNu-4Jets_2J_TuneCP5_13p6TeV_madgraphMLM-pythia8/Run3Summer22NanoAODv11-126X_mcRun3_2022_realistic_v2-v2/NANOAODSIM",
+        "energy": "13.6",
+        "comment": "running genxsanalyzer",
+    },
+    {
+        "process_name": "WtoLNu-4Jets_3J_TuneCP5_13p6TeV_madgraphMLM-pythia8",
+        "cross_section": "868.2",
+        "DAS": "/WtoLNu-4Jets_3J_TuneCP5_13p6TeV_madgraphMLM-pythia8/Run3Summer22NanoAODv11-126X_mcRun3_2022_realistic_v2-v2/NANOAODSIM",
+        "energy": "13.6",
+        "comment": "running genxsanalyzer",
+    },
     {
         "process_name": "WW_TuneCP5_13p6TeV-pythia8",
-        "cross_section": "173.4",
-        "DAS": "/WW_TuneCP5_13p6TeV-pythia8/Run3Winter22MiniAOD-FlatPU0to70_122X_mcRun3_2021_realistic_v9-v2//NANOAODSIM",
+        "cross_section": "75.9",
+        "DAS": "/WW_TuneCP5_13p6TeV-pythia8/Run3Winter22MiniAOD-FlatPU0to70_122X_mcRun3_2021_realistic_v9-v2/NANOAODSIM",
         "energy": "13.6",
         "comment": "from TOP-22-012",
     },
     {
         "process_name": "WZ_TuneCP5_13p6TeV-pythia8",
-        "cross_section": "54.3",
-        "DAS": "/WZ_TuneCP5_13p6TeV-pythia8/Run3Winter22MiniAOD-FlatPU0to70_122X_mcRun3_2021_realistic_v9-v2//NANOAODSIM",
+        "cross_section": "27.6",
+        "DAS": "/WZ_TuneCP5_13p6TeV-pythia8/Run3Winter22MiniAOD-FlatPU0to70_122X_mcRun3_2021_realistic_v9-v2/NANOAODSIM",
         "energy": "13.6",
         "comment": "from TOP-22-012",
     },
     {
         "process_name": "ZZ_TuneCP5_13p6TeV-pythia8",
-        "cross_section": "16.7",
-        "DAS": "/ZZ_TuneCP5_13p6TeV-pythia8/Run3Winter22MiniAOD-FlatPU0to70_122X_mcRun3_2021_realistic_v9-v2//NANOAODSIM",
+        "cross_section": "12.17",
+        "DAS": "/ZZ_TuneCP5_13p6TeV-pythia8/Run3Winter22MiniAOD-FlatPU0to70_122X_mcRun3_2021_realistic_v9-v2/NANOAODSIM",
         "energy": "13.6",
         "comment": "from TOP-22-012",
     },
@@ -1717,6 +1739,16 @@
         "shower": "Pythia8",
         "MCM": "BTV-Run3Summer22MiniAODv3-00007",
     },
+    {
+        "id": "64204f9b29461764a903c08e",
+        "process_name": "QCD_Pt-120To170_MuEnrichedPt5_TuneCP5_13p6TeV_pythia8",
+        "cross_section": "22980.0",
+        "total_uncertainty": "215.1",
+        "accuracy": "unknown",
+        "DAS": "/QCD_Pt-120To170_MuEnrichedPt5_TuneCP5_13p6TeV_pythia8/Run3Summer22MiniAODv3-124X_mcRun3_2022_realistic_v12-v1/MINIAODSIM",
+        "equivalent_lumi": "0.04352",
+        "fraction_negative_weight": "0.0",
+    },
     {
         "DAS": "/QCD_PT-170to300_MuEnrichedPt5_TuneCP5_13p6TeV_pythia8/Run3Summer22MiniAODv3-124X_mcRun3_2022_realistic_v12-v1/MINIAODSIM",
         "comments": "Automatically computed",
-Original file line number
+Diff line change
@@ Expand Up / @@ -111,7 +111,6 @@ jobs: @@
             fi
             python runner.py --workflow ttsemilep_sf --json metadata/test_bta_run3.json --limit 1 --executor iterative --campaign Summer22Run3 $opts
         - name: btag dileptonic ttbar workflows with correctionlib
           run: |
@@ Expand Down @@