SVMCrossVal.git

@@ -6,6 +6,8 @@ vox = voxelList;

 nVoxel = size(vox,1);

 nImage = numel(V);

+rad = 0;

+

 for kImage=1:nImage

     roicenter = round(inv(V(kImage).mat)*[vox, ones(nVoxel,1)]');

     x = roicenter(1,:);

@@ -2,6 +2,9 @@ function main(model,task)

 % parse the GUI and pass parameters as structure

 disp('RUN');

+% disp('all warnings OFF')

+% warn = warning('off','all');

+

 timeLine = getTimeLineParams(model);

 subjects = getSubjectCellList(model);

 classDef = parseClassDef(model);

@@ -44,6 +47,8 @@ switch task

         disp('FBS')

 end

+% disp('warings restored');

+% warning('on',warn);

 end

@@ -14,14 +14,30 @@ function runCoordTable(args)

         map = load(fullfile(subjectStruct{s}.dir,'results','roi','coord_map.mat'));

         subjectStruct{s}.coords = getSubjectCoordinates(args.coords,map);

+        nVoxel = size(subjectStruct{s}.coords,1);

+        

         disp('fetching volume definitions, please wait');

         subjectStruct{s}.volumes = spm_vol(getImageFileList(subjectStruct{s}.dir,sessionlist,args.mask));

+        extr = calculateImageData(subjectStruct{s}.volumes,subjectStruct{s}.coords);

-        rawData = calculateImageData(subjectStruct{s}.volumes,subjectStruct{s}.coords)

+        pstopts.des = subjectStruct{s}.des;

+        pstopts.eventList = args.eventList;

+        pstopts.sessionList = sessionlist;

-        disp('done');

+        disp('computing psth');

+        for iVoxel = 1:nVoxel

+            rawdata = [];

+            for iImage = 1:length(extr);

+                tmp = extr(iImage);

+                rawdata = [rawdata tmp.dat(iVoxel)];

+            end

+            subjectStruct{s}.pst{iVoxel} = calculatePST(args.timeline,pstopts,rawdata);

         end

+       disp(sprintf('done %g // %g',s,nSubjects));

+    end

+    

+    assignin('base','subjectStruct',subjectStruct);

 end

@@ -26,17 +26,24 @@ for s = 1:nSubjects

     disp('computing volume values, please wait');

-    rawData = calculateRoiImageData(subjectStruct{s}.volumes,subjectStruct{s}.roiFile);

+    extr = calculateRoiImageData(subjectStruct{s}.volumes,subjectStruct{s}.roiFile);

+    

+    nVoxel = size(extr(1).dat,1);

+

     % calculate psth

     pstopts.des = subjectStruct{s}.des;

     pstopts.eventList = args.eventList;

     pstopts.sessionList = sessionlist;

-    assignin('base','pstopts',pstopts);

-    assignin('base','rawData',rawData);

-

     disp('computing psth');

-    subjectStruct{s}.psth    = calculatePST(args.timeline,pstopts,rawData);

+    for iVoxel = 1:nVoxel

+        rawdata = [];

+        for iImage = 1:length(extr);

+            tmp = extr(iImage);

+            rawdata = [rawdata tmp.dat(iVoxel)];

+        end

+        subjectStruct{s}.pst{iVoxel} = calculatePST(args.timeline,pstopts,rawdata);

+    end

     disp('done');

 end

@@ -256,13 +256,13 @@ function model = createFirstStepPanel(model,parent,DEFAULT)

         createLabel(pImage,[0.0 0.5 1 0.5],'Select Image Base');

-        imageRegExList = {'DUMMY swrf*.IMG','DUMMY wrf*.IMG'};

+        imageRegExList = {'DUMMY f*.IMG','DUMMY swrf*.IMG','DUMMY wrf*.IMG'};

         model.imageTypeSelection = uicontrol(pImage,'Style','popupmenu',...

         'Units','normalized',...

         'Position',[0.0 0.0 1 0.5],...

         'String',imageRegExList,...

         'UserData',imageRegExList,...

-        'Value',1);

+        'Value',3);

         set(model.imageTypeSelection,'BackgroundColor','w');