diff --git a/func/Module_precisely_align.py b/func/Module_precisely_align.py index 2538102..6e3ee8e 100644 --- a/func/Module_precisely_align.py +++ b/func/Module_precisely_align.py @@ -14,7 +14,7 @@ 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) from overrides import overrides from pandas import read_csv, DataFrame -# from resampy import resample +from resampy import resample as rspy_resample from scipy.signal import find_peaks, resample as ss_resample from yaml import dump, load, FullLoader @@ -1970,8 +1970,8 @@ class Data: Config["back"]["anchor_J"] = Config["back"]["anchor_J"] + Config["offset_anchor"] Config["frontcut_index_BCG"] -= Config["offset_anchor"] - self.res_BCG = resample(self.res_BCG, Config["orgfs"], Config["InputConfig"]["UseFreq"]) - self.res_orgBcg = resample(self.res_orgBcg, Config["orgfs"], Config["InputConfig"]["UseFreq"]) + self.res_BCG = rspy_resample(self.res_BCG, Config["orgfs"], Config["InputConfig"]["UseFreq"]) + self.res_orgBcg = rspy_resample(self.res_orgBcg, Config["orgfs"], Config["InputConfig"]["UseFreq"]) Config["front"]["anchor_J"] = round(int(Config["front"]["anchor_J"]) * Config["InputConfig"]["UseFreq"] / Config["orgfs"]) Config["back"]["anchor_J"] = round(int(Config["back"]["anchor_J"]) * Config["InputConfig"]["UseFreq"] / Config["orgfs"]) @@ -2136,7 +2136,7 @@ class Data: Path(Config["Path"]["Save_OrgBCG"]).parent.mkdir(parents=True, exist_ok=True) if Config["InputConfig"]["orgBcgFreq"] != Config["InputConfig"]["UseFreq"]: - self.res_orgBcg = resample(self.res_orgBcg, + self.res_orgBcg = ss_resample(self.res_orgBcg, int(len(self.res_orgBcg) * (Config["InputConfig"]["orgBcgFreq"] / Config["InputConfig"]["UseFreq"])))