diff --git a/3D_app/Bscan_Cscan_trait.py b/3D_app/Bscan_Cscan_trait.py index adfbf85..1461232 100644 --- a/3D_app/Bscan_Cscan_trait.py +++ b/3D_app/Bscan_Cscan_trait.py @@ -6,19 +6,22 @@ def Bscant(data_input,sel1,sel2,sel3,fs_1, cut_off_1, order_1, window_size_1,fs_ for i in range (0,size_data_input[1]-1): l=switch_case(data_input[:,i],sel1) l2=switch_case(l,sel2, fs_1, cut_off_1, order_1, window_size_1) - l3=switch_case(l,sel3, fs_2, cut_off_2, order_2, window_size2) + l3=switch_case(l2,sel3, fs_2, cut_off_2, order_2, window_size2) tab.append(l3) + tab=np.array(tab) return tab def Cscant(data_input,sel1,sel2,sel3,fs_1, cut_off_1, order_1, window_size_1,fs_2, cut_off_2, order_2, window_size2): - tab1=[] - tab=[] + tab=np.copy(data_input) size_data_input=np.shape(data_input) - for i in range(0,size_data_input[0]-1): - for i in range (0,size_data_input[2]-1): - l=switch_case(data_input[:,i],sel1) + for i in range(0,size_data_input[0]): + tab1=[] + for j in range (0,size_data_input[2]): + l=switch_case(data_input[i,:,j],sel1) l2=switch_case(l,sel2, fs_1, cut_off_1, order_1, window_size_1) - l3=switch_case(l,sel3, fs_2, cut_off_2, order_2, window_size2) - tab1.append(l3) - tab.append(tab1) + l3=switch_case(l2,sel3, fs_2, cut_off_2, order_2, window_size2) + tab1.append(l3) + tab1 = np.array(tab1) + tab1=tab1.T + tab[i,:,:]=tab1 return tab