Merge pull request #2238 from NNPDF/rev_CMS_inclusive_DY

Revision of CMS inclusive DY data
NNPDF · Dec 6, 2024 · 13fda2a · 13fda2a
2 parents 1140342 + b040cad
commit 13fda2a
Show file tree

Hide file tree

Showing 13 changed files with 209 additions and 211 deletions.
diff --git a/nnpdf_data/nnpdf_data/commondata/CMS_WPWM_7TEV_ELECTRON/filter.py b/nnpdf_data/nnpdf_data/commondata/CMS_WPWM_7TEV_ELECTRON/filter.py
@@ -86,7 +86,7 @@ def get_kinematics(hepdata: dict, bin_index: list, boson: str = "W") -> list:
         ymax = float(rapbins[bins]["high"])
         kin_value = {
             "eta": {"min": ymin, "mid": 0.5 * (ymin + ymax), "max": ymax},
-            "M2": {"min": None, "mid": MAP_BOSON[boson] ** 2, "max": None},
+            "m_W2": {"min": None, "mid": MAP_BOSON[boson] ** 2, "max": None},
             "sqrts": {"min": None, "mid": SQRT_S, "max": None},
         }
         kinematics.append(kin_value)

diff --git a/nnpdf_data/nnpdf_data/commondata/CMS_WPWM_7TEV_ELECTRON/kinematics.yaml b/nnpdf_data/nnpdf_data/commondata/CMS_WPWM_7TEV_ELECTRON/kinematics.yaml
@@ -3,7 +3,7 @@ bins:
     min: 0.0
     mid: 0.1
     max: 0.2
-  M2:
+  m_W2:
     min: null
     mid: 6.46383840e+03
     max: null
@@ -15,7 +15,7 @@ bins:
     min: 0.2
     mid: 3.00000000e-01
     max: 0.4
-  M2:
+  m_W2:
     min: null
     mid: 6.46383840e+03
     max: null
@@ -27,7 +27,7 @@ bins:
     min: 0.4
     mid: 0.5
     max: 0.6
-  M2:
+  m_W2:
     min: null
     mid: 6.46383840e+03
     max: null
@@ -39,7 +39,7 @@ bins:
     min: 0.6
     mid: 0.7
     max: 0.8
-  M2:
+  m_W2:
     min: null
     mid: 6.46383840e+03
     max: null
@@ -51,7 +51,7 @@ bins:
     min: 0.8
     mid: 0.9
     max: 1.0
-  M2:
+  m_W2:
     min: null
     mid: 6.46383840e+03
     max: null
@@ -63,7 +63,7 @@ bins:
     min: 1.0
     mid: 1.1
     max: 1.2
-  M2:
+  m_W2:
     min: null
     mid: 6.46383840e+03
     max: null
@@ -75,7 +75,7 @@ bins:
     min: 1.2
     mid: 1.30000000e+00
     max: 1.4
-  M2:
+  m_W2:
     min: null
     mid: 6.46383840e+03
     max: null
@@ -87,7 +87,7 @@ bins:
     min: 1.6
     mid: 1.70000000e+00
     max: 1.8
-  M2:
+  m_W2:
     min: null
     mid: 6.46383840e+03
     max: null
@@ -99,7 +99,7 @@ bins:
     min: 1.8
     mid: 1.9
     max: 2.0
-  M2:
+  m_W2:
     min: null
     mid: 6.46383840e+03
     max: null
@@ -111,7 +111,7 @@ bins:
     min: 2.0
     mid: 2.1
     max: 2.2
-  M2:
+  m_W2:
     min: null
     mid: 6.46383840e+03
     max: null
@@ -123,7 +123,7 @@ bins:
     min: 2.2
     mid: 2.3
     max: 2.4
-  M2:
+  m_W2:
     min: null
     mid: 6.46383840e+03
     max: null

