Commit 7212e208 authored by mayucel's avatar mayucel
Browse files

Merge branch 'master' into tcca_glm_v3

parents abeb7efb 65ad114c
Loading
Loading
Loading
Loading
+3 −0
Original line number Diff line number Diff line
@@ -11,4 +11,7 @@ No
% Default Processing Stream Style
SNIRF

% Logging
On

% END
+3 −3
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ classdef AcqDataClass < matlab.mixin.Copyable
        t         = GetTime(obj, iBlk)
        
        % ---------------------------------------------------------
        datamat   = GetDataMatrix(obj, iBlk)
        datamat   = GetDataTimeSeries(obj, options, iBlk)
        
        % ---------------------------------------------------------
        SD        = GetSDG(obj)
@@ -89,8 +89,8 @@ classdef AcqDataClass < matlab.mixin.Copyable
                height = 1;
            end
            
            px = width * 0.10; 
            py = height * 0.10; 
            px = width * 0.05; 
            py = height * 0.05; 

            bbox = [xmin-px, xmax+px, ymin-py, ymax+py];
        end
+20 −0
Original line number Diff line number Diff line
function val = HDF5_DatasetLoad(gid, name, val)

if nargin==2
    val = []; 
end

try
    dsetid = H5D.open(gid, name);
    val = H5D.read(dsetid);
    H5D.close(dsetid);    
catch ME
    switch(class(val))
        case 'char'
            val = '';
        case 'cell'
            val = {};
        otherwise            
            val = [];
    end
end
+6 −0
Original line number Diff line number Diff line
function HDF5_GroupClose(fileobj, gid, fid)

H5G.close(gid);
if ischar(fileobj)
    H5F.close(fid);
end
+15 −0
Original line number Diff line number Diff line
function [gid, fid] = HDF5_GroupOpen(fileobj, location)

% Find data location
if ischar(fileobj)
    fid = H5F.open(fileobj);
else
    fid = fileobj;
end
try
    gid = H5G.open(fid, location);
catch
    gid = -1;
end

Loading