Merge branch 'master' into reimplement_ATLAS_Z0_7TEV_36PB

NNPDF · Jan 8, 2025 · fce511b · fce511b
2 parents 7b10b33 + f9db6a7
commit fce511b
Show file tree

Hide file tree

Showing 143 changed files with 269,517 additions and 7,830 deletions.
diff --git a/conda-recipe/run_test.sh b/conda-recipe/run_test.sh
@@ -5,7 +5,7 @@ set -e
 
 # Python tests for the installed validphys package
 # Note that the default tolerance in the conda test is higher than the pip test
-pytest --pyargs --mpl validphys --mpl-default-tolerance 22
+pytest --pyargs --mpl validphys --mpl-default-tolerance 24
 
 platformstr=`uname`
 

diff --git a/doc/sphinx/source/tutorials/closuretest.rst b/doc/sphinx/source/tutorials/closuretest.rst
@@ -100,15 +100,7 @@ we would choose that the t0 set was the same as the underlying law:
 
 Finally we need to specify whether or not MC replicas will be generated in the
 fit, differentiating between a level 1 and level 2 closure test. This can be achieved
-by setting ``genrep`` under ``fitting`` to be ``True``
-
-.. code:: yaml
-
-  fitting:
-    ...
-    genrep   : True
-    ...
-
+by setting ``genrep`` to be ``True``
 
 Summary for each level of closure test
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -121,10 +113,7 @@ Level 0
 
 .. code:: yaml
 
-  fitting:
-    ...
-    genrep   : False
-    ...
+  genrep   : False
   closuretest:
     ...
     fakedata    : True
@@ -136,10 +125,7 @@ Level 1
 
 .. code:: yaml
 
-  fitting:
-    ...
-    genrep   : False
-    ...
+  genrep   : False
   closuretest:
     ...
     fakedata    : True
@@ -151,10 +137,8 @@ Level 2
 ^^^^^^^
 
 .. code:: yaml
-  fitting:
-    ...
-    genrep   : True
-    ...
+
+  genrep   : True
   closuretest:
     ...
     fakedata    : True

diff --git a/...ondata/CMS_Z0J_8TEV/data_legacy_PT-Y.yaml → ...ta/commondata/CMS_Z0J_8TEV/data_PT-Y.yaml b/...ondata/CMS_Z0J_8TEV/data_legacy_PT-Y.yaml → ...ta/commondata/CMS_Z0J_8TEV/data_PT-Y.yaml
@@ -5,9 +5,9 @@ data_central:
 - 460.5
 - 222.6
 - 109.8
-- 61.84
+- 6.18400000e+01
 - 30.19
-- 13.55
+- 1.35500000e+01
 - 0.6181
 - 9862.0
 - 2863.0
@@ -18,16 +18,16 @@ data_central:
 - 58.13
 - 29.85
 - 13.76
-- 0.6122000000000001
+- 6.12200000e-01
 - 9205.0
 - 2588.0
 - 935.5
 - 416.3
 - 199.0
 - 103.1
-- 54.06
+- 5.40600000e+01
 - 28.45
-- 13.64
+- 1.36400000e+01
 - 0.5521
 - 6893.0
 - 1933.0
@@ -37,10 +37,10 @@ data_central:
 - 84.62
 - 47.57
 - 24.13
-- 11.3
+- 1.13000000e+01
 - 0.4657
 - 3709.0
-- 1021.0
+- 1.02100000e+03
 - 381.6
 - 176.6
 - 90.49

diff --git a/nnpdf_data/nnpdf_data/commondata/CMS_Z0J_8TEV/filter.py b/nnpdf_data/nnpdf_data/commondata/CMS_Z0J_8TEV/filter.py
@@ -0,0 +1,17 @@
+'''
+Filter script for CMS_Z0J_8TEV
+'''
+
+import logging
+import os
+
+from filter_utils import Extractor
+
+logging.basicConfig(level=logging.INFO, format='[%(levelname)s] %(message)s')
+
+current_dir = os.path.dirname(os.path.abspath(__file__))
+
+if __name__ == "__main__":
+    CMS_Z0J_8TEV = Extractor(f"{current_dir}/metadata.yaml", "PT-Y", mult_factor=1000)
+    CMS_Z0J_8TEV.generate_data(variant='default')
+    CMS_Z0J_8TEV.generate_data(variant='sys_10')