SVMCrossVal.git

@@ -14,6 +14,9 @@ for kImage=1:nImage

     y = roicenter(2,:);

     z = roicenter(3,:);

+            tmp = spm_imatrix(V(kImage).mat);

+            vdim = tmp(7:9);

+            vxrad = ceil((rad*ones(nVoxel,3))./(ones(nVoxel,1)*vdim))';

     for iVoxel = 1:nVoxel

@@ -22,9 +25,6 @@ for kImage=1:nImage

             y = roicenter(2,iVoxel);

             z = roicenter(3,iVoxel);

         else

-            tmp = spm_imatrix(V(kImage).mat);

-            vdim = tmp(7:9);

-            vxrad = ceil((rad*ones(1,3))./(ones(nVoxel,1)*vdim))';

             [x y z] = ndgrid(-vxrad(1,iVoxel):sign(vdim(1)):vxrad(1,iVoxel), ...

                 -vxrad(2,iVoxel):sign(vdim(2)):vxrad(2,iVoxel), ...

                 -vxrad(3,iVoxel):sign(vdim(3)):vxrad(3,iVoxel));

@@ -37,7 +37,8 @@ for kImage=1:nImage

         dat = spm_sample_vol(V(kImage), x, y, z,0);

-        extr(kImage).dat(iVoxel)      = dat;

+        

+        extr(kImage).dat(iVoxel,:)    = dat;

         extr(kImage).mean(iVoxel)     = nanmean(dat);

         extr(kImage).nvx(iVoxel)      = numel(dat);

     end;

@@ -37,8 +37,9 @@ function subjectData = runCoordTable(args)

             rawdata = [];

             for iImage = 1:length(extr);

                 tmp = extr(iImage);

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

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

             end

+            subjectStruct{s}.rawData{iVoxel} = rawdata;

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

         end

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