Run2 Process Xsecs (#26)

* added higgs processes and first di-higgs processes * corrected linting issues and some wrong parenthesses * added xsecs for top processes * checked units to be sure that everything is within pb and not fb * linting fix * replaced keys within xsec dictionary with ints * add cross sections ewk * fixed wrongly used numbers * added script to calculate di higgs benchmarks cross sections for hh-> bbtt nodes * moved script to calcualte xsecs for bsm nodes to cmsdb module * Added missing comment + linting * adjust module import for xsec_bsm_nodes module * fixes for TypeErrors * add logs and start correcting xsdb values to GenXSecAnalyzer values * correct cross sections from cmsdb to self-calculated with GenXSecAnalyzer * Delete all logs from GenXSecAnalyzer * correct log statements in ewk script * add branching ratios from new processes, correct process names in processes, need to be corrected in campaigns * correct names attributes in __all__ function in ewk * correct names processes and datasets in campaigns for homogeneity in names * linting and scaling DY when possible * fixed wrong relative uncerts * Add process tests. --------- Co-authored-by: haddadanas <[email protected]> Co-authored-by: Nathan Prouvost <[email protected]> Co-authored-by: nprouvost <[email protected]> Co-authored-by: Marcel Rieger <[email protected]> Co-authored-by: Marcel R <[email protected]>
uhh-cms · May 25, 2024 · 52379b1 · 52379b1
1 parent 1e9a816
commit 52379b1
Show file tree

Hide file tree

Showing 22 changed files with 1,182 additions and 501 deletions.
diff --git a/.github/workflows/lint_and_test.yaml b/.github/workflows/lint_and_test.yaml
@@ -27,24 +27,10 @@ jobs:
 
       - name: Lint 🔍
         run: |
-          flake8 cmsdb scripts
-
-  collect_dirs:
-    runs-on: ubuntu-latest
-    outputs:
-      dirs: ${{ steps.dirs.outputs.dirs }}
-    steps:
-      - uses: actions/checkout@v4
-      - id: dirs
-        run: echo "dirs=$(ls -d cmsdb/campaigns/*/ | jq --raw-input --slurp --compact-output 'split("\n")[:-1]')" >> ${GITHUB_OUTPUT}
-
+          flake8 cmsdb scripts tests
 
   test:
-    needs: collect_dirs
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        dir: ${{ fromJson(needs.collect_dirs.outputs.dirs) }}
     steps:
       - name: Checkout ⬇️
         uses: actions/checkout@v4
@@ -63,6 +49,4 @@ jobs:
           pip install -r requirements_dev.txt
 
       - name: Test Campaigns 🚦
-        run: python -m unittest tests/test_campaigns.py
-        env:
-          TESTMODULE: ${{ matrix.dir }}
+        run: python -m unittest tests
diff --git a/cmsdb/campaigns/run2_2016_HIPM_nano_uhh_v12/ewk.py b/cmsdb/campaigns/run2_2016_HIPM_nano_uhh_v12/ewk.py
@@ -89,9 +89,9 @@
 )
 
 cpn.add_dataset(
-    name="dy_lep_pt100To250_amcatnlo",
+    name="dy_lep_pt100to250_amcatnlo",
     id=14342843,
-    processes=[procs.dy_lep_pt100To250],
+    processes=[procs.dy_lep_pt100to250],
     keys=[
         "/DYJetsToLL_LHEFilterPtZ-100To250_MatchEWPDG20_TuneCP5_13TeV-amcatnloFXFX-pythia8/RunIISummer20UL16MiniAODAPVv2-106X_mcRun2_asymptotic_preVFP_v11_NanoAODv12UHH-v2/NANOAODSIM",  # noqa
     ],
@@ -100,9 +100,9 @@
 )
 
 cpn.add_dataset(
-    name="dy_lep_pt250To400_amcatnlo",
+    name="dy_lep_pt250to400_amcatnlo",
     id=14346965,
-    processes=[procs.dy_lep_pt250To400],
+    processes=[procs.dy_lep_pt250to400],
     keys=[
         "/DYJetsToLL_LHEFilterPtZ-250To400_MatchEWPDG20_TuneCP5_13TeV-amcatnloFXFX-pythia8/RunIISummer20UL16MiniAODAPVv2-106X_mcRun2_asymptotic_preVFP_v11_NanoAODv12UHH-v2/NANOAODSIM",  # noqa
     ],
@@ -111,9 +111,9 @@
 )
 
 cpn.add_dataset(
-    name="dy_lep_pt50To100_amcatnlo",
+    name="dy_lep_pt50to100_amcatnlo",
     id=14335914,
-    processes=[procs.dy_lep_pt50To100],
+    processes=[procs.dy_lep_pt50to100],
     keys=[
         "/DYJetsToLL_LHEFilterPtZ-50To100_MatchEWPDG20_TuneCP5_13TeV-amcatnloFXFX-pythia8/RunIISummer20UL16MiniAODAPVv2-106X_mcRun2_asymptotic_preVFP_v11_NanoAODv12UHH-v2/NANOAODSIM",  # noqa
     ],
@@ -122,9 +122,9 @@
 )
 
 cpn.add_dataset(
-    name="dy_lep_pt0To50_amcatnlo",
+    name="dy_lep_pt0to50_amcatnlo",
     id=14339864,
-    processes=[procs.dy_lep_pt0To50],
+    processes=[procs.dy_lep_pt0to50],
     keys=[
         "/DYJetsToLL_LHEFilterPtZ-0To50_MatchEWPDG20_TuneCP5_13TeV-amcatnloFXFX-pythia8/RunIISummer20UL16MiniAODAPVv2-106X_mcRun2_asymptotic_preVFP_v11_NanoAODv12UHH-v2/NANOAODSIM",  # noqa
     ],
@@ -144,9 +144,9 @@
 )
 
 cpn.add_dataset(
-    name="dy_lep_pt400To650_amcatnlo",
+    name="dy_lep_pt400to650_amcatnlo",
     id=14350490,
-    processes=[procs.dy_lep_pt400To650],
+    processes=[procs.dy_lep_pt400to650],
     keys=[
         "/DYJetsToLL_LHEFilterPtZ-400To650_MatchEWPDG20_TuneCP5_13TeV-amcatnloFXFX-pythia8/RunIISummer20UL16MiniAODAPVv2-106X_mcRun2_asymptotic_preVFP_v11_NanoAODv12UHH-v2/NANOAODSIM",  # noqa
     ],
@@ -281,9 +281,9 @@
 )
 
 cpn.add_dataset(
-    name="w_lnu_ht70To100_madgraph",
+    name="w_lnu_ht70to100_madgraph",
     id=14300594,
-    processes=[procs.w_lnu_ht70To100],
+    processes=[procs.w_lnu_ht70to100],
     keys=[
         "/WJetsToLNu_HT-70To100_TuneCP5_13TeV-madgraphMLM-pythia8/RunIISummer20UL16MiniAODAPVv2-106X_mcRun2_asymptotic_preVFP_v11_NanoAODv12UHH-v1/NANOAODSIM",  # noqa
     ],
@@ -292,9 +292,9 @@
 )
 
 cpn.add_dataset(
-    name="w_lnu_ht100To200_madgraph",
+    name="w_lnu_ht100to200_madgraph",
     id=14221276,
-    processes=[procs.w_lnu_ht100To200],
+    processes=[procs.w_lnu_ht100to200],
     keys=[
         "/WJetsToLNu_HT-100To200_TuneCP5_13TeV-madgraphMLM-pythia8/RunIISummer20UL16MiniAODAPVv2-106X_mcRun2_asymptotic_preVFP_v11_NanoAODv12UHH-v1/NANOAODSIM",  # noqa
     ],
@@ -303,9 +303,9 @@
 )
 
 cpn.add_dataset(
-    name="w_lnu_ht1200To2500_madgraph",
+    name="w_lnu_ht1200to2500_madgraph",
     id=14226935,
-    processes=[procs.w_lnu_ht1200To2500],
+    processes=[procs.w_lnu_ht1200to2500],
     keys=[
         "/WJetsToLNu_HT-1200To2500_TuneCP5_13TeV-madgraphMLM-pythia8/RunIISummer20UL16MiniAODAPVv2-106X_mcRun2_asymptotic_preVFP_v11_NanoAODv12UHH-v1/NANOAODSIM",  # noqa
     ],
@@ -314,9 +314,9 @@
 )
 
 cpn.add_dataset(
-    name="w_lnu_ht400To600_madgraph",
+    name="w_lnu_ht400to600_madgraph",
     id=14213493,
-    processes=[procs.w_lnu_ht400To600],
+    processes=[procs.w_lnu_ht400to600],
     keys=[
         "/WJetsToLNu_HT-400To600_TuneCP5_13TeV-madgraphMLM-pythia8/RunIISummer20UL16MiniAODAPVv2-106X_mcRun2_asymptotic_preVFP_v11_NanoAODv12UHH-v1/NANOAODSIM",  # noqa
     ],
@@ -325,9 +325,9 @@
 )
 
 cpn.add_dataset(
-    name="w_lnu_ht600To800_madgraph",
+    name="w_lnu_ht600to800_madgraph",
     id=14227116,
-    processes=[procs.w_lnu_ht600To800],
+    processes=[procs.w_lnu_ht600to800],
     keys=[
         "/WJetsToLNu_HT-600To800_TuneCP5_13TeV-madgraphMLM-pythia8/RunIISummer20UL16MiniAODAPVv2-106X_mcRun2_asymptotic_preVFP_v11_NanoAODv12UHH-v1/NANOAODSIM",  # noqa
     ],
@@ -336,9 +336,9 @@
 )
 
 cpn.add_dataset(
-    name="w_lnu_ht800To1200_madgraph",
+    name="w_lnu_ht800to1200_madgraph",
     id=14212489,
-    processes=[procs.w_lnu_ht800To1200],
+    processes=[procs.w_lnu_ht800to1200],
     keys=[
         "/WJetsToLNu_HT-800To1200_TuneCP5_13TeV-madgraphMLM-pythia8/RunIISummer20UL16MiniAODAPVv2-106X_mcRun2_asymptotic_preVFP_v11_NanoAODv12UHH-v1/NANOAODSIM",  # noqa
     ],
@@ -347,9 +347,9 @@
 )
 
 cpn.add_dataset(
-    name="w_lnu_ht200To400_madgraph",
+    name="w_lnu_ht200to400_madgraph",
     id=14212310,
-    processes=[procs.w_lnu_ht200To400],
+    processes=[procs.w_lnu_ht200to400],
     keys=[
         "/WJetsToLNu_HT-200To400_TuneCP5_13TeV-madgraphMLM-pythia8/RunIISummer20UL16MiniAODAPVv2-106X_mcRun2_asymptotic_preVFP_v11_NanoAODv12UHH-v1/NANOAODSIM",  # noqa
     ],