From d4575a665606ae3b64388585660d738f7db5eb96 Mon Sep 17 00:00:00 2001 From: Sven Augustin Date: Tue, 30 Jul 2024 18:56:11 +0200 Subject: [PATCH] de-arrow --- dap/algos/roi.py | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/dap/algos/roi.py b/dap/algos/roi.py index 00d764b..580c33e 100644 --- a/dap/algos/roi.py +++ b/dap/algos/roi.py @@ -5,25 +5,26 @@ def calc_roi(results, pfdata, roi_x1, roi_x2, roi_y1, roi_y2, pixel_mask_pf, thr roi_results = [0] * len(roi_x1) roi_results_normalised = [0] * len(roi_x1) - if pixel_mask_pf is not None: + if pixel_mask_pf is None: + return - results["roi_intensities_x"] = [] - results["roi_intensities_proj_x"] = [] + results["roi_intensities_x"] = [] + results["roi_intensities_proj_x"] = [] - for iRoi in range(len(roi_x1)): - data_roi = np.copy(pfdata[roi_y1[iRoi]:roi_y2[iRoi], roi_x1[iRoi]:roi_x2[iRoi]]) + for iRoi in range(len(roi_x1)): + data_roi = np.copy(pfdata[roi_y1[iRoi]:roi_y2[iRoi], roi_x1[iRoi]:roi_x2[iRoi]]) - roi_results[iRoi] = np.nansum(data_roi) - if threshold_value_choice == "NaN": - roi_results_normalised[iRoi] = roi_results[iRoi] / ((roi_y2[iRoi] - roi_y1[iRoi]) * (roi_x2[iRoi] - roi_x1[iRoi])) - else: - roi_results_normalised[iRoi] = np.nanmean(data_roi) + roi_results[iRoi] = np.nansum(data_roi) + if threshold_value_choice == "NaN": + roi_results_normalised[iRoi] = roi_results[iRoi] / ((roi_y2[iRoi] - roi_y1[iRoi]) * (roi_x2[iRoi] - roi_x1[iRoi])) + else: + roi_results_normalised[iRoi] = np.nanmean(data_roi) - results["roi_intensities_x"].append([roi_x1[iRoi], roi_x2[iRoi]]) - results["roi_intensities_proj_x"].append(np.nansum(data_roi, axis=0).tolist()) + results["roi_intensities_x"].append([roi_x1[iRoi], roi_x2[iRoi]]) + results["roi_intensities_proj_x"].append(np.nansum(data_roi, axis=0).tolist()) - results["roi_intensities"] = [float(r) for r in roi_results] - results["roi_intensities_normalised"] = [float(r) for r in roi_results_normalised ] + results["roi_intensities"] = [float(r) for r in roi_results] + results["roi_intensities_normalised"] = [float(r) for r in roi_results_normalised]