* Fixed -6db/oct for RI

* Fixed date

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

diff --git a/CNAQ.m b/CNAQ.m
index 52f30c0cd429b0bc0920012467b64078f7c70e26..c14dad14f3f575d86f38b5937fbe3997399267c7 100644 (file)
--- a/CNAQ.m
+++ b/CNAQ.m
@@ -1,7 +1,7 @@
 function varargout = CNAQ(varargin)\r
 %  CNAQ M-file for CNAQ.fig\r
 %\r
-%  Copyright (c) 2007 Guillaume Pellerin <guillaume.pellerin@cnam.fr>\r
+%  Copyright (c) 2007-2008 Guillaume Pellerin <guillaume.pellerin@cnam.fr>\r
 %  All rights reserved.\r
 \r
 %  This software is governed by the CeCILL license under French law and\r

diff --git a/tools/RI_FT.m b/tools/RI_FT.m
index 140f68d60f10704b4abd0a30dbcc6dcffc133a80..33e81abcab164e9c40dfbcc1b0cdb5245d188e60 100644 (file)
--- a/tools/RI_FT.m
+++ b/tools/RI_FT.m
@@ -10,7 +10,7 @@ f0 = f(1);
 f1 = f(len_f);\r
 \r
 % Methode du produit\r
-siginv=fliplr(sig_exc)./f;\r
+siginv=flipud(sig_exc)./f;\r
 ft=fft([sig_mes; zeros(len_f-1,1)]).*fft([siginv; zeros(len_f-1,1)]);\r
 ri=real(ifft(ft));\r
 norm=sqrt(sum(abs(ri.^2))/len_f);\r

diff --git a/tools/fonc_trans.m b/tools/fonc_trans.m
index a58b6835f57d84ffb28582260b8592313a34b230..fb186ac9c21953216c5b61aa5a0d92081aec2301 100644 (file)
--- a/tools/fonc_trans.m
+++ b/tools/fonc_trans.m
@@ -6,22 +6,9 @@ function [ri,ft]=fonc_trans(f, sig_exc, sig_mes);
 DC = mean(sig_mes,1);\r
 sig_mes = sig_mes - DC;\r
 len_f = length(f);\r
-f0 = f(1);\r
-f1 = f(length(f));\r
-\r
-% Methode du produit\r
-%sig_exc_inv = sig_exc(len_f:-1:1)'.*f0./f';\r
-%X = fft([sig_mes; zeros(length(sig_exc_inv)-1, 1)]);\r
-%Y = fft([sig_exc_inv; zeros(length(sig_mes)-1, 1)]);\r
-%spec=X.*Y;\r
-%rep_imp = ifft(spec);\r
 \r
 % Methode du quotient\r
-%sig_exc = sig_exc(len_f:-1:1)'.*f0./f';\r
-X = fft(sig_exc);\r
-Y = fft(sig_mes);\r
+X = fft([sig_exc; zeros(len_f-1,1)]);\r
+Y = fft([sig_mes; zeros(len_f-1,1)]);\r
 ft = Y./X;\r
-ri = ifft(ft);\r
-\r
-% Methode par déconvolution\r
-%[ft, r] = deconv(sig_mes, sig_exc);\r
+ri = real(ifft(ft));\r