Merge branch 'FABLE-3DXRD:master' into master

jadball · Jan 23, 2025 · 2f7d37b · 2f7d37b
2 parents f84274f + 507440e
commit 2f7d37b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/ImageD11/__init__.py b/ImageD11/__init__.py
@@ -18,7 +18,7 @@
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 """
 
-__version__ = "2.0.2"
+__version__ = "2.0.5"
 __author__ = 'Jon Wright',
 __author_email__ = '[email protected]'
 

diff --git a/ImageD11/frelon_peaksearch.py b/ImageD11/frelon_peaksearch.py
@@ -360,7 +360,7 @@ def guess_bg(ds, scan_number=0, start=0, step=9, n=None):
 PKCOL = [getattr(ImageD11.cImageD11, p) for p in PKSAVE]
 
 
-def process(ds, worker_args, ncpu=None):
+def process(ds, worker_args, ncpu=None, **process_map_kwargs):
     """
     Runs over the first scan in a dataset in parallel
 
@@ -382,8 +382,9 @@ def process(ds, worker_args, ncpu=None):
     n_frames = omega.shape[0]
 
     args = [(hname, frames_dset, i, omega[i], worker_args) for i in range(n_frames)]
+
 
-    all_peaks = process_map(pps, args, chunksize=1, max_workers=nthreads)
+    all_peaks = process_map(pps, args, chunksize=1, max_workers=nthreads, **process_map_kwargs)
 
     # make a dict to hold our results in
     cf_2d_dict = {}