From 302f81f9f2f69895285ed63c56f1183662b9679e Mon Sep 17 00:00:00 2001 From: elinekupers Date: Fri, 20 Sep 2019 11:47:24 -0400 Subject: [PATCH] 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/exptTools/displays/meg_lcd/displayParams.m b/exptTools/displays/meg_lcd/displayParams.m index 1a53dd2..e946dc6 100755 --- a/exptTools/displays/meg_lcd/displayParams.m +++ b/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 parameters params.numPixels = [1024 768]; % this is the correct native resolution params.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 rate params.cmapDepth = 8; % this is the correct bit depth for our experiment params.screenNumber = 0; % we usually mirror MEG, so 0 is correct % Descriptive parameters params.position = 'lying in MEG'; params.stereoFlag = 0; \ No newline at end of file +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 parameters params.numPixels = [1024 768]; % this is the correct native resolution params.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 rate params.cmapDepth = 8; % this is the correct bit depth for our experiment params.screenNumber = 0; % we usually mirror MEG, so 0 is correct % Descriptive parameters params.position = 'lying in MEG'; params.stereoFlag = 0; \ No newline at end of file