Restoring master version for loader and photon

Author: achiefa

validphys2/src/validphys/loader.py

@@ -217,14 +217,6 @@ def available_ekos(self):
             eko_path.parent.name.split("_")[1] for eko_path in self._theories_path.glob("*/eko.tar")
         }
 
-    @property
-    @functools.lru_cache
-    def available_photons_qed(self):
-        """Return a string token for each of the available theories"""
-        return {
-            eko_path.parent.name.split("_")[1] for eko_path in self._theories_path.glob("*/eko.npz")
-        }
-
     @functools.cached_property
     def available_photons(self):
         """Return a string token for each of the available theories"""
@@ -329,16 +321,6 @@ def check_eko(self, theoryID):
             raise EkoNotFound(f"Could not find eko {eko_path} in theory: {theoryID}")
         return eko_path
 
-    @functools.lru_cache
-    def check_photonQED(self, theoryID, luxset):
-        """Check the Photon QED set exists and return the path to it"""
-        photon_qed_path = self._photons_qed_path / f"photon_qed_{theoryID.id}_{luxset}.tar"
-        if not photon_qed_path.exists():
-            raise PhotonQEDNotFound(
-                f"Could not find Photon QED set {photon_qed_path} in theory: {theoryID}"
-            )
-        return photon_qed_path
-
     @functools.lru_cache
     def check_photonQED(self, theoryID, luxset):
         """Check the Photon QED set exists and return the path to it"""
@@ -880,16 +862,6 @@ def photon_qed_index(self):
     def photon_qed_urls(self):
         return self.nnprofile['photon_qed_urls']
 
-    @property
-    @_key_or_loader_error
-    def photon_qed_index(self):
-        return self.nnprofile['photon_qed_index']
-
-    @property
-    @_key_or_loader_error
-    def photon_qed_urls(self):
-        return self.nnprofile['photon_qed_urls']
-
     @property
     @_key_or_loader_error
     def nnpdf_pdfs_urls(self):
@@ -960,13 +932,6 @@ def remote_ekos(self):
         rt = self.remote_files(self.eko_urls, self.eko_index, thing="ekos")
         return {k[len(token) :]: v for k, v in rt.items()}
 
-    @property
-    @functools.lru_cache
-    def remote_photons_qed(self):
-        token = 'photon_qed_'
-        rt = self.remote_files(self.photon_qed_urls, self.photon_qed_index, thing="photons_qed")
-        return {k[len(token) :]: v for k, v in rt.items()}
-
     @property
     @functools.lru_cache
     def remote_photons(self):
@@ -1008,10 +973,6 @@ def downloadable_theories(self):
     def downloadable_ekos(self):
         return list(self.remote_ekos)
 
-    @property
-    def downloadable_photonsQED(self):
-        return list(self.remote_photons_qed)
-
     @property
     def downloadable_photons(self):
         return list(self.remote_photons)

validphys2/src/validphys/photon/compute.py

@@ -3,7 +3,6 @@
 from functools import lru_cache
 import logging
 import tempfile
-from concurrent.futures import ThreadPoolExecutor
 
 from joblib import Parallel, delayed
 import numpy as np
@@ -17,13 +16,11 @@
 from validphys.core import FKTableSpec
 from validphys.loader import Loader, PhotonQEDNotFound
 from validphys.n3fit_data import replica_luxseed
-from validphys.loader import Loader, PhotonQEDNotFound
 
 from . import structure_functions as sf
 from .alpha import Alpha
 
 log = logging.getLogger(__name__)
-loader = Loader()
 
 # not the complete fiatlux runcard since some parameters are set in the code
 FIATLUX_DEFAULT = {
@@ -160,7 +157,6 @@ def _compute_photon_set(self):
             f2 = f2_func(luxset.members[photonreplica])
             fl = fl_func(luxset.members[photonreplica])
 
-            alpha = Alpha(theory, self.fiatlux_runcard["q2_max"])
             with tempfile.NamedTemporaryFile(mode="w") as tmp:
                 yaml.dump(fiatlux_runcard, tmp)
                 lux = fiatlux.FiatLux(tmp.name)