update meg LCD display after keystoning of the projection image, also…

… update header information on what photometer was used

exptTools/displays/meg_lcd/displayParams.m

@@ -1 +1 @@
-function params = displayParams% For MEG LCD projector, Jun 25, 2014% Last calibrated: Using Color Cal 2 photomoter, held by hand% lying MEG, while executing CalibrateMonitorPhotometer in PTB (33% values, two measurements for each point)%%% % CODE TO SAVE GAMMA TABLE% % load in a measurement made from PTB's CalibrateMonitorPhotometer% load('/Volumes/server/Projects/MEG/Calibration/MEG_Cal1_33points_v1.mat')% % % use gammaTable 1, which is the powerlaw fit to the measurements% g = gammaTable1;% % % replicate to 256 x 3 for RGB (assuming 8 bits)% gamma = [g g g];% % % integers for lookup table% gammaTable = round(gamma * 255);% % % where to save?% pth = '~/matlab/git/vistadisp/exptTools2/displays/meg_lcddisplayParams';% % save(fullfile(pth, 'gamma'), 'gamma', 'gammaTable');% Critical parametersparams.numPixels    = [1024 768];   % this is the correct native resolutionparams.dimensions   = [30.0 19.2];  % cm, BUT CHECK THIS!params.distance     = 32.5;         % cm, CHECK THIS!params.frameRate    = 60;           % this is the correct native frame rateparams.cmapDepth    = 8;            % this is the correct bit depth for our experimentparams.screenNumber = 0;            % we usually mirror MEG, so 0 is correct% Descriptive parametersparams.position = 'lying in MEG';params.stereoFlag = 0;
+function params = displayParams% For MEG LCD projector, Sep 20, 2019% Last calibrated: Using a ColorCAL MKII Colorimeter, on a tripod pressed% against the MEG screen, while executing nyuCalibrateMonitorColorCal2.% This function is an adapted version of PTB's CalibrateMonitorPhotometer.m% (17 measurements, twice executed for each point)%%% % CODE TO SAVE GAMMA TABLE% % load in a measurement made from PTB's CalibrateMonitorPhotometer% load('/Volumes/server/Projects/MEG/Calibration/MEG_Cal1_33points_v1.mat')% % % use gammaTable 1, which is the powerlaw fit to the measurements% g = gammaTable1;% % % replicate to 256 x 3 for RGB (assuming 8 bits)% gamma = [g g g];% % % integers for lookup table% gammaTable = round(gamma * 255);% % % where to save?% pth = '~/matlab/git/vistadisp/exptTools2/displays/meg_lcddisplayParams';% % save(fullfile(pth, 'gamma'), 'gamma', 'gammaTable');% Critical parametersparams.numPixels    = [1024 768];   % this is the correct native resolutionparams.dimensions   = [29.8 18.7];  % cm, BUT CHECK THIS!params.distance     = 32.5;         % cm, CHECK THIS!params.frameRate    = 60;           % this is the correct native frame rateparams.cmapDepth    = 8;            % this is the correct bit depth for our experimentparams.screenNumber = 0;            % we usually mirror MEG, so 0 is correct% Descriptive parametersparams.position = 'lying in MEG';params.stereoFlag = 0;