improvements

This commit is contained in:
Noe Brucy
2020-03-14 18:09:04 +01:00
parent 1c2750a7bd
commit c2f866b37f
5 changed files with 97 additions and 37 deletions
+10 -11
View File
@@ -92,21 +92,19 @@ class Comparator(Aggregator, HDF5Container):
"Get real units from info files"
if isinstance(unit, cst.Unit):
return unit
elif isinstance(unit, str):
# assert(not run is None)
return self.info[unit] # [run][unit]
# elif unit.keys()[0] in self.runs:
# for run in unit:
# unit[run] = self._get_units(unit[run], run=run)
# return unit
elif unit.keys()[0] in self.info:
if isinstance(unit, str):
res = self.info[unit]
if unit == "unit_length":
res = res / self.info["boxlen"]
return res
if unit.keys()[0] in self.info:
new_unit = cst.none
for base_unit_str in unit:
expo = unit[base_unit_str]
base_unit = self._get_units(base_unit_str)
new_unit = new_unit * base_unit ** expo
return new_unit
elif (not data is None) and isinstance(data, dict) and unit.keys()[0] in data:
if (not data is None) and isinstance(data, dict) and unit.keys()[0] in data:
for key in unit:
unit[key] = self._get_units(unit[key])
return unit
@@ -124,8 +122,9 @@ class Comparator(Aggregator, HDF5Container):
for run in self.runs:
series[run] = []
for i, num in enumerate(self.nums[run]):
series[run].apend(getter(run, num, arg=arg))
return np.array(series)
series[run].append(getter(run, num, arg=arg))
series[run] = np.array(series[run])
return series
def _comp(self, getter, use_num=True):
prop = np.zeros(len(self.runs))