From 4d284c271afe2397fc43266c219ce966fa96f2fc Mon Sep 17 00:00:00 2001 From: Noe Brucy Date: Thu, 22 Jul 2021 23:34:28 +0200 Subject: [PATCH] [study] some renaming --- studyprocessor.py | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/studyprocessor.py b/studyprocessor.py index 7d83eba..c303f7e 100644 --- a/studyprocessor.py +++ b/studyprocessor.py @@ -79,7 +79,7 @@ class StudyProcessor(Aggregator, HDF5Container): self.info = selector.info[run0][self.nums[run0][0]] self.namelist = selector.namelist # log info - self.log_id = "[comp {}] ".format(self.params.out.tag) + self.log_id = "[study {}] ".format(self.params.out.tag) # Define rules self.def_rules() @@ -118,7 +118,7 @@ class StudyProcessor(Aggregator, HDF5Container): series[run] = np.array(series[run]) return series - def _comp(self, getter, use_num=True): + def _compare(self, getter, use_num=True): prop = [] for i, run in enumerate(self.runs): if use_num: @@ -193,33 +193,33 @@ class StudyProcessor(Aggregator, HDF5Container): } def get_attr(self, attr_name, run, num, node_name="/", arg=None): - pp = self.snaps[run][num] + snap = self.snaps[run][num] if arg is not None: node_name = node_name + "_" + str(arg) - return pp.get_attribute(node_name, attr_name) + return snap.get_attribute(node_name, attr_name) def get_snap_value(self, name, run, num, arg=None): - pp = self.snaps[run][num] + snap = self.snaps[run][num] if arg is not None: name = name + "_" + str(arg) - return pp.get_value(name) + return snap.get_value(name) def get_global(self, node_name, run, num, arg=None, unload_cells=False): if arg is not None: node_name = node_name + "_" + str(arg) - pp = self.snaps[run][num] + snap = self.snaps[run][num] if unload_cells: - pp.unload_cells() - value = pp.get_value(node_name) + snap.unload_cells() + value = snap.get_value(node_name) return value def get_nml(self, nml_key, run): return self.namelist[run][nml_key] def get_pdf_slope(self, name, run, num): - pp = self.snaps[run][num] - pp.process(["fit_pdf_" + name], ["z"], overwrite=self.overwrite_dep) - slope = pp.get_attribute("/hist/pdf_" + name + "_z", "slope") + snap = self.snaps[run][num] + snap.process(["fit_pdf_" + name], ["z"], overwrite=self.overwrite_dep) + slope = snap.get_attribute("/hist/pdf_" + name + "_z", "slope") return slope def _extract_sinks_from_log(self, series, log_filename, run): @@ -708,7 +708,7 @@ class StudyProcessor(Aggregator, HDF5Container): # namelist "nml": Rule( self, - lambda nml_key: self._comp( + lambda nml_key: self._compare( partial(self.get_nml, nml_key), use_num=False ), group="/comp",