Infer if a grid is DIS from the number of convolutions

Author: Radonirinaunimi

src/pineko/check.py

@@ -111,43 +111,38 @@ def check_grid_and_eko_compatible(pineappl_grid, operators, xif, max_as, max_al)
         raise ValueError("x grid in pineappl grid and eko operator are NOT compatible!")
 
 
-def is_dis(channels):
+def is_dis(convolutions):
     """Check if the fktable we are computing is a DIS fktable.
 
     Parameters
     ----------
-    channels : list(list(tuple(list, float)))
-        object containing the information on the channels. From PineAPPL v1,
-        the tuple contains two elements. The first is a list containing the
-        PIDs of the partons. The length of the list coincides with the number
-        of partons involved, ie for DIS there is only one element, and for a
-        hadron production in pp collision there are three elements. The 2nd
-        element is the weight/multiplicative factor.
+    convolutions: pineappl.grid.convolutions
+           an object containing the information on the convolution
 
     Returns
     -------
     bool
         true if the fktable is a DIS fktable
     """
-    return True if len(channels[0][0][0]) == 1 else False
+    return True if len(convolutions) == 1 else False
 
 
-def is_fonll_mixed(fns, lumi):
+def is_fonll_mixed(fns, convolutions):
     """Check if the fktable we are computing is FONLL-B, FONLL-D or, in general, a mixed FONLL fktable.
 
     Parameters
     ----------
     fns : str
           flavor number scheme (from the theory card)
-    lumi : list(list(tuple))
-           luminosity info
+    convolutions: pineappl.grid.convolutions
+           an object containing the information on the convolution
 
     Returns
     -------
     bool
         true if the fktable is a mixed FONLL DIS fktable
     """
-    return is_dis(lumi) and fns in ["FONLL-B", "FONLL-D"]
+    return is_dis(convolutions) and fns in ["FONLL-B", "FONLL-D"]
 
 
 def is_num_fonll(fns):

src/pineko/evolve.py

@@ -173,7 +173,7 @@ def write_operator_card(
     """
     # Add a +1 to the orders for the difference in convention between nnpdf and pineappl
     # NB: This would not happen for nFONLL
-    is_fns = int(check.is_fonll_mixed(tcard["FNS"], pineappl_grid.channels()))
+    is_fns = int(check.is_fonll_mixed(tcard["FNS"], pineappl_grid.convolutions))
     max_as = 1 + tcard["PTO"] + is_fns
     max_al = 1 + tcard["QED"]
     # ... in order to create a mask ...

src/pineko/theory.py

@@ -448,7 +448,7 @@ def fk(self, name, grid_path, tcard, pdfs):
         # Check if we are computing FONLL-B fktable and eventually change max_as
         if check.is_fonll_mixed(
             tcard["FNS"],
-            grid.channels(),
+            grid.convolutions,
         ):
             max_as += 1
 

tests/test_check.py

@@ -14,28 +14,28 @@ def test_in1d():
 
 
 def test_is_dis():
-    dis_fake_lumi = [[([-13], 1.0), ([11], 2.0)]]
-    nondis_fake_lumi = [[([1, 2], 1.5), ([2, 1], 3.0)]]
+    dis_fake_lumi = ["UnpolPDF"]
+    nondis_fake_lumi = ["UnpolPDF", "UnpolPDF"]
     assert pineko.check.is_dis(dis_fake_lumi) is True
     assert pineko.check.is_dis(nondis_fake_lumi) is False
 
 
 def test_is_fonll_mixed():
     fns = "FONLL-B"
-    lumi_first = [[([-12], 2.0), ([-13], 5.0)]]
-    lumi_second = [[([11], 1.0), ([11], 5.0)]]
-    assert pineko.check.is_fonll_mixed(fns, lumi_first) is True
-    assert pineko.check.is_fonll_mixed(fns, lumi_second) is True
-    lumi_crazy = [[([1, 1], 4.0), ([2, 11], 3.0)]]
-    assert pineko.check.is_fonll_mixed(fns, lumi_crazy) is False
+    convolutions_first = ["UnpolPDF"]
+    convolutions_second = ["PolPDF"]
+    assert pineko.check.is_fonll_mixed(fns, convolutions_first) is True
+    assert pineko.check.is_fonll_mixed(fns, convolutions_second) is True
+    convolutions_crazy = ["UnpolPDF", "UnpolFF"]
+    assert pineko.check.is_fonll_mixed(fns, convolutions_crazy) is False
     fns = "FONLL-C"
-    assert pineko.check.is_fonll_mixed(fns, lumi_first) is False
-    assert pineko.check.is_fonll_mixed(fns, lumi_second) is False
-    assert pineko.check.is_fonll_mixed(fns, lumi_crazy) is False
+    assert pineko.check.is_fonll_mixed(fns, convolutions_first) is False
+    assert pineko.check.is_fonll_mixed(fns, convolutions_second) is False
+    assert pineko.check.is_fonll_mixed(fns, convolutions_crazy) is False
     fns = "FONLL-D"
-    assert pineko.check.is_fonll_mixed(fns, lumi_first) is True
-    assert pineko.check.is_fonll_mixed(fns, lumi_second) is True
-    assert pineko.check.is_fonll_mixed(fns, lumi_crazy) is False
+    assert pineko.check.is_fonll_mixed(fns, convolutions_first) is True
+    assert pineko.check.is_fonll_mixed(fns, convolutions_second) is True
+    assert pineko.check.is_fonll_mixed(fns, convolutions_crazy) is False
 
 
 def test_is_num_fonll():