Skip to content

Json cache #69

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

Open
zthatch wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Json cache #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6ecdd3f
meta dump and load json
zthatch Aug 10, 2021
5495456
added mpl stylesheet to deps
zthatch Aug 10, 2021
1fd9b03
Commented out mpl stylesheets until it is on conda forge
zthatch Aug 10, 2021
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
8 changes: 4 additions & 4 deletions pydatarecognition/io.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import numpy as np
import yaml
import json
import CifFile
from diffpy.structure.parsers.p_cif import _fixIfWindowsPath
from diffpy.utils.parsers.loaddata import loadData
Expand All @@ -24,7 +24,7 @@ def cif_read(cif_file_path):
if not cache.exists():
cache.mkdir()
acache = cache / f"{cif_file_path.stem}.npy"
mcache = cache / f"{cif_file_path.stem}.yml"
mcache = cache / f"{cif_file_path.stem}.json"

cachegen = cache.glob("*.npy")
index = list(set([file.stem for file in cachegen]))
Expand All @@ -34,7 +34,7 @@ def cif_read(cif_file_path):
q = qi[0]
intensity = qi[1]
with open(mcache) as o:
meta = yaml.safe_load(o)
meta = json.load(o)
po = PowderCif(cif_file_path.stem[0:6], "invnm", q, intensity)
else:
print("Getting from Cif File")
Expand Down Expand Up @@ -67,7 +67,7 @@ def cif_read(cif_file_path):
with open(acache, "wb") as o:
np.save(o, np.array([po.q, po.intensity]))
with open(mcache, "w") as o:
yaml.safe_dump({"iucrid": str(po.iucrid),
json.dump({"iucrid": str(po.iucrid),
"wavelength": po.wavelength},o)
except AttributeError:
pass
Expand Down
3 changes: 2 additions & 1 deletion requirements/run.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,5 @@ scipy
xonsh
scikit-beam
matplotlib-base
sympy
sympy
# bg_mpl_stylesheet