diff trunk/matlab/bmm/carfac/CARFAC_binaural.m @ 535:dcf18d03d608

A few straggling fixes for binaural files

--- a/trunk/matlab/bmm/carfac/CARFAC_binaural.m	Fri Mar 16 04:19:24 2012 +0000
+++ b/trunk/matlab/bmm/carfac/CARFAC_binaural.m	Fri Mar 16 04:31:56 2012 +0000
@@ -34,18 +34,18 @@
              
 CF_struct = CARFAC_Design;  % default design
 
-% Run mono, then stereo test:
-n_mics = 2
-CF_struct = CARFAC_Init(CF_struct, n_mics);
+% Run stereo test:
+n_ears = 2
+CF_struct = CARFAC_Init(CF_struct, n_ears);
   
-[nap, CF_struct, nap_decim] = CARFAC_Run(CF_struct, test_signal, agc_plot_fig_num);
+[CF_struct, nap_decim, nap] = CARFAC_Run(CF_struct, test_signal, agc_plot_fig_num);
 
-% Display results for 1 or 2 mics:
-for mic = 1:n_mics
-  smooth_nap = nap_decim(:, :, mic);
-  figure(mic + n_mics)  % Makes figures 2, 3, and 4
+% Display results for 2 ears:
+for ear = 1:n_ears
+  smooth_nap = nap_decim(:, :, ear);
+  figure(ear + n_ears)  % Makes figures 3 and 4
   image(63 * ((smooth_nap)' .^ 0.5))
-    
+
   colormap(1 - gray);
 end
 
@@ -53,7 +53,7 @@
 
 % Show resulting data, even though M-Lint complains:
 CF_struct
-CF_struct.filter_state
+CF_struct.CAR_state
 CF_struct.AGC_state
 min_max = [min(nap(:)), max(nap(:))]
 min_max_decim = [min(nap_decim(:)), max(nap_decim(:))]