diff --git a/.gitignore b/.gitignore index bb689d9..57823e2 100644 --- a/.gitignore +++ b/.gitignore @@ -253,5 +253,5 @@ config/* func/detect_Jpeak_model/* .idea/* !./logs -!./config -!./func/detect_Jpeak_model \ No newline at end of file +!./config/.gitkeep +!./func/detect_Jpeak_model diff --git a/func/Module_SA_label_v2.py b/func/Module_SA_label_v2.py index 499f0c0..b7afb5e 100644 --- a/func/Module_SA_label_v2.py +++ b/func/Module_SA_label_v2.py @@ -354,7 +354,9 @@ class Data: "Get_Artifact_Format_Exception"] + "\n" + format_exc()) self.config.update({ - "SignalSecond": int(len(self.OrgBCG) // self.config["Config"]["InputConfig"]["OrgBCGFreq"]) + "SignalSecond": min(int(len(self.OrgBCG) // self.config["Config"]["InputConfig"]["OrgBCGFreq"]), + int(len(self.Tho) // self.config["Config"]["InputConfig"]["ThoFreq"]), + ) }) # 批量将睡眠分期按照映射转换为数字 diff --git a/func/Module_approximately_align.py b/func/Module_approximately_align.py index 8328c1c..9af0529 100644 --- a/func/Module_approximately_align.py +++ b/func/Module_approximately_align.py @@ -1353,7 +1353,7 @@ class Data: # 计算互相关1/2 try: # 计算因子 - MULTIPLE_FACTOER = Params.APPROXIMATELY_ALIGN_CONFIG_NEW_CONTENT["Multiple_Factor"] + # MULTIPLE_FACTOER = Params.APPROXIMATELY_ALIGN_CONFIG_NEW_CONTENT["Multiple_Factor"] a = self.processed_downsample_Tho[ Config["PSGConfig"]["PreCut"]:len(self.processed_downsample_Tho) - Config["PSGConfig"][ "PostCut"]].copy() @@ -1365,7 +1365,7 @@ class Data: # a = a.astype(int64) # v = v.astype(int64) tho_relate = correlate(a, v, mode='full') - tho_relate = tho_relate / (MULTIPLE_FACTOER ** 2) + # tho_relate = tho_relate / (MULTIPLE_FACTOER ** 2) tho_relate2 = - tho_relate result = {"tho_relate": tho_relate, "tho_relate2": tho_relate2} diff --git a/func/Module_cut_pair_file.py b/func/Module_cut_pair_file.py index adfb2b4..134fd94 100644 --- a/func/Module_cut_pair_file.py +++ b/func/Module_cut_pair_file.py @@ -547,6 +547,7 @@ class Data: try: for key, raw in self.raw.items(): + print(f"Cutting data for channel: {key}, original length: {len(raw)}") if Config["ChannelInput"][key].startswith("PSG:"): # 转换切割点 ECG_freq = Config["ECGFreq"]