From a9a73f0d3ff9564e5dce315b14a674e3740b29a6 Mon Sep 17 00:00:00 2001 From: Sven Augustin Date: Sat, 25 Oct 2025 21:33:35 +0200 Subject: [PATCH] renamed: pf_pixel_mask -> pixel_mask --- dap/algos/streakfind.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dap/algos/streakfind.py b/dap/algos/streakfind.py index 0c3a7f6..39ef5fa 100644 --- a/dap/algos/streakfind.py +++ b/dap/algos/streakfind.py @@ -28,17 +28,17 @@ def _handle_negative_values(data, mask, handler: str): data[data<0] = 0 -def calc_streakfinder_analysis(results, data, pf_pixel_mask): +def calc_streakfinder_analysis(results, data, pixel_mask): do_snr = results.get("do_snr", False) do_streakfinder_analysis = results.get("do_streakfinder_analysis", False) if not do_snr and not do_streakfinder_analysis: return data negative_val_handler = results.get("cbd_negative_handler", "") - _handle_negative_values(data, pf_pixel_mask, negative_val_handler) + _handle_negative_values(data, pixel_mask, negative_val_handler) try: - snr = _calc_snr(results, data, pf_pixel_mask) + snr = _calc_snr(results, data, pixel_mask) except Exception as error: # Broad exception - we don't want to break anything here results["cbd_error"] = f"SNR - Error processing CBD data:\n{error}" return data @@ -48,13 +48,13 @@ def calc_streakfinder_analysis(results, data, pf_pixel_mask): data = snr try: - _calc_streakfinder_analysis(results, snr, pf_pixel_mask) + _calc_streakfinder_analysis(results, snr, pixel_mask) except Exception as error: # Broad exception - we don't want to break anything here results["cbd_error"] = f"StreakFind - Error processing CBD data:\n{error}" return data -def _calc_snr(results, data, pf_pixel_mask): +def _calc_snr(results, data, pixel_mask): params_required = [ "cbd_whitefield_data_file", "cbd_std_data_file", @@ -81,12 +81,12 @@ def _calc_snr(results, data, pf_pixel_mask): mask_data_file = results.get("cbd_mask_data_file", None) if mask_data_file is None: - mask = pf_pixel_mask + mask = pixel_mask else: mask_dataset = results.get("cbd_mask_dataset", "entry/instrument/detector/mask") with h5py.File(mask_data_file, "r") as hf: mask = hf[mask_dataset][:].astype(bool) - mask *= pf_pixel_mask + mask *= pixel_mask if scale_whitefield: _scale_whitefield(data, mask, whitefield, std, results.get("cbd_num_threads", DEFAULT_NUM_THREADS)) snr = np.divide( @@ -181,7 +181,7 @@ def _calc_streakfinder_analysis(results, snr, mask): num_threads=num_threads) peaks = filter_peaks(peaks, region, region_mask, peaks_structure, peak_vmin, npts, num_threads=num_threads) - + detected = detect_streaks(peaks, region, region_mask, streaks_structure, xtol, streak_vmin, min_size, lookahead, nfa, num_threads=num_threads)