optitrack implementation

setups/vestibular chair/vPrime/core/pb_vRunExp.m

@@ -24,7 +24,7 @@ function pb_vRunExp(handles)
    %  set block information
    block          = handles.block;  
    nblocks        = handles.cfg.Blocks;
-   Dat(nblocks)   = struct('VS',[],'EV',[],'PL_Gaze',[],'PL_Python',[],'PL_Primitive',[],'OT',[]);
+   Dat(nblocks)   = struct('VS',[],'EV',[],'PL_Gaze',[],'PL_Python',[],'PL_Primitive',[],'OT_Rigid',[]);
    
    %  initialize recordings
 %    rc             = pb_runPupil; 
@@ -98,7 +98,7 @@ function pb_vRunExp(handles)
       Dat(iBlck).PL_Python    = streams(2).read;
       Dat(iBlck).PL_Gaze      = streams(3).read;
       Dat(iBlck).PL_Primitive = streams(4).read;
-      %Dat(iBlck).OT           = streams(5).read;
+      Dat(iBlck).OT_Rigid     = streams(5).read;
 
       %  update block information
       handles.cfg = updateCount(handles.cfg,'block','count');

subtools/lsl/pb_runLSL.m

@@ -11,7 +11,7 @@ function [ses,str] = pb_runLSL(varargin)
    pl = pb_keyval('pl', varargin, true);
    gz = pb_keyval('gz', varargin, true);
    pd = pb_keyval('pd', varargin, true);
-   ot = pb_keyval('ot', varargin, false);
+   ot = pb_keyval('ot', varargin, true);
    
    tmp = {};
    
@@ -19,7 +19,7 @@ function [ses,str] = pb_runLSL(varargin)
                'type=''Pupil Capture @ pupil-desktop'' and name=''Pupil Python Representation - Eye 0''', ...
                'type=''Pupil Capture @ pupil-desktop'' and name=''Gaze Python Representation''', ...
                'type=''Pupil Capture @ pupil-desktop'' and name=''Pupil Primitive Data - Eye 0''', ...
-               'type=''OptiTrack Mocap @ DCN-VSO3'' and name=''Labeled Markers'''};
+               'type=''OptiTrack Mocap @ DCN-VSO3'' and name=''Rigid Bodies'''};
             
    
    if de; tmp(end+1) = streams(1); end

utilities/housekeeping/pb_savefig.m

@@ -10,10 +10,13 @@ function pb_savefig(varargin)
    n = nargin;
 
    fig     = pb_keyval('fig',varargin);
+   
    fname   = pb_keyval('fname',varargin);
-   dir     = pb_keyval('dir',varargin,[pb_datadir 'PhD/Figure/']);
+   dir     = pb_keyval('dir',varargin,[pb_datadir 'PhD/Figures/']);
+   ext     = pb_keyval('ext',varargin,'pdf');
    cd(dir);
 
+   figure(fig);
    g = groot;
 
    if n == 0 && ~isempty(g.Children)
@@ -26,7 +29,8 @@ function pb_savefig(varargin)
 
    h = get(g,'currentFigure'); 
    path = [path '/' fname];
-   savefig(h,path)
+   savefig(h,path);
+   saveas(h,path,ext);
 end
  
 % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % %