diff testPrograms/test_MAP1_14.m @ 21:c489ebada16e

pre Oldenburg changes

--- a/testPrograms/test_MAP1_14.m	Tue Jun 07 09:53:50 2011 +0100
+++ b/testPrograms/test_MAP1_14.m	Mon Jun 13 18:13:29 2011 +0100
@@ -47,22 +47,22 @@
 signalType= 'tones';
 duration=0.100;                 % seconds
 % duration=0.020;                 % seconds
-sampleRate= 64000;
+sampleRate= 100000;
 % toneFrequency= 250:250:8000;    % harmonic sequence (Hz)
 toneFrequency= 2000;            % or a pure tone (Hz8
 
 rampDuration=.005;              % seconds
 
-% or
-signalType= 'file';
-fileName='twister_44kHz';
-% fileName='new-da-44khz';
+% % or
+% signalType= 'file';
+% fileName='twister_44kHz';
+% % fileName='new-da-44khz';
 
 % mix with an optional second file?
 mixerFile=[];
 %or
-mixerFile='babble';
-leveldBSPL2=-60;
+% mixerFile='babble';
+% leveldBSPL2=30;
 
 %% #4 rms level
 % signal details
@@ -93,7 +93,7 @@
 %     'DRNLParams.rateToAttenuationFactorProb = 0;'};
 
 %% delare showMap options
-showMapOptions=[];  % use defaults
+global showMapOptions
 
 % or (example: show everything including an smoothed SACF output
 showMapOptions.showModelParameters=1;
@@ -103,9 +103,13 @@
 showMapOptions.showEfferent=1;
 if strcmp(AN_spikesOrProbability, 'probability')
     showMapOptions.surfProbability=1;
+else
+    showMapOptions.surfProbability=0;
 end
 if strcmp(signalType, 'file')
     showMapOptions.fileName=fileName;
+else
+    showMapOptions.fileName=[];
 end
 
 %% Generate stimuli
@@ -126,6 +130,8 @@
         rms=(mean(inputSignal.^2))^0.5;
         amp=targetRMS/rms;
         inputSignal=inputSignal*amp;
+        silence=zeros(10000,1);
+        inputSignal=[silence; inputSignal];
         if ~isempty(mixerFile)
             [inputSignal2 sampleRate]=wavread(mixerFile);
             inputSignal2=inputSignal2(:,1);
@@ -157,7 +163,7 @@
 toc
 
 % the model run is now complete. Now display the results
-showMAP(showMapOptions)
+showMAP
 for i=1:length(paramChanges)
 disp(paramChanges{i})
 end