* Replace f_0 by f_min*0.9

* Fixed home_dir for saving

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

diff --git a/CNAQ.m b/CNAQ.m
index 7234a33addae645a04c662dd526909221bbd7786..abd4b7114a8314e2f4d1625eb2ed81d23342ab75 100644 (file)
--- a/CNAQ.m
+++ b/CNAQ.m
@@ -170,7 +170,7 @@ set(handles.channels_in,'String','1|1 2|1 2 3|1 2 3 4|1 2 3 4 5 6 7 8');
 set(handles.channels_out,'String','1|1 2|1 2 3|1 2 3 4|1 2 3 4 5 6 7 8');\r
 \r
 set(handles.analysis_type,'String','Default');\r
-set(handles.analysis_method,'String','Transfer function|Deconvolution');\r
+set(handles.analysis_method,'String','Division|Deconvolution');\r
 set(handles.analysis_domain,'String','Frequency|Time|Time/Frequency');\r
 set(handles.in_on_off,'UserData',device);\r
 set(handles.save_button,'UserData',latency);\r
@@ -387,6 +387,7 @@ function plot_Callback(hObject, eventdata, handles)
      \r
 % SAVE all data in a mat file \r
 function save_button_Callback(hObject, eventdata, handles)\r
+    home_dir = get(handles.home_dir_box,'String');\r
     cd(home_dir);\r
     save_mes(handles);\r
     \r

diff --git a/tools/measurement.m b/tools/measurement.m
index 471f67441feabb56285d6656d1ae863622c39da9..4c59322b8a6074670d4b8ab632e6b955456dbd98 100644 (file)
--- a/tools/measurement.m
+++ b/tools/measurement.m
@@ -22,7 +22,7 @@ function measurement(handles)
     gain_out = 10^(gain_out/20);
     
     % Avoid Gibbs like phenomenon
-    f0 = 1;
+    f0 = f_min*0.9;
     f1 = f_min;
     f2 = f_max;
     f3 = f_s/2;