changeset 8:eafe11c86f44

May 27 multiThreshold changes
author Ray Meddis <rmeddis@essex.ac.uk>
date Fri, 27 May 2011 17:50:40 +0100
parents 573c75007cf4
children ecad0ea62b43
files MAP/MAP1_14.m multithreshold 1.46/expGUI_MT.m multithreshold 1.46/savedData/mostRecentResults.mat multithreshold 1.46/testRP.m parameterStore/MAPparamsNormal.m
diffstat 5 files changed, 14 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/MAP/MAP1_14.m	Fri May 27 14:29:28 2011 +0100
+++ b/MAP/MAP1_14.m	Fri May 27 17:50:40 2011 +0100
@@ -295,9 +295,11 @@
 IHCs0= IHC_cilia_RPParams.s0;
 IHCs1= IHC_cilia_RPParams.s1;
 IHCGmax= IHC_cilia_RPParams.Gmax;
-IHCGu0= IHC_cilia_RPParams.Gu0; % (leakage)
-IHCGa= IHCGmax./(1+exp(-(0-IHCu0)/IHCs0).*(1+exp(-(0-IHCu1)/IHCs1)));
-IHCrestingCiliaCond=IHCGa+IHCGu0;
+IHCGa= IHC_cilia_RPParams.Ga; % (leakage)
+
+IHCGu0 = IHCGa+IHCGmax./(1+exp(IHCu0/IHCs0).*(1+exp(IHCu1/IHCs1)));
+
+
 
 % Receptor potential
 IHC_Cab= IHC_cilia_RPParams.Cab;
@@ -307,6 +309,9 @@
 IHC_Ekp= IHC_Ek+IHC_Et*IHC_cilia_RPParams.Rpc;
 
 IHCrestingV= -0.06;
+
+IHCrestingV= (IHC_Gk*IHC_Ek+IHCGu0*IHC_Et)/(IHCGu0+IHC_Gk);
+
 IHC_Vnow= IHCrestingV*ones(nBFs,1); % initial voltage
 IHC_RP= zeros(nBFs,segmentLength);
 
@@ -674,9 +679,7 @@
     % compute apical conductance
     G=1./(1+exp(-(IHCciliaDisplacement-IHCu0)/IHCs0).*...
         (1+exp(-(IHCciliaDisplacement-IHCu1)/IHCs1)));
-    Gu=IHCGmax*G;
-    % add resting conductance to give apical conductance
-    Gu= Gu+IHCGu0;
+    Gu=IHCGmax*G + IHCGa;
 
     % Compute receptor potential
     for idx=1:segmentLength
--- a/multithreshold 1.46/expGUI_MT.m	Fri May 27 14:29:28 2011 +0100
+++ b/multithreshold 1.46/expGUI_MT.m	Fri May 27 17:50:40 2011 +0100
@@ -552,7 +552,7 @@
         
         % paradigms with maskers
     case {'forwardMasking','forwardMaskingD','trainingIFMC', 'TMC','TMC_16ms', ...
-           'TMCmodel','IFMC','IFMC_8ms','GOM','overShoot','overShootB',...
+           'TMCmodel','IFMC','IFMC_8ms', 'IFMC_16ms','GOM','overShoot','overShootB',...
            'gapDetection', 'psychometric', 'FMreProbe'}
         set(handles.editmaskerDuration,'visible', 'on')
         set(handles.editmaskerLevel,'visible', 'on')
@@ -928,7 +928,7 @@
 
 switch experiment.paradigm
     %     case { 'TMC',  'TMCmodel','IFMC'}
-    case {'trainingIFMC', 'TMC','TMC_16ms', 'TMC - ELP', 'IFMC'}
+    case {'trainingIFMC', 'TMC','TMC_16ms', 'TMC - ELP', 'IFMC', 'IFMC_16ms'}
         
         % For TMC and IFMC multiple target levels can be set
         if length(stimulusParameters.targetLevel)==1
Binary file multithreshold 1.46/savedData/mostRecentResults.mat has changed
--- a/multithreshold 1.46/testRP.m	Fri May 27 14:29:28 2011 +0100
+++ b/multithreshold 1.46/testRP.m	Fri May 27 17:50:40 2011 +0100
@@ -153,7 +153,6 @@
     subplot(2,2,3)
     % RP I/O function min and max
     restingRP=IHC_RP_peak(1);
-    restingRP=IHCrestingV;
     toPlot= [fliplr(IHC_RP_min(:,1)') IHC_RP_peak(:,1)'];
     microPa=   28e-6*10.^(levels/20);
     microPa=[-fliplr(microPa) microPa];
--- a/parameterStore/MAPparamsNormal.m	Fri May 27 14:29:28 2011 +0100
+++ b/parameterStore/MAPparamsNormal.m	Fri May 27 17:50:40 2011 +0100
@@ -131,7 +131,7 @@
 IHC_cilia_RPParams.s1=	1e-9;
 
 IHC_cilia_RPParams.Gmax= 5e-9;    % 2.5e-9 maximum conductance (Siemens)
-IHC_cilia_RPParams.Gu0=	1e-9;  % 4.3e-9 fixed apical membrane conductance
+IHC_cilia_RPParams.Ga=	1e-9;  % 4.3e-9 fixed apical membrane conductance
 
 %  #5 IHC_RP
 IHC_cilia_RPParams.Cab=	4e-012;         % IHC capacitance (F)
@@ -208,10 +208,10 @@
         MacGregorMultiParams.nNeuronsPerBF=	10;   % N neurons per BF
         MacGregorMultiParams.type = 'chopper cell';
         MacGregorMultiParams.fibersPerNeuron=10;  % N input fibers
-        MacGregorMultiParams.fibersPerNeuron=6;  % N input fibers
+%         MacGregorMultiParams.fibersPerNeuron=6;  % N input fibers
 
         MacGregorMultiParams.dendriteLPfreq=50;   % dendritic filter
-        MacGregorMultiParams.currentPerSpike=39e-9; % *per spike
+        MacGregorMultiParams.currentPerSpike=35e-9; % *per spike
 %         MacGregorMultiParams.currentPerSpike=45e-9; % *per spike
         
         MacGregorMultiParams.Cap=1.67e-8; % ??cell capacitance (Siemens)