This commit is contained in:
2024-07-30 18:56:11 +02:00
parent 3e3916b786
commit d4575a6656

View File

@ -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 = [0] * len(roi_x1)
roi_results_normalised = [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_x"] = []
results["roi_intensities_proj_x"] = [] results["roi_intensities_proj_x"] = []
for iRoi in range(len(roi_x1)): for iRoi in range(len(roi_x1)):
data_roi = np.copy(pfdata[roi_y1[iRoi]:roi_y2[iRoi], roi_x1[iRoi]:roi_x2[iRoi]]) data_roi = np.copy(pfdata[roi_y1[iRoi]:roi_y2[iRoi], roi_x1[iRoi]:roi_x2[iRoi]])
roi_results[iRoi] = np.nansum(data_roi) roi_results[iRoi] = np.nansum(data_roi)
if threshold_value_choice == "NaN": if threshold_value_choice == "NaN":
roi_results_normalised[iRoi] = roi_results[iRoi] / ((roi_y2[iRoi] - roi_y1[iRoi]) * (roi_x2[iRoi] - roi_x1[iRoi])) roi_results_normalised[iRoi] = roi_results[iRoi] / ((roi_y2[iRoi] - roi_y1[iRoi]) * (roi_x2[iRoi] - roi_x1[iRoi]))
else: else:
roi_results_normalised[iRoi] = np.nanmean(data_roi) roi_results_normalised[iRoi] = np.nanmean(data_roi)
results["roi_intensities_x"].append([roi_x1[iRoi], roi_x2[iRoi]]) 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_proj_x"].append(np.nansum(data_roi, axis=0).tolist())
results["roi_intensities"] = [float(r) for r in roi_results] 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_normalised"] = [float(r) for r in roi_results_normalised]