Skip to content

Commit d1e5b98

Browse files
author
Danilo Ferreira de Lima
committed
Fixed API to include parallelize_over_tofs.
1 parent 1da6a90 commit d1e5b98

1 file changed

Lines changed: 7 additions & 5 deletions

File tree

src/extra/applications/cookiebox.py

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -467,7 +467,8 @@ def setup(self,
467467
scan: Scan,
468468
xgm: XGM,
469469
tof_response: Dict[int, TOFAnalogResponse]=None,
470-
parallel=None
470+
parallel=False,
471+
parallel_over_tofs=None,
471472
):
472473
"""
473474
Derive calibrations.
@@ -485,6 +486,7 @@ def setup(self,
485486
For example: `XGM(run, "SQS_DIAG1_XGMD/XGM/DOOCS")`
486487
tof_response: The response function object for deconvolution if that is desired.
487488
parallel: Whether to paralellize data reading.
489+
parallel_over_tofs: Whether to parallelize over eTOFs.
488490
"""
489491
# base properties
490492
self._run = run
@@ -516,7 +518,7 @@ def setup(self,
516518
self.update_metadata()
517519

518520
# find RoI if needed
519-
self.update_roi(parallel)
521+
self.update_roi(parallel, parallel_over_tofs)
520522

521523
# find where the peaks are per energy in each Tof
522524
self.update_fit_result()
@@ -680,7 +682,7 @@ def update_tof_settings(self):
680682
self.kwargs_adq[tof_id]["name"] = self._tof[tof_id].name
681683
self.mask = {tof_id: True for tof_id in self.kwargs_adq.keys()}
682684

683-
def update_roi(self, parallel=None):
685+
def update_roi(self, parallel=False, parallel_over_tofs=16):
684686
"""
685687
Given calibrated data, apply a selection and find RoI if needed.
686688
@@ -689,7 +691,7 @@ def update_roi(self, parallel=None):
689691
"""
690692
# average data for each energy slice
691693
logging.info("Reading calibration data ... (this takes a while)")
692-
self.select_calibration_data(parallel)
694+
self.select_calibration_data(parallel, parallel_over_tofs=parallel_over_tofs)
693695
# find RoI if needed
694696
if (self.auger_start_roi is None
695697
or self.start_roi is None
@@ -723,7 +725,7 @@ def update_calibration(self):
723725
def fast_response_correction(self, x, tof_id):
724726
return self._tof_response[tof_id].apply(x.fillna(0.0), method="nn_matrix", n_iter=100, nonneg=True)
725727

726-
def select_calibration_data(self, parallel=None, parallel_over_tofs=None):
728+
def select_calibration_data(self, parallel=False, parallel_over_tofs=None):
727729
"""
728730
Select data for calibration.
729731
"""

0 commit comments

Comments
 (0)