Skip to content
Snippets Groups Projects
Commit f4e0028c authored by Mikhail Karnevskiy's avatar Mikhail Karnevskiy
Browse files

Add option to exclude evaluation of peaks for active peak-finder (in the list of peak-finders).

parent 63d161e2
No related branches found
No related tags found
1 merge request!2Next development step
......@@ -145,11 +145,12 @@ class MainController:
self.widget.mouse_pos_widget.y_pos_lbl.setText(f'2θ: {tth:.1f}')
self.widget.mouse_pos_widget.int_lbl.setText(f'I: {z:.1f}')
def recalculate_peaks_from_model(self, exclude=None):
def recalculate_peaks_from_model(self, exclude_active=False):
self.model.peaks.clean()
processes = self.widget.peak_widget.procs_view.get_processes()
for method, parameters in processes:
if method == exclude:
edit_idx = self.widget.peak_widget.procs_view.edit_proc_idx()
for i, [method, parameters] in enumerate(processes):
if exclude_active and i == edit_idx:
continue
peaks = find_peaks(method, self.model.pattern.data, parameters)
for peak in peaks:
......@@ -500,7 +501,7 @@ class MainController:
def evaluate_peaks(self, method=None, parameters=None, add=False):
log.debug(f"Evaluate peaks with method: {method}")
self.recalculate_peaks_from_model(exclude=method)
self.recalculate_peaks_from_model(exclude_active=True)
if method not in ['Manual', 'Background']:
self.widget.peak_widget.procs_view.add_process(method, parameters.copy(), add)
if len(parameters) > 0:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment