Merge branch 'master' into n3lo_dis_fit

nnpdfcpp/data/commondata/PLOTTING_ATLAS_Z_TOT_13TEV.yaml

@@ -13,5 +13,5 @@ extra_labels:
 
 experiment: "ATLAS"
 
-nnpdf31_process: DY CC
+nnpdf31_process: DY NC
 

pyproject.toml

@@ -1,6 +1,7 @@
 [tool.black]
 line-length = 100
 skip-string-normalization = 1
+skip_magic_trailing_comma = true
 
 [tool.isort]
 atomic = true

validphys2/src/validphys/photon/compute.py

@@ -9,7 +9,6 @@
 import yaml
 
 from eko import beta
-from eko.couplings import compute_matching_coeffs_down, compute_matching_coeffs_up
 from eko.io import EKO
 from n3fit.io.writer import XGRID
 from validphys.n3fit_data import replica_luxseed
@@ -394,7 +393,6 @@ def compute_alphaem_at_thresholds(self):
         thresh = {nf: thresh_list[nf - 3] for nf in range(3, self.theory["MaxNfAs"] + 1)}
 
         alphaem_thresh = {nfref: self.alpha_em_ref}
-        # import ipdb; ipdb.set_trace()
 
         # determine the values of alphaem in the threshold points, depending on the value of qref
         for nf in range(nfref + 1, self.theory["MaxNfAs"] + 1):

validphys2/src/validphys/scalevariations/scalevariationtheoryids.yaml

@@ -74,6 +74,31 @@ scale_variations_for:
       (2, 1): 427
       (2, 2): 428
 
+  #same of theory_424 but for nFONLL
+  - theoryid: 708
+    variations:
+      (0.5, 0.5): 704
+      (0.5, 1): 705
+      (0.5, 2): 706
+      (1, 0.5): 707
+      (1, 1): 708
+      (1, 2): 709
+      (2, 0.5): 710
+      (2, 1): 711
+      (2, 2): 712
+  #same of theory_405 but for nFONLL
+  - theoryid: 717
+    variations:
+      (0.5, 0.5): 713
+      (0.5, 1): 714
+      (0.5, 2): 715
+      (1, 0.5): 716
+      (1, 1): 717
+      (1, 2): 718
+      (2, 0.5): 719
+      (2, 1): 720
+      (2, 2): 721
+
 #alpha=0.117
   - theoryid: 530
     variations: