Merge branch 'master' of https://github.com/BrainardLab/ColorTracking

Author: DavidBrainard

code/analysis/General/paramsToVecCombo.m

@@ -0,0 +1,14 @@
+function vec = paramsToVecCombo(params)
+
+%% The CTM Params
+ x(1) = params.angle;
+ x(2) = params.minAxisRatio;
+ x(3) = params.scale;
+ x(4) = params.minLag;
+ x(5) = params.amplitude;
+ 
+%% The Dectection Params
+ x(6) = params.angle;
+ x(7) = params.minAxisRatio;
+ x(8) = params.lambda;
+ x(9) = params.exponent;

code/analysis/General/vecToParamsCombo.m

@@ -0,0 +1 @@
+function params = vecToParamsCombo(vec)

code/analysis/coneBootstrap/asanoBootOutput.mat

@@ -1,4 +1,3 @@
-
 % Asano et al. give the following population SD's for the individual
 % difference parameters (their Table 5, Step 2 numbers:
 % Lens - 18.7%
@@ -26,7 +25,7 @@
 SetGammaMethod(calStructOBJ,2);
 
 % load the stim settings ans max contrasts for angles -10:.25:110
-load cacheStimSettingAsanoBoot2.mat
+load cacheStimSettingAsanoBoot.mat
 
 %% Baseline fundamentals
 S = [380 5 81];
@@ -40,6 +39,11 @@
 theAngles = 80:0.05:100;
 nAsanoBoots = 10000;
 
+% init vars
+minLumAngle = zeros(1,nAsanoBoots);
+minLContrasts = zeros(1,nAsanoBoots);
+minLumContrasts = zeros(1,nAsanoBoots);
+
 for aa = 1:nAsanoBoots
 
  % Draw 8 parameters with standard deviations as in comment above
@@ -69,15 +73,7 @@
  tmpConeParams.indDiffParams.dlens = drawLens;
  tmpConeParams.indDiffParams.dmac = drawMacular;
  tmpConeParams.fieldSizeDegrees = 2;
- [~,T1] = ComputeObserverFundamentals(tmpConeParams,S_cones_ss2);
-
-
-
- % Loop around theta from, say -10 to 100 degrees at 1/4 deg steps
- % For each theta, compute sqrt of L + M contrast. Maybe w*L + M.
- % Find minimum. That's the theta closest to isolating S cones in
- % our stimulus set. Call that theta0. Store theta0 for each
- % iteration of this loop
+ [~,T1] = ComputeObserverFundamentals(tmpConeParams,S_cones_ss2)
 
  %% Standard initialization of calibration structure
  SetSensorColorSpace(calStructOBJ,T1,S_cones_ss2);
@@ -98,49 +94,71 @@
  0 ,0,1];
 
  wContrasts = m*contrasts;
- lumVec(aa,:) = vecnorm(wContrasts(1:2,:));
+ lumVec = vecnorm(wContrasts(1:2,:));
 
- minLumAngle(aa) = theAngles(find(lumVec(aa,:) == min(lumVec(aa,:))));
+ minLumAngle(aa) = theAngles(find(lumVec == min(lumVec)));
+ minLContrasts(aa) = contrasts(2,find(lumVec == min(lumVec)));
+ minLumContrasts(aa) = lumVec(find(lumVec == min(lumVec)));
+ 
 end
 
-%% Plot distribution of theta0's. We'll look at that.
-h1 = histogram(minLumAngle,77)
+%% Plot distribution of theta's
+figure
+h1 = histogram(minLumAngle,77);
 ylabel('Count')
 xlabel('Angle in LS Plane')
 title('Minimun Luminance Angle')
 set(gcf,'Color','w');
-
-%% Get error bars on stuff
-ciPercent = 68;
-upperCiVal = 100 - ((100 - ciPercent)/2);
-lowerCiVal = ((100 - ciPercent)/2);
-for pp = 1:size(lumVec,2)
- errUpLwr(pp,:) = prctile(lumVec(:,pp),[upperCiVal lowerCiVal]);
-end
-
-
-%% Get nominal contrast
-%Standard initialization of calibration structure
-SetSensorColorSpace(calStructOBJ,T_cones_ss2,S_cones_ss2);
- 
-
-% Set the background
-backgroundPrimaries = [0.50 0.5 0.50]'; %SensorToSettings(calStructOBJ,backgroundLMS);
-backgroundLMS_hat = SettingsToSensor(calStructOBJ,PrimaryToSettings(calStructOBJ,backgroundPrimaries));
-
-comparisonLMSnom = SettingsToSensor(calStructOBJ,stimSettings);
- 
-backgroundLMSnom = repmat(backgroundLMS_hat,[1,size(comparisonLMS,2)]);
-
-nomContrast = ExcitationsToContrast(comparisonLMSnom,backgroundLMSnom);
-w = 2;
-m = [w,0,0;...
- 0,1,0;...
- 0,0,1];
-
-wContrastsNom = m*nomContrast;
-nominalLum = vecnorm(wContrastsNom);
-
-
-
-
+xlim([87 93])
+set(gca, ...
+ 'Box' , 'off' , ...
+ 'TickDir' , 'out' , ...
+ 'TickLength' , [.02 .02] , ...
+ 'XMinorTick' , 'off' , ...
+ 'YMinorTick' , 'off' , ...
+ 'YGrid' , 'on' , ...
+ 'XColor' , [.3 .3 .3], ...
+ 'YColor' , [.3 .3 .3], ...
+ 'LineWidth' , 1, ...
+ 'FontSize' , 12);
+axis square
+
+figure
+h2 = histogram(minLContrasts,77);
+ylabel('Count')
+xlabel('L Cone Contrast')
+title('L Cone Contrast at Minimun Luminance Angle')
+set(gcf,'Color','w');
+xlim([-0.06 0.06])
+set(gca, ...
+ 'Box' , 'off' , ...
+ 'TickDir' , 'out' , ...
+ 'TickLength' , [.02 .02] , ...
+ 'XMinorTick' , 'off' , ...
+ 'YMinorTick' , 'off' , ...
+ 'YGrid' , 'on' , ...
+ 'XColor' , [.3 .3 .3], ...
+ 'YColor' , [.3 .3 .3], ...
+ 'LineWidth' , 1, ...
+ 'FontSize' , 12);
+axis square
+
+figure
+h1 = histogram(minLumContrasts,77);
+ylabel('Count')
+xlabel('Luminance Contrast')
+title('Luminance Contrast at Minimun Luminance Angle')
+set(gcf,'Color','w');
+ylim([0 550])
+set(gca, ...
+ 'Box' , 'off' , ...
+ 'TickDir' , 'out' , ...
+ 'TickLength' , [.02 .02] , ...
+ 'XMinorTick' , 'off' , ...
+ 'YMinorTick' , 'off' , ...
+ 'YGrid' , 'on' , ...
+ 'XColor' , [.3 .3 .3], ...
+ 'YColor' , [.3 .3 .3], ...
+ 'LineWidth' , 1, ...
+ 'FontSize' , 12);
+axis square