Bugfix/tdnirs corrections (#62) (50d4f413) · Commits · github_fork / Homer3

DataTree/AcquiredData/Snirf/DataClass.m

+7 −1

Original line number	Diff line number	Diff line
		@@ -231,7 +231,13 @@ classdef DataClass < FileLoadSaveClass
		if obj.measurementList(ii).GetCondition()>1
		break;
		end
		% Deal with the cases where the measurementList contains
		% wavelengthIndex versus not
		if ~isempty(obj.measurementList(ii).GetWavelengthIndex())
		ml(ii,:) = [obj.measurementList(ii).GetSourceIndex(), obj.measurementList(ii).GetDetectorIndex(), 1, obj.measurementList(ii).GetWavelengthIndex()];
		else
		ml(ii,:) = [obj.measurementList(ii).GetSourceIndex(), obj.measurementList(ii).GetDetectorIndex(), 1, 1];
		end
		end

		% Remove unused rows that were pre-allocated

DataTree/AcquiredData/Snirf/MeasListClass.m

+1 −0

Original line number	Diff line number	Diff line
		@@ -118,6 +118,7 @@ classdef MeasListClass < FileLoadSaveClass
		obj.detectorIndex = HDF5_DatasetLoad(gid, 'detectorIndex');
		obj.wavelengthIndex = HDF5_DatasetLoad(gid, 'wavelengthIndex');
		obj.dataType = HDF5_DatasetLoad(gid, 'dataType');
		obj.dataTypeIndex = HDF5_DatasetLoad(gid, 'dataTypeIndex');
		obj.dataTypeLabel = HDF5_DatasetLoad(gid, 'dataTypeLabel', obj.dataTypeLabel);
		obj.detectorIndex = HDF5_DatasetLoad(gid, 'detectorIndex');
		obj.sourcePower = HDF5_DatasetLoad(gid, 'sourcePower');

DataTree/AcquiredData/Snirf/ProbeClass.m

+6 −6

Original line number	Diff line number	Diff line
		@@ -11,7 +11,7 @@ classdef ProbeClass < FileLoadSaveClass
		frequencies
		timeDelays
		timeDelayWidths
		momentOrder
		momentOrders
		correlationTimeDelays
		correlationTimeDelayWidths
		sourceLabels
		@@ -40,7 +40,7 @@ classdef ProbeClass < FileLoadSaveClass
		obj.frequencies = 1;
		obj.timeDelays = 0;
		obj.timeDelayWidths = 0;
		obj.momentOrder = [];
		obj.momentOrders = [];
		obj.correlationTimeDelays = 0;
		obj.correlationTimeDelayWidths = 0;
		for ii=1:size(SD.SrcPos)
		@@ -63,7 +63,7 @@ classdef ProbeClass < FileLoadSaveClass
		obj.frequencies = 1;
		obj.timeDelays = 0;
		obj.timeDelayWidths = 0;
		obj.momentOrder = [];
		obj.momentOrders = [];
		obj.correlationTimeDelays = 0;
		obj.correlationTimeDelayWidths = 0;
		obj.sourceLabels = {};
		@@ -142,7 +142,7 @@ classdef ProbeClass < FileLoadSaveClass
		obj.frequencies = HDF5_DatasetLoad(gid, 'frequencies');
		obj.timeDelays = HDF5_DatasetLoad(gid, 'timeDelays');
		obj.timeDelayWidths = HDF5_DatasetLoad(gid, 'timeDelayWidths');
		obj.momentOrder = HDF5_DatasetLoad(gid, 'momentOrder');
		obj.momentOrders = HDF5_DatasetLoad(gid, 'momentOrders');
		obj.correlationTimeDelays = HDF5_DatasetLoad(gid, 'correlationTimeDelays');
		obj.correlationTimeDelayWidths = HDF5_DatasetLoad(gid, 'correlationTimeDelayWidths');
		obj.sourceLabels = HDF5_DatasetLoad(gid, 'sourceLabels', obj.sourceLabels);
		@@ -209,7 +209,7 @@ classdef ProbeClass < FileLoadSaveClass
		hdf5write_safe(fileobj, [location, '/frequencies'], obj.frequencies);
		hdf5write_safe(fileobj, [location, '/timeDelays'], obj.timeDelays);
		hdf5write_safe(fileobj, [location, '/timeDelayWidths'], obj.timeDelayWidths);
		hdf5write_safe(fileobj, [location, '/momentOrder'], obj.momentOrder);
		hdf5write_safe(fileobj, [location, '/momentOrders'], obj.momentOrders);
		hdf5write_safe(fileobj, [location, '/correlationTimeDelays'], obj.correlationTimeDelays);
		hdf5write_safe(fileobj, [location, '/correlationTimeDelayWidths'], obj.correlationTimeDelayWidths);
		hdf5write_safe(fileobj, [location, '/sourceLabels'], obj.sourceLabels);
		@@ -294,7 +294,7 @@ classdef ProbeClass < FileLoadSaveClass
		if ~all(obj.timeDelayWidths(:)==obj2.timeDelayWidths(:))
		return;
		end
		if ~all(obj.momentOrder(:)==obj2.momentOrder(:))
		if ~all(obj.momentOrders(:)==obj2.momentOrders(:))
		return;
		end
		if ~all(obj.correlationTimeDelays(:)==obj2.correlationTimeDelays(:))

DataTree/AcquiredData/Snirf/SnirfClass.py

+2 −2

Original line number	Diff line number	Diff line
		@@ -85,7 +85,7 @@ class ProbeClass(ErrorClass):
		self.frequencies = np.array(fid.get(location + '/frequencies'))
		self.timeDelay = 0
		self.timeDelayWidth = 0
		self.momentOrder = []
		self.momentOrders = []
		self.correlationTimeDelay = 0
		self.correlationTimeDelayWidth = 0
		self.sourceLabels = np.array(fid.get(location + '/sourceLabels'))
		@@ -107,7 +107,7 @@ class ProbeClass(ErrorClass):
		sys.stdout.write(' frequencies = %s\n'% self.frequencies)
		sys.stdout.write(' timeDelay = %s\n'% self.timeDelay)
		sys.stdout.write(' timeDelayWidth = %s\n'% self.timeDelayWidth)
		sys.stdout.write(' momentOrder = %s\n'% self.momentOrder)
		sys.stdout.write(' momentOrders = %s\n'% self.momentOrders)
		sys.stdout.write(' correlationTimeDelay = %s\n'% self.correlationTimeDelay)
		sys.stdout.write(' correlationTimeDelayWidth = %s\n'% self.correlationTimeDelayWidth)
		sys.stdout.write(' sourceLabels = %s\n'% self.sourceLabels)

Admin message