Fix campaign ref (16HIPMv9) and top mass vars to datasets (2017)

uhh-cms · Nov 15, 2024 · 8e318fc · 8e318fc
1 parent 87872b1
commit 8e318fc
Show file tree

Hide file tree

Showing 4 changed files with 76 additions and 25 deletions.
diff --git a/cmsdb/campaigns/run2_2016_HIPM_nano_v9/__init__.py b/cmsdb/campaigns/run2_2016_HIPM_nano_v9/__init__.py
@@ -15,16 +15,17 @@
 # campaign
 #
 
-campaign_run2_2016_nano_v9 = Campaign(
-    name="run2_HIPM_2016_nano_v9",
+campaign_run2_2016_HIPM_nano_v9 = Campaign(
+    name="run2_2016_HIPM_nano_v9",
     id=2201601, # change ID
     ecm=13,
     bx=25,
     aux={
         "tier": "NanoAOD",
+        "run": 2,
         "year": 2016,
         "version": 9,
-        "postfix": "",
+        "postfix": "APV",
     },
     tags={"preVFP", "APV", "HIPM"},
 )

diff --git a/cmsdb/campaigns/run2_2016_HIPM_nano_v9/data.py b/cmsdb/campaigns/run2_2016_HIPM_nano_v9/data.py
@@ -5,7 +5,7 @@
 """
 
 import cmsdb.processes as procs
-from cmsdb.campaigns.run2_2016_nano_v9 import campaign_run2_2016_nano_v9 as cpn
+from cmsdb.campaigns.run2_2016_HIPM_nano_v9 import campaign_run2_2016_HIPM_nano_v9 as cpn
 
 #
 # JetHT

diff --git a/cmsdb/campaigns/run2_2016_nano_v9/__init__.py b/cmsdb/campaigns/run2_2016_nano_v9/__init__.py
@@ -22,6 +22,7 @@
     bx=25,
     aux={
         "tier": "NanoAOD",
+        "run": 2,
         "year": 2016,
         "version": 9,
         "postfix": "",

diff --git a/cmsdb/campaigns/run2_2017_nano_v9/top.py b/cmsdb/campaigns/run2_2017_nano_v9/top.py
@@ -169,48 +169,97 @@
             n_files=103,
             n_events=95286000,
         ),
-        mtop_up=DatasetInfo(
+    ),
+)
+
+
+cpn.add_dataset(
+    name="tt_fh_166p5_powheg",
+    id=14242959,
+    processes=[procs.tt_fh],
+    info=dict(
+        nominal=DatasetInfo(
             keys=[
-                "/TTToHadronic_mtop173p5_TuneCP5_13TeV-powheg-pythia8/RunIISummer20UL17NanoAODv9-106X_mc2017_realistic_v9-v1/NANOAODSIM",  # noqa
+                "/TTToHadronic_mtop166p5_TuneCP5_13TeV-powheg-pythia8/RunIISummer20UL17NanoAODv9-106X_mc2017_realistic_v9-v1/NANOAODSIM",  # noqa
             ],
-            n_files=79,
-            n_events=89579000,
+            n_files=104,
+            n_events=94184000,
         ),
-        mtop_down=DatasetInfo(
+    ),
+)
+
+cpn.add_dataset(
+    name="tt_fh_169p5_powheg",
+    id=14235980,
+    processes=[procs.tt_fh],
+    info=dict(
+        nominal=DatasetInfo(
+            keys=[
+                "/TTToHadronic_mtop169p5_TuneCP5_13TeV-powheg-pythia8/RunIISummer20UL17NanoAODv9-106X_mc2017_realistic_v9-v1/NANOAODSIM",  # noqa
+            ],
+            n_files=76,
+            n_events=90427000,
+        ),
+    ),
+)
+
+cpn.add_dataset(
+    name="tt_fh_171p5_powheg",
+    id=14243327,
+    processes=[procs.tt_fh],
+    info=dict(
+        nominal=DatasetInfo(
             keys=[
                 "/TTToHadronic_mtop171p5_TuneCP5_13TeV-powheg-pythia8/RunIISummer20UL17NanoAODv9-106X_mc2017_realistic_v9-v1/NANOAODSIM",  # noqa
             ],
             n_files=108,
             n_events=96894000,
         ),
-        mtop_up2=DatasetInfo(
+    ),
+)
+
+cpn.add_dataset(
+    name="tt_fh_173p5_powheg",
+    id=14235630,
+    processes=[procs.tt_fh],
+    info=dict(
+        nominal=DatasetInfo(
             keys=[
-                "/TTToHadronic_mtop175p5_TuneCP5_13TeV-powheg-pythia8/RunIISummer20UL17NanoAODv9-106X_mc2017_realistic_v9-v1/NANOAODSIM",  # noqa
+                "/TTToHadronic_mtop173p5_TuneCP5_13TeV-powheg-pythia8/RunIISummer20UL17NanoAODv9-106X_mc2017_realistic_v9-v1/NANOAODSIM",  # noqa
             ],
-            n_files=117,
-            n_events=98568000,
+            n_files=79,
+            n_events=89579000,
         ),
-        mtop_down2=DatasetInfo(
+    ),
+)
+
+cpn.add_dataset(
+    name="tt_fh_175p5_powheg",
+    id=14242924,
+    processes=[procs.tt_fh],
+    info=dict(
+        nominal=DatasetInfo(
             keys=[
-                "/TTToHadronic_mtop169p5_TuneCP5_13TeV-powheg-pythia8/RunIISummer20UL17NanoAODv9-106X_mc2017_realistic_v9-v1/NANOAODSIM",  # noqa
+                "/TTToHadronic_mtop175p5_TuneCP5_13TeV-powheg-pythia8/RunIISummer20UL17NanoAODv9-106X_mc2017_realistic_v9-v1/NANOAODSIM",  # noqa
             ],
-            n_files=76,
-            n_events=90427000,
+            n_files=117,
+            n_events=98568000,
         ),
-        mtop_up3=DatasetInfo(
+    ),
+)
+
+cpn.add_dataset(
+    name="tt_fh_178p5_powheg",
+    id=14242958,
+    processes=[procs.tt_fh],
+    info=dict(
+        nominal=DatasetInfo(
             keys=[
                 "/TTToHadronic_mtop178p5_TuneCP5_13TeV-powheg-pythia8/RunIISummer20UL17NanoAODv9-106X_mc2017_realistic_v9-v1/NANOAODSIM",  # noqa
             ],
             n_files=101,
             n_events=95963000,
         ),
-        mtop_down3=DatasetInfo(
-            keys=[
-                "/TTToHadronic_mtop166p5_TuneCP5_13TeV-powheg-pythia8/RunIISummer20UL17NanoAODv9-106X_mc2017_realistic_v9-v1/NANOAODSIM",  # noqa
-            ],
-            n_files=104,
-            n_events=94184000,
-        ),
     ),
 )
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,7 +5,7 @@ @@
     """
     import cmsdb.processes as procs
-    from cmsdb.campaigns.run2_2016_nano_v9 import campaign_run2_2016_nano_v9 as cpn
+    from cmsdb.campaigns.run2_2016_HIPM_nano_v9 import campaign_run2_2016_HIPM_nano_v9 as cpn
     #
     # JetHT
@@ Expand Down @@