From 92e59c8c0963c12a817bc8bdb4ae235ea3d129ba Mon Sep 17 00:00:00 2001 From: Lan Le Date: Thu, 16 Nov 2023 11:19:48 +0100 Subject: [PATCH] fix: fix cannot remove cv data --- chem_spectra/lib/composer/ni.py | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/chem_spectra/lib/composer/ni.py b/chem_spectra/lib/composer/ni.py index 1fb8d52e..7074f310 100644 --- a/chem_spectra/lib/composer/ni.py +++ b/chem_spectra/lib/composer/ni.py @@ -162,7 +162,14 @@ def __gen_cyclic_voltammetry_data_peaks(self): x_max_peak, y_max_peak = self.__get_xy_of_peak(max_peak) x_min_peak, y_min_peak = self.__get_xy_of_peak(min_peak) - if (x_max_peak == '' and x_min_peak == ''): + x_pecker = '' + if 'pecker' in peak and peak['pecker'] is not None: + pecker = peak['pecker'] + x_pecker = pecker['x'] + y_pecker = pecker['y'] + x_pecker = f"{float(x_pecker)}" + + if (x_max_peak == '' and x_min_peak == '' and x_pecker == ''): # ignore if missing both max and min peak continue @@ -171,16 +178,11 @@ def __gen_cyclic_voltammetry_data_peaks(self): else: delta = abs(x_max_peak - x_min_peak) - x_pecker = '' + # calculate ratio if (y_min_peak == '' or y_max_peak == ''): ratio = '' else: - if 'pecker' in peak and peak['pecker'] is not None: - pecker = peak['pecker'] - x_pecker = pecker['x'] - y_pecker = pecker['y'] - x_pecker = f"{float(x_pecker)}" first_expr = abs(y_min_peak) / abs(y_max_peak) second_expr = 0.485 * abs(y_pecker) / abs(y_max_peak) ratio = first_expr + second_expr + 0.086