Skip to content
Snippets Groups Projects
Commit 4eb1ee5b authored by Alán Muñoz's avatar Alán Muñoz
Browse files

Merge remote-tracking branch 'origin/dev' into dev

parents cead1109 1b937ba9
No related branches found
No related tags found
No related merge requests found
...@@ -116,7 +116,12 @@ class Grouper(ABC): ...@@ -116,7 +116,12 @@ class Grouper(ABC):
) )
signals = self.pool_function( signals = self.pool_function(
path=path, f=concat_signal_ind, mode=mode, pool=pool, **kwargs path=path,
f=concat_signal_ind,
mode=mode,
pool=pool,
signals=sitems,
**kwargs,
) )
errors = [k for s, k in zip(signals, self.signals.keys()) if s is None] errors = [k for s, k in zip(signals, self.signals.keys()) if s is None]
...@@ -196,15 +201,17 @@ class Grouper(ABC): ...@@ -196,15 +201,17 @@ class Grouper(ABC):
path: str, path: str,
f: t.Callable, f: t.Callable,
pool: t.Optional[int] = None, pool: t.Optional[int] = None,
signals: t.Dict[str, Signal] = None,
**kwargs, **kwargs,
): ):
""" """
Wrapper to add support for threading to process independent signals. Wrapper to add support for threading to process independent signals.
Particularly useful when aggregating multiple elements. Particularly useful when aggregating multiple elements.
""" """
if pool or pool is None: pool = pool or 8
if pool is None: signals = signals or self.signals
pool = 8
if pool:
with Pool(pool) as p: with Pool(pool) as p:
kymographs = p.map( kymographs = p.map(
...@@ -214,7 +221,7 @@ class Grouper(ABC): ...@@ -214,7 +221,7 @@ class Grouper(ABC):
group=self.positions_groups[x[0]], group=self.positions_groups[x[0]],
**kwargs, **kwargs,
), ),
self.signals.items(), signals.items(),
) )
else: else:
kymographs = [ kymographs = [
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment