Skip to content

Change fiatlux_dis_F{2,L} -> FIATLUX_DIS_F{2,L} #1774

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
niclaurenti merged 1 commit into from
Jul 13, 2023
Merged

Change fiatlux_dis_F{2,L} -> FIATLUX_DIS_F{2,L} #1774

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions validphys2/src/validphys/photon/compute.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions validphys2/src/validphys/tests/photon/test_compute.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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])
Expand Down
8 changes: 4 additions & 4 deletions validphys2/src/validphys/tests/photon/test_structurefunctions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -78,7 +78,7 @@ def test_params():
test_theory = API.theoryid(theoryid=THEORY_QED)
theory = test_theory.get_description()
for channel in ["F2", "FL"]:
Copy link
Copy Markdown
Member

@RoyStegeman RoyStegeman Jul 13, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P.S. here channel should be renamed to kind to be consistent with the naming in yadism (and by extension I assume everywhere else).

Copy link
Copy Markdown
Contributor Author

@niclaurenti niclaurenti Jul 14, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry I've seen it now. Ok in the next pull request I will fix it!

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)
Expand All @@ -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))
Expand Down