noe/pipeline
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

less verbose

Browse Source
This commit is contained in:
Noe Brucy
2022-08-26 15:28:31 +02:00
parent 87e6d7da08
commit 31bbf9c373
4 changed files with 117 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plotter.py
+49 -49
View File
@@ -280,7 +280,8 @@ class Plotter(Aggregator, BaseProcessor):
self.def_rules()
# Generate astrophysix's simulations object
self.gen_simus()
if self.params.astrophysix.generate:
self.gen_simus()
# Initialize pointers
self.current_processor = None
@@ -456,26 +457,26 @@ class Plotter(Aggregator, BaseProcessor):
run=run,
**kwargs,
)
# Save in astrophysix format
df = rule.datafile(name, arg)
df[filetype] = plot_filename
if movie:
filenames[run].append(plot_filename)
if plot_info is not None:
df.plot_info = plot_info
if num is not None:
snap = self.snaps[run][num].snapshot
if overwrite and df.name in snap.datafiles:
del snap.datafiles[df.name]
elif df.name not in snap.datafiles:
snap.datafiles.add(df)
# Save in astrophysix format
if self.params.astrophysix.generate:
df = rule.datafile(name, arg)
df[filetype] = plot_filename
if plot_info is not None:
df.plot_info = plot_info
if num is not None:
snap = self.snaps[run][num].snapshot
if overwrite and df.name in snap.datafiles:
del snap.datafiles[df.name]
elif df.name not in snap.datafiles:
snap.datafiles.add(df)
if snap not in self.simulations[run].snapshots:
self.simulations[run].snapshots.add(snap)
datafiles.append(df)
if snap not in self.simulations[run].snapshots:
self.simulations[run].snapshots.add(snap)
datafiles.append(df)
if movie:
for run in runs:
@@ -857,22 +858,23 @@ class Plotter(Aggregator, BaseProcessor):
plt.xlim(xlim)
plt.ylim(ylim)
return PlotInfo(
plot_type=PlotType.IMAGE,
xaxis_values=np.linspace(im_extent[0], im_extent[1], dmap.shape[0] + 1),
yaxis_values=np.linspace(im_extent[2], im_extent[3], dmap.shape[1] + 1),
values=dmap,
xaxis_log_scale=False,
yaxis_log_scale=False,
values_log_scale=False,
xaxis_label=xlabel,
yaxis_label=ylabel,
values_label=label,
xaxis_unit=unit_space,
yaxis_unit=unit_space,
values_unit=unit,
plot_title=title,
)
if self.params.astrophysics.generate:
return PlotInfo(
plot_type=PlotType.IMAGE,
xaxis_values=np.linspace(im_extent[0], im_extent[1], dmap.shape[0] + 1),
yaxis_values=np.linspace(im_extent[2], im_extent[3], dmap.shape[1] + 1),
values=dmap,
xaxis_log_scale=False,
yaxis_log_scale=False,
values_log_scale=False,
xaxis_label=xlabel,
yaxis_label=ylabel,
values_label=label,
xaxis_unit=unit_space,
yaxis_unit=unit_space,
values_unit=unit,
plot_title=title,
)
def _overlay_contour(
self,
@@ -1201,19 +1203,20 @@ class Plotter(Aggregator, BaseProcessor):
)
# returns PlotInfo (for Galactica)
edges = np.append(centers - width / 2.0, centers[-1] + width / 2.0)
return PlotInfo(
plot_type=PlotType.HISTOGRAM,
xaxis_values=edges,
yaxis_values=values,
xaxis_log_scale=False,
yaxis_log_scale=ylog,
xaxis_label=xlabel,
yaxis_label=ylabel,
xaxis_unit=unit,
yaxis_unit=U.none,
plot_title=title,
)
if self.params.astrophysics.generate:
edges = np.append(centers - width / 2.0, centers[-1] + width / 2.0)
return PlotInfo(
plot_type=PlotType.HISTOGRAM,
xaxis_values=edges,
yaxis_values=values,
xaxis_log_scale=False,
yaxis_log_scale=ylog,
xaxis_label=xlabel,
yaxis_label=ylabel,
xaxis_unit=unit,
yaxis_unit=U.none,
plot_title=title,
)
def _plot(
self,
@@ -1822,21 +1825,18 @@ class Plotter(Aggregator, BaseProcessor):
def generic_rule(name):
self.rules["slice_" + name] = PlotRule(
self,
partial(self._plot_map, "slice_" + name),
"{} slice".format(name),
dependencies=["slice_" + name],
)
self.rules[name + "_mwavg"] = PlotRule(
self,
partial(self._plot_map, name + "_mwavg"),
"Ax mass-weighted averaged {}".format(name),
dependencies=[name + "_mwavg"],
)
self.rules[name + "_avg"] = PlotRule(
self,
partial(self._plot_map, name + "_avg"),
"Ax averaged {}".format(name),
dependencies=[name + "_avg"],