* Fixed RI with transfert function method

git-svn-id: http://svn.parisson.org/svn/CNAQ/trunk@169 5fc3e0e6-29bc-4d03-b52b-c088cb822bde

diff --git a/tools/fonc_trans.m b/tools/fonc_trans.m
index fb186ac9c21953216c5b61aa5a0d92081aec2301..434d6c6e1ce4c7cb8d752826a1cf545d1d00439b 100644 (file)
--- a/tools/fonc_trans.m
+++ b/tools/fonc_trans.m
@@ -1,4 +1,4 @@
-function [ri,ft]=fonc_trans(f, sig_exc, sig_mes);\r
+function [ri,ft]=fonc_trans(f, sig_exc, sig_mes, f_s)\r
 %calcul d'une fonction de tranfert mesurée par l'interface CNAQ\r
 %Sorties : fonction de transfert et réponse impulsionnelle \r
 \r
@@ -8,7 +8,7 @@ sig_mes = sig_mes - DC;
 len_f = length(f);\r
 \r
 % Methode du quotient\r
-X = fft([sig_exc; zeros(len_f-1,1)]);\r
-Y = fft([sig_mes; zeros(len_f-1,1)]);\r
+X = fft([sig_exc;zeros(len_f-1,1)]);\r
+Y = fft([zeros(len_f-1,1);sig_mes]);\r
 ft = Y./X;\r
-ri = real(ifft(ft));\r
+ri = real(ifft(ft))*f_s;\r

diff --git a/tools/get_ri_spec.m b/tools/get_ri_spec.m
index 715bf1130ee6771b7e003eb31b26fd0af93c8208..21efd8ac8953dee0faa4293bd2aae502331cabb3 100644 (file)
--- a/tools/get_ri_spec.m
+++ b/tools/get_ri_spec.m
@@ -3,7 +3,7 @@ function [ri, spec] = get_spec_ri(f, sig_exc, sig_mes, f_s, mes_type)
     
     if mes_type == 1
         % Frequency method
-        [ri, spec] = fonc_trans(f, sig_exc, sig_mes);
+        [ri, spec] = fonc_trans(f, sig_exc, sig_mes, f_s);
     elseif mes_type == 2
         % Temporal method
         [ri, spec] = RI_FT(f, sig_exc, sig_mes, f_s);

diff --git a/tools/plot_mes.m b/tools/plot_mes.m
index a71aff164806513fb544f2017d550041455faa12..80c6fc48fd52712556b6c541765d0ded9f23bc91 100644 (file)
--- a/tools/plot_mes.m
+++ b/tools/plot_mes.m
@@ -16,13 +16,13 @@ title(['Signal temporel mesur
 grid on;\r
 \r
 subplot(2,1,2);\r
-rep_imp_mes = real(rep_imp_mes);\r
 len_ri = length(rep_imp_mes);\r
-t_ri = [-len_ri/(2*f_s):1/f_s:len_ri/(2*f_s)];\r
-t_ri = t_ri(2:length(t_ri));\r
+t_ri = [(-len_ri+1)/(2*f_s):1/f_s:len_ri/(2*f_s)];\r
+%t_ri = [0:1/f_s:len_ri/f_s];\r
+t_ri = t_ri(1:length(t_ri)-1);\r
 plot(t_ri, rep_imp_mes);\r
 %semilogx(t, sig_mes);\r
-axis([t_ri(1) t_ri(len_ri) min(rep_imp_mes)-0.01 max(rep_imp_mes)+0.01]);\r
+axis([-t_ri(len_ri) t_ri(len_ri) min(rep_imp_mes)-0.01 max(rep_imp_mes)+0.01]);\r
 %axis([1 t(length(t)) min(sig_mes)-0.01 max(sig_mes)+0.01]);\r
 xlabel('Temps (s)');\r
 ylabel('Amplitude');\r