Merge branch 'master' into use_eko_v15

Author: giacomomagni

nnpdf_data/nnpdf_data/commondata/ATLAS_1JET_13TEV_DIF/filter.py

@@ -2,6 +2,7 @@
 
 from nnpdf_data.filter_utils.utils import prettify_float
 from nnpdf_data.filter_utils.utils import symmetrize_errors as se
+from nnpdf_data.filter_utils.utils import uncert_skip_variant as usv
 
 yaml.add_representer(float, prettify_float)
 
@@ -182,3 +183,11 @@ def processData():
 
 
 processData()
+
+usv('uncertainties.yaml', 'uncertainties_wo-lumi.yaml', 'uncertainties_lumi.yaml', 'syst_lumi')
+usv(
+    'uncertainties_altcorr1.yaml',
+    'uncertainties_altcorr1_wo-lumi.yaml',
+    'uncertainties_altcorr1_lumi.yaml',
+    'syst_lumi',
+)

nnpdf_data/nnpdf_data/commondata/ATLAS_1JET_13TEV_DIF/metadata.yaml

@@ -13,8 +13,8 @@ hepdata:
   url: "https://www.hepdata.net/record/ins1634970"
   version: 1
 
-version: 1
-version_comment: "NA"
+version: 2
+version_comment: "Separated luminosity uncertainty"
 
 implemented_observables:
 
@@ -31,7 +31,8 @@ implemented_observables:
       file: kinematics.yaml
     data_central: data.yaml
     data_uncertainties:
-      - uncertainties.yaml
+      - uncertainties_wo-lumi.yaml
+      - uncertainties_lumi.yaml
     kinematic_coverage: [y, pT, sqrts]
     plotting:
       kinematics_override: identity
@@ -50,6 +51,10 @@ implemented_observables:
           - ATLAS_1JET_13TEV_DIF_PT-Y_BIN5
           - ATLAS_1JET_13TEV_DIF_PT-Y_BIN6
       operation: 'null'
+    variants:
+      wo-lumi:
+        data_uncertainties:
+          - uncertainties_wo-lumi.yaml
 
   - observable: {description: "double differential cross section w.r.t. pT and y - altcorr1", label: '$\frac{d^2\sigma}{dp_T d|y|}$', units: "$pb/GeV$"}
     observable_name: PT-Y-ALTCORR1
@@ -64,7 +69,8 @@ implemented_observables:
       file: kinematics_altcorr1.yaml
     data_central: data_altcorr1.yaml
     data_uncertainties:
-      - uncertainties_altcorr1.yaml
+      - uncertainties_altcorr1_wo-lumi.yaml
+      - uncertainties_altcorr1_lumi.yaml
     kinematic_coverage: [y, pT, sqrts]
     plotting:
       kinematics_override: identity
@@ -83,3 +89,7 @@ implemented_observables:
           - ATLAS_1JET_13TEV_DIF_PT-Y_BIN5
           - ATLAS_1JET_13TEV_DIF_PT-Y_BIN6
       operation: 'null'
+    variants:
+      wo-lumi:
+        data_uncertainties:
+          - uncertainties_altcorr1_wo-lumi.yaml

nnpdf_data/nnpdf_data/commondata/ATLAS_1JET_13TEV_DIF/uncertainties_altcorr1_lumi.yaml

