Merge branch 'master' of https://github.com/BUNPC/Homer3 (756d02dc) · Commits · github_fork / Homer3

DataTree/AcquiredData/Snirf/SnirfClass.m

+18 −21

Original line number	Original line	Diff line number	Diff line
	@@ -401,7 +401,7 @@ classdef SnirfClass < AcqDataClass & FileLoadSaveClass
	obj.stim(ii).delete();		obj.stim(ii).delete();
	obj.stim(ii) = [];		obj.stim(ii) = [];
	if ii==1		if ii==1
	err = -1;		err = 1; % Absence of optional field raises error > 0
	end		end
	break;		break;
	end		end
	@@ -447,7 +447,7 @@ classdef SnirfClass < AcqDataClass & FileLoadSaveClass
	obj.aux(ii).delete();		obj.aux(ii).delete();
	obj.aux(ii) = [];		obj.aux(ii) = [];
	if ii==1		if ii==1
	err = -1;		err = 1; % Error code for no optional field is > 0
	end		end
	break;		break;
	end		end
	@@ -490,44 +490,41 @@ classdef SnirfClass < AcqDataClass & FileLoadSaveClass
	% Open group		% Open group
	[obj.gid, obj.fid] = HDF5_GroupOpen(fileobj, '/');		[obj.gid, obj.fid] = HDF5_GroupOpen(fileobj, '/');

	if obj.SetLocation() < 0
			if obj.SetLocation() < 0 & err == 0
	err = -1;		err = -1;
	return
	end		end

	%%%% Load formatVersion		%%%% Load formatVersion
	if obj.LoadFormatVersion() < 0		if obj.LoadFormatVersion() < 0 & err == 0
	err = -2;		err = -2;
	end		end

	%%%% Load metaDataTags		%%%% Load metaDataTags
	if obj.LoadMetaDataTags(obj.fid) < 0		if obj.LoadMetaDataTags(obj.fid) < 0 & err == 0
	err = -3;		err = -3;
	end		end

	%%%% Load data		%%%% Load data
	if obj.LoadData(obj.fid) < 0		if obj.LoadData(obj.fid) < 0 & err == 0
	err = -4;		err = -4;
	end		end

	%%%% Load stim		%%%% Load stim
	if obj.LoadStim(obj.fid)		if obj.LoadStim(obj.fid) < 0 & err == 0
	err = -5;		err = -5;
	end		end

	%%%% Load probe		%%%% Load probe
	if obj.LoadProbe(obj.fid)		if obj.LoadProbe(obj.fid) < 0 & err == 0
	err = -6;		err = -6;
	end		end

	%%%% Load aux. This is an optional field, therefore error must		%%%% Load aux. This is an optional field
	%%%% be less then -1 (-1 means aux is not in SNIRF file) to be		if obj.LoadAux(obj.fid) < 0 & err == 0
	%%%% error for whole SNIRF file
	if obj.LoadAux(obj.fid)<-1
	err = -7;		err = -7;
	end		end


	% Close group		% Close group
	HDF5_GroupClose(fileobj, obj.gid, obj.fid);		HDF5_GroupClose(fileobj, obj.gid, obj.fid);

DataTree/RunClass.m

+10 −1

Original line number	Original line	Diff line number	Diff line
	@@ -122,7 +122,16 @@ classdef RunClass < TreeNodeClass
	end		end

	if obj.acquired.Error() > 0		if obj.acquired.Error() > 0
	obj.logger.Write(sprintf(' **** Warning: %s failed to load.\n', obj.name));		msgs = {
			'MATLAB could not load the file.'
			'file ''formatVersion'' is invalid.'
			'file ''metaDataTags'' is invalid.'
			'file ''data'' is invalid.'
			'file ''stim'' is invalid.'
			'file ''probe'' is invalid.'
			'file ''aux'' is invalid.'
			};
			obj.logger.Write(sprintf(' **** Warning: %s failed to load: %s\n', obj.name, msgs{abs(obj.acquired.GetError())}));
	return;		return;
	else		else
	%fprintf(' Loaded file %s to run.\n', obj.name);		%fprintf(' Loaded file %s to run.\n', obj.name);

Admin message