Huge refactoring

This commit is contained in:
Noe Brucy
2021-06-22 12:23:03 +02:00
parent a286c08b72
commit 0dc9e8fc7b
12 changed files with 343 additions and 361 deletions
+18 -18
View File
@@ -7,11 +7,11 @@ import os
import numpy as np
from plotter import Plotter, plt
from postprocessor import PostProcessor, get_time
from comparator import Comparator
from pp_params import default_params, load_params
from snapshotprocessor import SnapshotProcessor, get_time
from studyprocessor import StudyProcessor
from params import default_params, load_params
fake_pp = PostProcessor()
fake_pp = SnapshotProcessor()
parser = argparse.ArgumentParser()
@@ -192,23 +192,23 @@ storage_in = args.input_path
storage_out = args.output_path
if args.config is None:
pp_params = default_params()
params = default_params()
else:
pp_params = load_params(args.config)
params = load_params(args.config)
pp_params.out.zoom = args.zoom
pp_params.out.tag = args.tag
pp_params.out.map_size = args.map_size
pp_params.out.interactive = args.interactive
params.out.zoom = args.zoom
params.out.tag = args.tag
params.out.map_size = args.map_size
params.out.interactive = args.interactive
pp_params.pymses.fft = args.fft
params.pymses.fft = args.fft
pp_params.disk.on = args.disk
pp_params.disk.binning = args.binning
pp_params.disk.nb_bin = args.nb_bin
params.disk.on = args.disk
params.disk.binning = args.binning
params.disk.nb_bin = args.nb_bin
pp_params.pdf.nb_bin = args.pdf_nb_bin
params.pdf.nb_bin = args.pdf_nb_bin
# extension for out files
plt.style.use("seaborn-deep")
@@ -265,7 +265,7 @@ for run in runs:
while not success:
try:
if len(args.process) > 0:
pp = PostProcessor(run, num, pp_params=pp_params)
pp = SnapshotProcessor(run, num, params=params)
pp.process(
args.process,
args.process_args,
@@ -299,7 +299,7 @@ path_in = storage_in + project
path_out = storage_out + project
if len(args.plot) > 0:
pl = Plotter(path_in, runs, nums_success, path_out=path_out, pp_params=pp_params)
pl = Plotter(path_in, runs, nums_success, path_out=path_out, params=params)
pl.process(
args.plot,
args.plot_args,
@@ -308,7 +308,7 @@ if len(args.plot) > 0:
)
if len(args.compare) > 0:
cc = Comparator(path_in, runs, nums_success, path_out=path_out, pp_params=pp_params)
cc = StudyProcessor(path_in, runs, nums_success, path_out=path_out, params=params)
cc.process(
args.compare,
args.compare_args,