@@ -0,0 +1,183 @@
+definitions:
+  syst_lumi:
+    description: ''
+    treatment: MULT
+    type: CORR
+bins:
+- syst_lumi: 249.59
+- syst_lumi: 120.963
+- syst_lumi: 62.421
+- syst_lumi: 33.99
+- syst_lumi: 18.16
+- syst_lumi: 10.114
+- syst_lumi: 5.732
+- syst_lumi: 3.345
+- syst_lumi: 2.019
+- syst_lumi: 1.201
+- syst_lumi: 0.7437
+- syst_lumi: 0.4662
+- syst_lumi: 0.2914
+- syst_lumi: 0.1861
+- syst_lumi: 0.11887
+- syst_lumi: 0.07523
+- syst_lumi: 0.04825
+- syst_lumi: 0.0313
+- syst_lumi: 0.02032
+- syst_lumi: 0.013288
+- syst_lumi: 0.008686
+- syst_lumi: 0.005726
+- syst_lumi: 0.003764
+- syst_lumi: 0.0025
+- syst_lumi: 0.001655
+- syst_lumi: 1.09420000e-03
+- syst_lumi: 7.12100000e-04
+- syst_lumi: 0.000448
+- syst_lumi: 2.34200000e-04
+- syst_lumi: 8.61400000e-05
+- syst_lumi: 1.73e-05
+- syst_lumi: 1.96100000e-06
+- syst_lumi: 5.73600000e-08
+- syst_lumi: 235.17
+- syst_lumi: 114.466
+- syst_lumi: 58.654
+- syst_lumi: 31.03
+- syst_lumi: 16.63
+- syst_lumi: 9.407
+- syst_lumi: 5.343
+- syst_lumi: 3.096
+- syst_lumi: 1.873
+- syst_lumi: 1.1216
+- syst_lumi: 0.6802
+- syst_lumi: 0.4304
+- syst_lumi: 0.2675
+- syst_lumi: 0.167
+- syst_lumi: 0.10582
+- syst_lumi: 0.06795
+- syst_lumi: 0.04312
+- syst_lumi: 0.02756
+- syst_lumi: 0.01788
+- syst_lumi: 0.011538
+- syst_lumi: 0.007586
+- syst_lumi: 0.004983
+- syst_lumi: 0.003241
+- syst_lumi: 0.002094
+- syst_lumi: 1.37540000e-03
+- syst_lumi: 8.99500000e-04
+- syst_lumi: 5.82200000e-04
+- syst_lumi: 3.60500000e-04
+- syst_lumi: 1.81700000e-04
+- syst_lumi: 6.28200000e-05
+- syst_lumi: 1.24720000e-05
+- syst_lumi: 3.06200000e-07
+- syst_lumi: 208.53
+- syst_lumi: 100.634
+- syst_lumi: 49.914
+- syst_lumi: 26.65
+- syst_lumi: 14.51
+- syst_lumi: 7.928
+- syst_lumi: 4.45
+- syst_lumi: 2.563
+- syst_lumi: 1.524
+- syst_lumi: 0.9036
+- syst_lumi: 0.5499
+- syst_lumi: 0.3381
+- syst_lumi: 0.2077
+- syst_lumi: 0.12802
+- syst_lumi: 0.08077
+- syst_lumi: 0.05023
+- syst_lumi: 0.03162
+- syst_lumi: 0.02007
+- syst_lumi: 0.012652
+- syst_lumi: 0.008072
+- syst_lumi: 0.00511
+- syst_lumi: 0.003231
+- syst_lumi: 0.002053
+- syst_lumi: 0.00129
+- syst_lumi: 8.03900000e-04
+- syst_lumi: 4.97900000e-04
+- syst_lumi: 3.16100000e-04
+- syst_lumi: 1.81800000e-04
+- syst_lumi: 7.78300000e-05
+- syst_lumi: 2.32300000e-05
+- syst_lumi: 1.47500000e-06
+- syst_lumi: 173.13
+- syst_lumi: 82.787
+- syst_lumi: 41.375
+- syst_lumi: 21.75
+- syst_lumi: 11.488
+- syst_lumi: 6.252
+- syst_lumi: 3.538
+- syst_lumi: 2.035
+- syst_lumi: 1.1524
+- syst_lumi: 0.6749
+- syst_lumi: 0.39546
+- syst_lumi: 0.2422
+- syst_lumi: 0.1457
+- syst_lumi: 0.08972
+- syst_lumi: 0.0536
+- syst_lumi: 0.03251
+- syst_lumi: 0.01971
+- syst_lumi: 0.011766
+- syst_lumi: 0.007194
+- syst_lumi: 0.004233
+- syst_lumi: 0.002486
+- syst_lumi: 0.001461
+- syst_lumi: 8.61200000e-04
+- syst_lumi: 4.97500000e-04
+- syst_lumi: 2.68400000e-04
+- syst_lumi: 1.45100000e-04
+- syst_lumi: 8.15900000e-05
+- syst_lumi: 4.18200000e-05
+- syst_lumi: 1.34360000e-05
+- syst_lumi: 2.14700000e-06
+- syst_lumi: 1.36220000e-07
+- syst_lumi: 139.573
+- syst_lumi: 63.988
+- syst_lumi: 30.93
+- syst_lumi: 15.89
+- syst_lumi: 8.187
+- syst_lumi: 4.378
+- syst_lumi: 2.389
+- syst_lumi: 1.3199
+- syst_lumi: 0.7596
+- syst_lumi: 0.4084
+- syst_lumi: 0.2275
+- syst_lumi: 0.13192
+- syst_lumi: 0.07368
+- syst_lumi: 0.04233
+- syst_lumi: 0.02348
+- syst_lumi: 0.012661
+- syst_lumi: 0.006801
+- syst_lumi: 0.003673
+- syst_lumi: 0.001869
+- syst_lumi: 9.18800000e-04
+- syst_lumi: 4.59100000e-04
+- syst_lumi: 2.15600000e-04
+- syst_lumi: 1.03100000e-04
+- syst_lumi: 4.17600000e-05
+- syst_lumi: 1.64900000e-05
+- syst_lumi: 6.84600000e-06
+- syst_lumi: 2.61400000e-06
+- syst_lumi: 9.24400000e-07
+- syst_lumi: 102.582
+- syst_lumi: 45.966
+- syst_lumi: 21.46
+- syst_lumi: 10.416
+- syst_lumi: 5.16
+- syst_lumi: 2.524
+- syst_lumi: 1.2512
+- syst_lumi: 0.6246
+- syst_lumi: 0.312
+- syst_lumi: 0.1525
+- syst_lumi: 0.07339
+- syst_lumi: 0.03556
+- syst_lumi: 0.01721
+- syst_lumi: 0.007872
+- syst_lumi: 0.003302
+- syst_lumi: 1.36660000e-03
+- syst_lumi: 5.16500000e-04
+- syst_lumi: 1.67100000e-04
+- syst_lumi: 5.43100000e-05
+- syst_lumi: 1.62500000e-05
+- syst_lumi: 5.14400000e-06
+- syst_lumi: 5.55700000e-07