Aquila-Consortium/csiborgtools
0
0
Fork 0
mirror of https://github.com/Richard-Sti/csiborgtools_public.git synced 2025-05-20 17:41:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Cache only filtered data

Browse source
This commit is contained in:
rstiskalek 2023-10-21 11:43:52 +01:00
parent 3e81e6f852
commit ab1a21a0da
1 changed files with 6 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

16
csiborgtools/read/halo_cat.py
View file

@ -455,12 +455,8 @@ class BaseCatalogue(ABC):
else:
is_internal = False
if key in self.cache_keys():
out = self._cache[key]
if self._load_filtered and not is_internal:
return out[self._filter_mask]
else:
return out
if not is_internal and key in self.cache_keys():
return self._cache[key]
else:
if key == "cartesian_pos":
out = numpy.vstack([self["__x"], self["__y"], self["__z"]]).T
@ -501,16 +497,16 @@ class BaseCatalogue(ABC):
else:
raise KeyError(f"Key '{key}' is not available.")
if self._load_filtered and not is_internal:
out = out[self._filter_mask]
if not is_internal:
self._cache[key] = out
if self.cache_length() > self.cache_maxsize:
self._cache.popitem(last=False)
if self._load_filtered and not is_internal:
return out[self._filter_mask]
else:
return out
return out
@property
def is_closed(self):