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

Huge refactoring

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
baseprocessor.py
+9 -9
View File
@@ -11,7 +11,7 @@ import numpy as np
import tables
from tables import HDF5ExtError
from pp_params import default_params, load_params
from params import default_params, load_params
from units import U
@@ -52,16 +52,16 @@ class BaseProcessor:
rules = {}
solve_self_dep = True
def __init__(self, path, path_out=None, pp_params=None, tag=None):
if pp_params is None:
self.pp_params = default_params()
elif type(pp_params) == str:
self.pp_params = load_params(pp_params)
def __init__(self, path, path_out=None, params=None, tag=None):
if params is None:
self.params = default_params()
elif type(params) == str:
self.params = load_params(params)
else:
self.pp_params = copy.deepcopy(pp_params)
self.params = copy.deepcopy(params)
if tag is not None:
self.pp_params.out.tag = tag
self.params.out.tag = tag
# Determining output directory
if path_out is None:
@@ -70,7 +70,7 @@ class BaseProcessor:
self.path_out = path_out
def _log(self, string, status=""):
if self.pp_params.process.verbose:
if self.params.process.verbose:
if len(status) > 0:
print(status + ": " + self.log_id + string)
else: