Compare commits

..

2 Commits

View File

@ -14,8 +14,9 @@ from numpy import (diff, where, correlate, corrcoef, searchsorted, sum as np_sum
append, delete, abs as np_abs, argmin as np_argmin, argmax as np_argmax, asarray) append, delete, abs as np_abs, argmin as np_argmin, argmax as np_argmax, asarray)
from overrides import overrides from overrides import overrides
from pandas import read_csv, DataFrame from pandas import read_csv, DataFrame
from resampy import resample # from resampy import resample
from scipy.signal import find_peaks
from scipy.signal import find_peaks, resample as ss_resample
from yaml import dump, load, FullLoader from yaml import dump, load, FullLoader
from func.utils.ConfigParams import Filename, Params from func.utils.ConfigParams import Filename, Params
@ -1685,7 +1686,7 @@ class Data:
Config["InputConfig"]["BCGFreq"]) + Params.ENDSWITH_TXT)) Config["InputConfig"]["BCGFreq"]) + Params.ENDSWITH_TXT))
Config["Path"]["Save_BCG"] = str( Config["Path"]["Save_BCG"] = str(
Path(Config["Path"]["Save_BCG"]) / Path( Path(Config["Path"]["Save_BCG"]) / Path(
Filename.BCG_SYNC + str(Config["InputConfig"]["BCGFreq"]) + Params.ENDSWITH_TXT)) Filename.BCG_SYNC + str(Config["InputConfig"]["UseFreq"]) + Params.ENDSWITH_TXT))
Config["Path"]["Save_Jpeak"] = str( Config["Path"]["Save_Jpeak"] = str(
Path(Config["Path"]["Save_Jpeak"]) / Path( Path(Config["Path"]["Save_Jpeak"]) / Path(
Filename.JPEAK_SYNC + str(Config["InputConfig"]["BCGFreq"]) + Params.ENDSWITH_TXT)) Filename.JPEAK_SYNC + str(Config["InputConfig"]["BCGFreq"]) + Params.ENDSWITH_TXT))
@ -1771,7 +1772,7 @@ class Data:
try: try:
if Config["InputConfig"]["orgBcgFreq"] != Config["InputConfig"]["UseFreq"]: if Config["InputConfig"]["orgBcgFreq"] != Config["InputConfig"]["UseFreq"]:
self.raw_orgBcg = resample(self.raw_orgBcg, self.raw_orgBcg = ss_resample(self.raw_orgBcg,
int(len(self.raw_orgBcg) * int(len(self.raw_orgBcg) *
(Config["InputConfig"]["UseFreq"] / Config["InputConfig"][ (Config["InputConfig"]["UseFreq"] / Config["InputConfig"][
"orgBcgFreq"]))) "orgBcgFreq"])))