diff --git a/nnpdf_data/nnpdf_data/commondata/CMS_WPWM_7TEV_ELECTRON/metadata.yaml b/nnpdf_data/nnpdf_data/commondata/CMS_WPWM_7TEV_ELECTRON/metadata.yaml
@@ -13,30 +13,30 @@ hepdata:
   version: 1
 
 nnpdf_metadata:
-  nnpdf31_process: "DY CC"
+  nnpdf31_process: DY CC
   experiment: "CMS"
 
 implemented_observables:
 
-- observable_name: "ASY"
+- observable_name: ASY
   observable:
     description: "Measurement of the electron charge asymmetry in inclusive W production in pp collisions at sqrt(s) = 7 TeV"
     label: r"$dA_{e} / d|y|$"
     units: "[fb]"
-  process_type: "EWK_RAP_ASY"
+  process_type: DY_W_ETA
   tables: [1]
   npoints: [11]
   ndata: 11
   plotting:
-    kinematics_override: ewk_rap_sqrt_scale # TODO: To Check
+    kinematics_override: identity
     dataset_label: "CMS $W$ asymmetry 840 pb"
     plot_x: eta
     y_label: '$dA_{e}/dy$'
-  kinematic_coverage: [eta, M2, sqrts]
+  kinematic_coverage: [eta, m_W2, sqrts]
   kinematics:
     variables:
       eta: {description: "Electron pseudorapidity", label: '$\eta$', units: ""}
-      M2: {description: "W boson Mass", label: "$M^2$", units: "$GeV^2$"}
+      m_W2: {description: "W boson mass squared", label: "$M^2_W$", units: "$GeV^2$"}
       sqrts: {description: "Center of Mass Energy", label: '$\sqrt{s}$', units: "$GeV$"}
     file: kinematics.yaml
   data_central: data.yaml

diff --git a/nnpdf_data/nnpdf_data/commondata/CMS_WPWM_7TEV_MUON/filter.py b/nnpdf_data/nnpdf_data/commondata/CMS_WPWM_7TEV_MUON/filter.py
@@ -85,7 +85,7 @@ def get_kinematics(hepdata: dict, bin_index: list, boson: str = "W") -> list:
         ymax = float(rapbins[bins]["high"])
         kin_value = {
             "eta": {"min": ymin, "mid": 0.5 * (ymin + ymax), "max": ymax},
-            "M2": {"min": None, "mid": MAP_BOSON[boson] ** 2, "max": None},
+            "m_W2": {"min": None, "mid": MAP_BOSON[boson] ** 2, "max": None},
             "sqrts": {"min": None, "mid": SQRT_S, "max": None},
         }
         kinematics.append(kin_value)
