diff --git a/src/cal_tools/agipdlib.py b/src/cal_tools/agipdlib.py index 87e898cbf5b9a10bc91abd391c09245e5e649be2..8d2ae746d6a32b5d101420a4234cff22d5cc2fb9 100644 --- a/src/cal_tools/agipdlib.py +++ b/src/cal_tools/agipdlib.py @@ -306,12 +306,13 @@ class CellSelection: :param train_sel: list of a train ids selected for processing :param nfrm: the number of frames expected for every train in the list `train_sel` + :param cellid: array of cell IDs in the same sequence as images to + filter :param cm: flag indicates the final selection or interim selection for common-mode correction - - :return: boolean array with flags indicating images for processing - :return: integer array with number of frames to use in the second - step in two step selection procedure + :returns: + - boolean array with flags indicating images for processing + - integer array with number of selected frames in trains """ raise NotImplementedError @@ -1709,10 +1710,10 @@ class LitFrameSelection(CellSelection): if cm < 0 or cm > 2: raise ValueError("param 'cm' takes only 0,1,2") - sel, = self._sel.litframes_on_trains( + (sel, counts), = self._sel.litframes_on_trains( train_sel, nfrm, cellid, [self.sel_type[cm]]) - return sel + return sel, counts def filter_trains(self, train_sel: np.ndarray): return self._sel.filter_trains(train_sel, drop_empty=True)