fix ambiguities in defining syst treatments

NNPDF · Nov 28, 2023 · 666c786 · 666c786
1 parent 7268200
commit 666c786
Show file tree

Hide file tree

Showing 19 changed files with 3,253 additions and 3,253 deletions.
diff --git a/buildmaster/LHCB_DY_7TEV_MUON/filter.py b/buildmaster/LHCB_DY_7TEV_MUON/filter.py
@@ -289,7 +289,7 @@ def dump_commondata(kinematics: list, data: list, errors: list) -> None:
     error_definition = {
         f"sys_corr_{i + 1}": {
             "description": "Correlated systematic uncertainties",
-            "treatment": "ADD",
+            "treatment": "MULT",
             "type": "CORR",
         }
         for i in range(len(data))
@@ -303,13 +303,13 @@ def dump_commondata(kinematics: list, data: list, errors: list) -> None:
 
     error_definition["sys_beam"] = {
         "description": "Systematic Beam uncertainties",
-        "treatment": "ADD",
+        "treatment": "MULT",
         "type": "LHCBBEAM7TEV",
     }
 
     error_definition["sys_luminosity"] = {
         "description": "Systematic Luminosity uncertainties",
-        "treatment": "ADD",
+        "treatment": "MULT",
         "type": "LHCBLUMI7TEV",
     }
 
@@ -334,13 +334,13 @@ def main_filter() -> None:
 
     1. Statistical uncertainties: ADD, UNCORR
 
-    2. Correlated Systematic uncertainties: ADD, CORR:
+    2. Correlated Systematic uncertainties: MULT, CORR:
         constructed by symmetrizing the correlation matrix and extracting
         the artificial systematic uncertainties from the latter
 
-    3. Beam Systematic uncertainties: ADD, LHCBBEAM7TEV
+    3. Beam Systematic uncertainties: MULT, LHCBBEAM7TEV
 
-    4. Luminosity Systematic uncertainties: ADD, LHCBLUMI7TEV
+    4. Luminosity Systematic uncertainties: MULT, LHCBLUMI7TEV
 
     """
     version, _, _ = read_metadata()

diff --git a/buildmaster/LHCB_DY_7TEV_MUON/uncertainties.yaml b/buildmaster/LHCB_DY_7TEV_MUON/uncertainties.yaml
@@ -1,147 +1,147 @@
 definitions:
   sys_corr_1:
     description: Correlated systematic uncertainties
-    treatment: ADD
+    treatment: MULT
     type: CORR
   sys_corr_2:
     description: Correlated systematic uncertainties
-    treatment: ADD
+    treatment: MULT
     type: CORR
   sys_corr_3:
     description: Correlated systematic uncertainties
-    treatment: ADD
+    treatment: MULT
     type: CORR
   sys_corr_4:
     description: Correlated systematic uncertainties
-    treatment: ADD
+    treatment: MULT
     type: CORR
   sys_corr_5:
     description: Correlated systematic uncertainties
-    treatment: ADD
+    treatment: MULT
     type: CORR
   sys_corr_6:
     description: Correlated systematic uncertainties
-    treatment: ADD
+    treatment: MULT
     type: CORR
   sys_corr_7:
     description: Correlated systematic uncertainties
-    treatment: ADD
+    treatment: MULT
     type: CORR
   sys_corr_8:
     description: Correlated systematic uncertainties
-    treatment: ADD
+    treatment: MULT
     type: CORR
   sys_corr_9:
     description: Correlated systematic uncertainties
-    treatment: ADD
+    treatment: MULT
     type: CORR
   sys_corr_10:
     description: Correlated systematic uncertainties
-    treatment: ADD
+    treatment: MULT
     type: CORR
   sys_corr_11:
     description: Correlated systematic uncertainties
-    treatment: ADD
+    treatment: MULT
     type: CORR
   sys_corr_12:
     description: Correlated systematic uncertainties
-    treatment: ADD
+    treatment: MULT
     type: CORR
   sys_corr_13:
     description: Correlated systematic uncertainties
-    treatment: ADD
+    treatment: MULT
     type: CORR
   sys_corr_14:
     description: Correlated systematic uncertainties
-    treatment: ADD
+    treatment: MULT
     type: CORR
   sys_corr_15:
     description: Correlated systematic uncertainties
-    treatment: ADD
+    treatment: MULT
     type: CORR
   sys_corr_16:
     description: Correlated systematic uncertainties
-    treatment: ADD
+    treatment: MULT
     type: CORR
   sys_corr_17:
     description: Correlated systematic uncertainties
-    treatment: ADD
+    treatment: MULT
     type: CORR
   sys_corr_18:
     description: Correlated systematic uncertainties
-    treatment: ADD
+    treatment: MULT
     type: CORR
   sys_corr_19:
     description: Correlated systematic uncertainties
-    treatment: ADD
+    treatment: MULT
     type: CORR
   sys_corr_20:
     description: Correlated systematic uncertainties
-    treatment: ADD
+    treatment: MULT
     type: CORR
   sys_corr_21:
     description: Correlated systematic uncertainties
-    treatment: ADD
+    treatment: MULT
     type: CORR
   sys_corr_22:
     description: Correlated systematic uncertainties
-    treatment: ADD
+    treatment: MULT
     type: CORR
   sys_corr_23:
     description: Correlated systematic uncertainties
-    treatment: ADD
+    treatment: MULT
     type: CORR
   sys_corr_24:
     description: Correlated systematic uncertainties
-    treatment: ADD
+    treatment: MULT
     type: CORR
   sys_corr_25:
     description: Correlated systematic uncertainties
-    treatment: ADD
+    treatment: MULT
     type: CORR
   sys_corr_26:
     description: Correlated systematic uncertainties
-    treatment: ADD
+    treatment: MULT
     type: CORR
   sys_corr_27:
     description: Correlated systematic uncertainties
-    treatment: ADD
+    treatment: MULT
     type: CORR
   sys_corr_28:
     description: Correlated systematic uncertainties
-    treatment: ADD
+    treatment: MULT
     type: CORR
   sys_corr_29:
     description: Correlated systematic uncertainties
-    treatment: ADD
+    treatment: MULT
     type: CORR
   sys_corr_30:
     description: Correlated systematic uncertainties
-    treatment: ADD
+    treatment: MULT
     type: CORR
   sys_corr_31:
     description: Correlated systematic uncertainties
-    treatment: ADD
+    treatment: MULT
     type: CORR
   sys_corr_32:
     description: Correlated systematic uncertainties
-    treatment: ADD
+    treatment: MULT
     type: CORR
   sys_corr_33:
     description: Correlated systematic uncertainties
-    treatment: ADD
+    treatment: MULT
     type: CORR
   stat:
     description: Uncorrelated statistical uncertainties
     treatment: ADD
     type: UNCORR
   sys_beam:
     description: Systematic Beam uncertainties
-    treatment: ADD
+    treatment: MULT
     type: LHCBBEAM7TEV
   sys_luminosity:
     description: Systematic Luminosity uncertainties
-    treatment: ADD
+    treatment: MULT
     type: LHCBLUMI7TEV
 bins:
 - sys_corr_1: -5.144425552737296

diff --git a/buildmaster/LHCB_DY_8TEV_MUON/filter.py b/buildmaster/LHCB_DY_8TEV_MUON/filter.py
@@ -289,7 +289,7 @@ def dump_commondata(kinematics: list, data: list, errors: list) -> None:
     error_definition = {
         f"sys_corr_{i + 1}": {
             "description": "Correlated systematic uncertainties",
-            "treatment": "ADD",
+            "treatment": "MULT",
             "type": "CORR",
         }
         for i in range(len(data))
@@ -303,14 +303,14 @@ def dump_commondata(kinematics: list, data: list, errors: list) -> None:
 
     error_definition["sys_beam"] = {
         "description": "Systematic Beam uncertainties",
-        "treatment": "ADD",
-        "type": "LHCBBEAM7TEV",
+        "treatment": "MULT",
+        "type": "LHCBBEAM8TEV",
     }
 
     error_definition["sys_luminosity"] = {
         "description": "Systematic Luminosity uncertainties",
-        "treatment": "ADD",
-        "type": "LHCBLUMI7TEV",
+        "treatment": "MULT",
+        "type": "LHCBLUMI8TEV",
     }
 
     with open("data.yaml", "w") as file:
@@ -334,13 +334,13 @@ def main_filter() -> None:
 
     1. Statistical uncertainties: ADD, UNCORR
 
-    2. Correlated Systematic uncertainties: ADD, CORR:
+    2. Correlated Systematic uncertainties: MULT, CORR:
         constructed by symmetrizing the correlation matrix and extracting
         the artificial systematic uncertainties from the latter
 
-    3. Beam Systematic uncertainties: ADD, LHCBBEAM7TEV
+    3. Beam Systematic uncertainties: MULT, LHCBBEAM8TEV
 
-    4. Luminosity Systematic uncertainties: ADD, LHCBLUMI7TEV
+    4. Luminosity Systematic uncertainties: MULT, LHCBLUMI8TEV
 
     """
     version, _, _ = read_metadata()