@@ -160,7 +160,7 @@ def read_corrmatrix(nb_datapoints: int) -> np.ndarray:
 
     """
     corrmat = pd.read_csv(
-        "./rawdata/covmat.corr", names=[f'{i}' for i in range(nb_datapoints)], delim_whitespace=True
+        "./rawdata/covmat.corr", names=[f'{i}' for i in range(nb_datapoints)], sep=r'\s+'
     )
     return corrmat.iloc[:, :].values
 

diff --git a/nnpdf_data/nnpdf_data/commondata/CMS_WPWM_7TEV_MUON/kinematics.yaml b/nnpdf_data/nnpdf_data/commondata/CMS_WPWM_7TEV_MUON/kinematics.yaml
@@ -3,7 +3,7 @@ bins:
     min: 0.0
     mid: 0.1
     max: 0.2
-  M2:
+  m_W2:
     min: null
     mid: 6.46383840e+03
     max: null
@@ -15,7 +15,7 @@ bins:
     min: 0.2
     mid: 3.00000000e-01
     max: 0.4
-  M2:
+  m_W2:
     min: null
     mid: 6.46383840e+03
     max: null
@@ -27,7 +27,7 @@ bins:
     min: 0.4
     mid: 0.5
     max: 0.6
-  M2:
+  m_W2:
     min: null
     mid: 6.46383840e+03
     max: null
@@ -39,7 +39,7 @@ bins:
     min: 0.6
     mid: 0.7
     max: 0.8
-  M2:
+  m_W2:
     min: null
     mid: 6.46383840e+03
     max: null
@@ -51,7 +51,7 @@ bins:
     min: 0.8
     mid: 0.9
     max: 1.0
-  M2:
+  m_W2:
     min: null
     mid: 6.46383840e+03
     max: null
@@ -63,7 +63,7 @@ bins:
     min: 1.0
     mid: 1.1
     max: 1.2
-  M2:
+  m_W2:
     min: null
     mid: 6.46383840e+03
     max: null
@@ -75,7 +75,7 @@ bins:
     min: 1.2
     mid: 1.30000000e+00
     max: 1.4
-  M2:
+  m_W2:
     min: null
     mid: 6.46383840e+03
     max: null
@@ -87,7 +87,7 @@ bins:
     min: 1.4
     mid: 1.5
     max: 1.6
-  M2:
+  m_W2:
     min: null
     mid: 6.46383840e+03
     max: null
@@ -99,7 +99,7 @@ bins:
     min: 1.6
     mid: 1.725
     max: 1.85
-  M2:
+  m_W2:
     min: null
     mid: 6.46383840e+03
     max: null
@@ -111,7 +111,7 @@ bins:
     min: 1.85
     mid: 1.975
     max: 2.1
-  M2:
+  m_W2:
     min: null
     mid: 6.46383840e+03
     max: null
@@ -123,7 +123,7 @@ bins:
     min: 2.1
     mid: 2.25
     max: 2.4
-  M2:
+  m_W2:
     min: null
     mid: 6.46383840e+03
     max: null

diff --git a/nnpdf_data/nnpdf_data/commondata/CMS_WPWM_7TEV_MUON/metadata.yaml b/nnpdf_data/nnpdf_data/commondata/CMS_WPWM_7TEV_MUON/metadata.yaml
@@ -9,7 +9,7 @@ hepdata:
   url: https://www.hepdata.net/record/ins1273570
   version: 1
 nnpdf_metadata:
-  nnpdf31_process: DY CC
+  nnpdf31_process: "DY CC"
   experiment: CMS
 implemented_observables:
 - observable_name: ASY
@@ -18,30 +18,30 @@ implemented_observables:
       in pp collisions at sqrt(s) = 7 TeV
     label: r"$dA_{\mu} / d|y|$"
     units: '[fb]'
-  process_type: EWK_RAP_ASY
+  process_type: DY_W_ETA
   tables:
   - 1
   npoints:
   - 11
   ndata: 11
   plotting:
-    kinematics_override: ewk_rap_sqrt_scale
+    kinematics_override: identity
     dataset_label: CMS $W$ asymmetry 4.7 fb
     plot_x: eta
     y_label: $dA_{\mu}/dy$
   kinematic_coverage:
   - eta
-  - M2
+  - m_W2
   - sqrts
   kinematics:
     variables:
       eta:
         description: Muon pseudorapidity
         label: $\eta$
         units: ''
-      M2:
-        description: W boson Mass
-        label: $M^2$
+      m_W2:
+        description: W boson mass squared
+        label: $M^2_W$
         units: $GeV^2$
       sqrts:
         description: Center of Mass Energy

diff --git a/nnpdf_data/nnpdf_data/commondata/CMS_WPWM_8TEV_MUON/filter.py b/nnpdf_data/nnpdf_data/commondata/CMS_WPWM_8TEV_MUON/filter.py
@@ -88,7 +88,7 @@ def get_kinematics(hepdata: dict, bin_index: list, boson: str = "W") -> list:
         ymax = float(rapbins[bins]["high"])
         kin_value = {
             "y": {"min": ymin, "mid": 0.5 * (ymin + ymax), "max": ymax},
-            "M2": {"min": None, "mid": MAP_BOSON[boson] ** 2, "max": None},
+            "m_W2": {"min": None, "mid": MAP_BOSON[boson] ** 2, "max": None},
             "sqrts": {"min": None, "mid": SQRT_S, "max": None},
         }
         kinematics.append(kin_value)