add jcm suggestion

Author: jekoorn

n3fit/src/n3fit/checks.py

@@ -564,3 +564,11 @@ def check_eko_exists(theoryid):
         _ = FallbackLoader().check_eko(theoryid.id)
     except FileNotFoundError:
         log.error(f"No eko found for {theoryid}")
+
+
+@make_argcheck
+def fktable_hasher(data):
+    for dataset in data.datasets:
+        fkspecs = dataset.fkspecs
+        for fk in fkspecs:
+            print(fk.fkpath)

n3fit/src/n3fit/n3fit_checks_provider.py

@@ -8,6 +8,7 @@
 
 
 @n3fit.checks.check_consistent_basis
+@n3fit.checks.fktable_hasher
 @n3fit.checks.wrapper_check_NN
 @n3fit.checks.wrapper_hyperopt
 @n3fit.checks.check_deprecated_options

n3fit/src/n3fit/scripts/vp_setupfit.py

@@ -204,29 +204,29 @@ def from_yaml(cls, o, *args, **kwargs):
             )
 
         # Save a hash of the FK-Table metadata
-        l = Loader()
-        
-        TheoryIDSpec = l.check_theoryID(theoryid)
-        keys = {}
+        #keys = {}
 
-        for ds in file_content["dataset_inputs"]:
-            setname = ds["dataset"]
-            cdspec = loader.check_commondata(setname)
+        #l = Loader() 
+        #TheoryIDSpec = l.check_theoryID(theoryid)
+        #
+        #
+        #for ds in file_content["dataset_inputs"]:
+        #    setname = ds["dataset"]
+        #    
+        #    cdspec = loader.check_commondata(setname)
+        #    import pdb; pdb.set_trace()
+        #    fk_tablename = str(cdspec.metadata.theory.FK_tables[0][0])
+        #    fk_tablepath = TheoryIDSpec.path + f"/{fk_tablename}.pineappl.lz4"
 
-            fk_tablename = str(cdspec.metadata.theory.FK_tables[0][0])
+        #    # fk = fk_table.FkTable.read(str(fk_tablepath))
 
-            fk_tablepath = TheoryIDSpec.path + f"/{fk_tablename}.pineappl.lz4")
+        #    # Should we dump the fk.metadata as opposed to fk_tablepath.read_bytes()?
+        #    fkhash = hashlib.md5(fk_tablepath.read_bytes()).hexdigest()
+        #    keys[fk_tablename] = (
+        #        f"{theoryid}_{fk_tablename}_{fkhash}"
+        #    )
 
-            # fk = fk_table.FkTable.read(str(fk_tablepath))
-            # Should we dump the fk.metadata as opposed to fk_tablepath.read_bytes()?
-            fkhash = hashlib.md5(fk_tablepath.read_bytes()).hexdigest()
-            
-
-            keys[fk_tablename] = (
-                f"{theoryid}_{fk_tablename}_{fkhash}"
-            )
-
-        file_content["_fk_hashes"] = keys
+        #file_content["_fk_hashes"] = keys
 
 
         # Check fiatlux configuration
@@ -314,8 +314,8 @@ def run(self):
             self.environment.save_md5()
 
             # and save the fk hashes
-            fk_hashes = self.config_class["_fk_hashes"]
-            self.environment.save_fk_md5(fk_hashes)
+#            fk_hashes = self.config_class["_fk_hashes"]
+#            self.environment.save_fk_md5(fk_hashes)
         except SetupFitError as e:
             log.error(f"Error in setup-fit:\n{e}")
             sys.exit(1)