Merge pull request #1774 from NNPDF/rename_fiatlux_dis

Change fiatlux_dis_F{2,L} -> FIATLUX_DIS_F{2,L}
NNPDF · Jul 13, 2023 · 4395179 · 4395179
2 parents 52ddc1d + f13a506
commit 4395179
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/validphys2/src/validphys/photon/compute.py b/validphys2/src/validphys/photon/compute.py
@@ -75,9 +75,8 @@ def __init__(self, theoryid, lux_params, replicas):
         self.additional_errors = lux_params["additional_errors"]
         self.luxseed = lux_params["luxseed"]
 
-        # TODO : maybe find a different name for fiatlux_dis_F2
-        path_to_F2 = theoryid.path / "fastkernel/fiatlux_dis_F2.pineappl.lz4"
-        path_to_FL = theoryid.path / "fastkernel/fiatlux_dis_FL.pineappl.lz4"
+        path_to_F2 = theoryid.path / "fastkernel/FIATLUX_DIS_F2.pineappl.lz4"
+        path_to_FL = theoryid.path / "fastkernel/FIATLUX_DIS_FL.pineappl.lz4"
         self.path_to_eko_photon = theoryid.path / "eko_photon.tar"
         with EKO.read(self.path_to_eko_photon) as eko:
             self.q_in = np.sqrt(eko.mu20)
@@ -97,7 +96,7 @@ def __init__(self, theoryid, lux_params, replicas):
             fl = sf.InterpStructureFunction(path_to_FL, self.luxpdfset.members[replica])
             if not np.isclose(f2.q2_max, fl.q2_max):
                 log.error(
-                    "FKtables for fiatlux_dis_F2 and fiatlux_dis_FL have two different q2_max"
+                    "FKtables for FIATLUX_DIS_F2 and FIATLUX_DIS_FL have two different q2_max"
                 )
 
             fiatlux_runcard["q2_max"] = float(f2.q2_max)

diff --git a/validphys2/src/validphys/tests/photon/test_compute.py b/validphys2/src/validphys/tests/photon/test_compute.py
@@ -111,8 +111,8 @@ def test_photon():
         photon = Photon(test_theory, fiatlux_runcard, [replica])
 
         # set up fiatlux
-        path_to_F2 = test_theory.path / "fastkernel/fiatlux_dis_F2.pineappl.lz4"
-        path_to_FL = test_theory.path / "fastkernel/fiatlux_dis_FL.pineappl.lz4"
+        path_to_F2 = test_theory.path / "fastkernel/FIATLUX_DIS_F2.pineappl.lz4"
+        path_to_FL = test_theory.path / "fastkernel/FIATLUX_DIS_FL.pineappl.lz4"
         pdfs = fiatlux_runcard["luxset"].load()
         f2 = sf.InterpStructureFunction(path_to_F2, pdfs.members[replica])
         fl = sf.InterpStructureFunction(path_to_FL, pdfs.members[replica])

diff --git a/validphys2/src/validphys/tests/photon/test_structurefunctions.py b/validphys2/src/validphys/tests/photon/test_structurefunctions.py
@@ -44,8 +44,8 @@ def test_zero_pdfs():
     pdfs = ZeroPdfs()
     test_theory = API.theoryid(theoryid=THEORY_QED)
     theory = test_theory.get_description()
-    path_to_F2 = test_theory.path / "fastkernel/fiatlux_dis_F2.pineappl.lz4"
-    path_to_FL = test_theory.path / "fastkernel/fiatlux_dis_FL.pineappl.lz4"
+    path_to_F2 = test_theory.path / "fastkernel/FIATLUX_DIS_F2.pineappl.lz4"
+    path_to_FL = test_theory.path / "fastkernel/FIATLUX_DIS_FL.pineappl.lz4"
 
     f2 = sf.InterpStructureFunction(path_to_F2, pdfs)
     fl = sf.InterpStructureFunction(path_to_FL, pdfs)
@@ -78,7 +78,7 @@ def test_params():
     test_theory = API.theoryid(theoryid=THEORY_QED)
     theory = test_theory.get_description()
     for channel in ["F2", "FL"]:
-        tmp = "fastkernel/fiatlux_dis_" + channel + ".pineappl.lz4"
+        tmp = "fastkernel/FIATLUX_DIS_" + channel + ".pineappl.lz4"
         path_to_fktable = test_theory.path / tmp
         struct_func = sf.InterpStructureFunction(path_to_fktable, pdfs.members[replica])
         np.testing.assert_allclose(struct_func.q2_max, 1e8)
@@ -94,7 +94,7 @@ def test_interpolation_grid():
     test_theory = API.theoryid(theoryid=THEORY_QED)
     for replica in [1, 2, 3]:
         for channel in ["F2", "FL"]:
-            tmp = "fastkernel/fiatlux_dis_" + channel + ".pineappl.lz4"
+            tmp = "fastkernel/FIATLUX_DIS_" + channel + ".pineappl.lz4"
             path_to_fktable = test_theory.path / tmp
             fktable = pineappl.fk_table.FkTable.read(path_to_fktable)
             x = np.unique(fktable.bin_left(1))