Skip to content

Commit

Permalink
changes for running phantom
Browse files Browse the repository at this point in the history
Anne Mennen committed Apr 9, 2018
1 parent 1749555 commit e5610ba
Showing 5 changed files with 14 additions and 13 deletions.
4 changes: 2 additions & 2 deletions ExptWrapper_Display.m
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
RandStream.setGlobalStream(RandStream('mt19937ar','seed',seed));%set seed

%% first specify the things that change
subjectNum = 8;
subjectNum = 9; % subject 9 on penn
subjectRun = 1;
subjectDay = 1;

@@ -35,7 +35,7 @@

%%
runNum=2;
fMRI = 10;
fMRI = 12;
[blockData] = RealTimePunisherDisplay(subjectNum,subjectName,runNum,subjectDay,useButtonBox,fMRI,realtimeData,debug,usepyoutput)


12 changes: 6 additions & 6 deletions ExptWrapper_FileProcess.m
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
%% first specify things that change
subjectNum = 8;
subjectNum = 9;
subjectRun = 1; % run number for the day
subjectDay = 1; % this will determine which mask the RT thing will use VERY IMPORTANT AND COUNTERBALANCING
%imgDirHeader = '/Data1/subjects/';
@@ -10,9 +10,9 @@
debug = 0;
%% specify everything else
projectName = 'rtAttenPenn';
%subjDate = '3-14-18';
subjectName = [datestr(now,5) datestr(now,7) datestr(now,11) num2str(subjectRun) '_' projectName];
%subjectName = [datestr(subjDate,5) datestr(subjDate,7) datestr(subjDate,11) num2str(subjectRun) '_' projectName];
subjDate = '4-5-17';
%subjectName = [datestr(now,5) datestr(now,7) datestr(now,11) num2str(subjectRun) '_' projectName];
subjectName = [datestr(subjDate,5) datestr(subjDate,7) datestr(subjDate,11) num2str(subjectRun) '_' projectName];

% **** types of stimuli to train/show to subjects *******
NEUTRAL = 1;
@@ -53,13 +53,13 @@

%% Run 1 file process
runNum = 1;
fMRI = 8;
fMRI = 10;
[patterns] = RealTimePunisherFileProcess(imgDirHeader,subjectNum,subjectName,runNum,fMRI,realtimeData,subjectDay)

%% Run 2 file process

runNum = 2;
fMRI = 10;
fMRI = 12;
[patterns] = RealTimePunisherFileProcess(imgDirHeader,subjectNum,subjectName,runNum,fMRI,realtimeData,subjectDay)

%%
3 changes: 2 additions & 1 deletion RealTimeNegDistDisplay.m
Original file line number Diff line number Diff line change
@@ -101,7 +101,8 @@

ScreenResX = 1600;
ScreenResY = 900;

ScreenResX = 1920;
ScreenResY = 1080;

%% Response Mapping and Counterbalancing

6 changes: 3 additions & 3 deletions RealTimePunisherDisplay.m
Original file line number Diff line number Diff line change
@@ -149,7 +149,7 @@
sceneInstruct = 'Places: respond if it is an indoor place. DO NOT respond if it is an outdoor place';
faceInstruct = 'Faces: respond if it is a male face. DO NOT respond if it is a female face';
sceneShorterInstruct = 'indoor places';
faceShorter = 'male faces';
faceShorterInstruct = 'male faces';
case 2
sceneInstruct = 'Places: respond if it is an outdoor place. DO NOT respond if it is an indoor place';
faceInstruct = 'Faces: respond if it is a female face. DO NOT respond if it is a male face';
@@ -195,8 +195,8 @@
windowSize.pixels = [resolution.width/2 resolution.height];
screenX = windowSize.pixels(1);
screenY = windowSize.pixels(2);
% screenX = 800;
% screenY = 800;
screenX = 1920;
screenY = 1080;
% %to ensure that the images are standardized (they take up the same degrees of the visual field) for all subjects
% if (screenX ~= ScreenResX) || (screenY ~= ScreenResY)
% fprintf('The screen dimensions may be incorrect. For screenNum = %d,screenX = %d (not 1152) and screenY = %d (not 864)',screenNum, screenX, screenY);
2 changes: 1 addition & 1 deletion RealTimePunisherFileProcess.m
Original file line number Diff line number Diff line change
@@ -74,7 +74,7 @@

%%%%%%%%
%DELETE AFTER
%\subjDate = '8-11-17';
%subjDate = '4-5-17';
%imgDir = [imgDirHeader datestr(subjDate,10) datestr(subjDate,5) datestr(subjDate,7) '.' subjectName '.' subjectName '/'];
%%%%%%%%

0 comments on commit e5610ba

Please sign in to comment.