Skip to content

Changes to image plotting #379

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
OscarrrFuentes wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Changes to image plotting #379

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6c4a41a
Added plotting the negative differences in Plot_2D
OscarrrFuentes Oct 24, 2024
5b1b793
Fixed that it works as it used to if plot_negative is not in the conf…
OscarrrFuentes Oct 28, 2024
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
56 changes: 25 additions & 31 deletions baler/modules/plotting.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,9 +152,7 @@ def plot_1D(output_path: str, config):
before[index],
bins=np.linspace(x_min - 0.1 * x_diff, x_max + 0.1 * x_diff, 200),
)
ax1.hist(
bins_before[:-1], bins_before, weights=counts_before, label="Before"
)
ax1.hist(bins_before[:-1], bins_before, weights=counts_before, label="Before")

# After Histogram
counts_after, bins_after = np.histogram(
Expand Down Expand Up @@ -182,10 +180,8 @@ def plot_1D(output_path: str, config):
ax3.axhline(y=0, linewidth=0.2, color="black")
ax3.set_xlabel(f"{column_name}", ha="right", x=1.0)
ax3.set_ylim(
-max(counts_after - counts_before)
- 0.05 * max(counts_after - counts_before),
max(counts_after - counts_before)
+ 0.05 * max(counts_after - counts_before),
-max(counts_after - counts_before) - 0.05 * max(counts_after - counts_before),
max(counts_after - counts_before) + 0.05 * max(counts_after - counts_before),
)
ax3.set_ylabel("Residual")

Expand Down Expand Up @@ -257,9 +253,7 @@ def plot_2D_old(project_path, config):
"""

data = np.load(config.input_path)["data"]
data_decompressed = np.load(project_path + "/decompressed_output/decompressed.npz")[
"data"
]
data_decompressed = np.load(project_path + "/decompressed_output/decompressed.npz")["data"]

if data.shape[0] > 1:
num_tiles = data.shape[0]
Expand All @@ -284,9 +278,7 @@ def plot_2D_old(project_path, config):

diff = tile_data - tile_data_decompressed

fig, axs = plt.subplots(
1, 3, figsize=(29.7 * (1 / 2.54), 10 * (1 / 2.54)), sharey=True
)
fig, axs = plt.subplots(1, 3, figsize=(29.7 * (1 / 2.54), 10 * (1 / 2.54)), sharey=True)
axs[0].set_title("Original", fontsize=11)
im1 = axs[0].imshow(
tile_data,
Expand Down Expand Up @@ -352,9 +344,7 @@ def plot_2D_old(project_path, config):
cb2.set_label("x-velocity [m/s]")
# fig.colorbar(im3, cax=cbar_ax)

fig.savefig(
project_path + "/plotting/CFD" + str(ind) + ".png", bbox_inches="tight"
)
fig.savefig(project_path + "/plotting/CFD" + str(ind) + ".png", bbox_inches="tight")
# sys.exit()

# import imageio.v2 as imageio
Expand All @@ -381,14 +371,10 @@ def plot_2D(project_path, config):
"""

data = np.load(config.input_path)["data"]
data_decompressed = np.load(project_path + "/decompressed_output/decompressed.npz")[
"data"
]
data_decompressed = np.load(project_path + "/decompressed_output/decompressed.npz")["data"]

if config.convert_to_blocks:
data_decompressed = data_decompressed.reshape(
data.shape[0], data.shape[1], data.shape[2]
)
data_decompressed = data_decompressed.reshape(data.shape[0], data.shape[1], data.shape[2])

if data.shape[0] > 1:
num_tiles = data.shape[0]
Expand All @@ -414,12 +400,22 @@ def plot_2D(project_path, config):

diff = tile_data - tile_data_decompressed

max_value = np.amax([np.amax(tile_data), np.amax(tile_data_decompressed)])
min_value = np.amin([np.amin(tile_data), np.amin(tile_data_decompressed)])

fig, axs = plt.subplots(
1, 3, figsize=(29.7 * (1 / 2.54), 10 * (1 / 2.54)), sharey=True
)
try:
if config.plot_negative:
max_value = np.amax(
[np.amax(tile_data), np.amax(tile_data_decompressed), np.amax(diff)]
)
min_value = np.amin(
[np.amin(tile_data), np.amin(tile_data_decompressed), np.amin(diff)]
)
else:
max_value = np.amax([np.amax(tile_data), np.amax(tile_data_decompressed)])
min_value = np.amin([np.amin(tile_data), np.amin(tile_data_decompressed)])
except AttributeError as _:
max_value = np.amax([np.amax(tile_data), np.amax(tile_data_decompressed)])
min_value = np.amin([np.amin(tile_data), np.amin(tile_data_decompressed)])

fig, axs = plt.subplots(1, 3, figsize=(29.7 * (1 / 2.54), 10 * (1 / 2.54)), sharey=True)
axs[0].set_title("Original", fontsize=11)
im1 = axs[0].imshow(tile_data, vmax=max_value, vmin=min_value)
axs[1].set_title("Reconstructed", fontsize=11)
Expand All @@ -431,9 +427,7 @@ def plot_2D(project_path, config):
cbar_ax = fig.add_axes([0.815, 0.2, 0.02, 0.59])
cb2 = fig.colorbar(im3, cax=cbar_ax, location="right", aspect=10)

fig.savefig(
project_path + "/plotting/CFD" + str(ind) + ".png", bbox_inches="tight"
)
fig.savefig(project_path + "/plotting/CFD" + str(ind) + ".png", bbox_inches="tight")
# sys.exit()


Expand Down