Skip to content
Snippets Groups Projects
Commit 6a783e01 authored by leprob001's avatar leprob001
Browse files

Added option to use Inf if value should not be calculated on calculating offsets.

parent 20e902a1
No related branches found
No related tags found
No related merge requests found
162
\ No newline at end of file
163
\ No newline at end of file
......@@ -39,6 +39,13 @@ for o = 1:length(fnames)
&& artoaWorkspace.editOffsets.useOffsets
offset = artoaWorkspace.editOffsets.offsets{fnames{o}, 'EmpiricalOffset'};
drift = artoaWorkspace.editOffsets.offsets{fnames{o}, 'EmpiricalDrift'};
% check if Inf
if isinf(offset)
offset = 0;
end
if isinf(drift)
drift = 0;
end
% no sorting required, because fourth parameter contains timesteps
predictedToas = artoa.toa.addDrift( ...
predictedToas, ...
......
......@@ -41,7 +41,8 @@ if ~pSkipSoundsources
for i = 1:length(soundsourceNames)
currentName = soundsourceNames{i};
if strcmp(currentName, floatRowName) ...
|| isnan(pOffsets{currentName, driftColumnName})
|| isnan(pOffsets{currentName, driftColumnName}) ...
|| isinf(pOffsets{currentName, driftColumnName})
continue;
end
% get row indices of soundsource
......@@ -57,7 +58,8 @@ end
%% Process float offset
if pSkipFloatDrift || isnan(pOffsets{floatRowName, driftColumnName})
if pSkipFloatDrift || isnan(pOffsets{floatRowName, driftColumnName}) ...
|| isinf(pOffsets{currentName, driftColumnName})
return;
end
B.toa = B.toa + pA.(floatRowName) * pOffsets{floatRowName, driftColumnName};
......
......@@ -41,7 +41,8 @@ if ~pSkipSoundsources
for i = 1:length(soundsourceNames)
currentName = soundsourceNames{i};
if strcmp(currentName, floatRowName) ...
|| isnan(pOffsets{currentName, offsetColumnName})
|| isnan(pOffsets{currentName, offsetColumnName}) ...
|| isinf(pOffsets{currentName, offsetColumnName})
continue;
end
% get row indices of soundsource
......@@ -55,7 +56,8 @@ end
%% Process float offset
if pSkipFloatOffset || isnan(pOffsets{floatRowName, offsetColumnName})
if pSkipFloatOffset || isnan(pOffsets{floatRowName, offsetColumnName}) ...
|| isinf(pOffsets{floatRowName, offsetColumnName})
return;
end
B.toa = B.toa + pOffsets{floatRowName, offsetColumnName};
......
......@@ -39,10 +39,19 @@ stepSize = length(toaData.toa) / pFloat.toaperphase;
for i = 1:stepSize:length(toaData.toa)
startIndex = i;
endIndex = i + stepSize - 1;
offset = pOffsetsTable {'Float', offsetColumnName};
drift = pOffsetsTable{'Float', driftColumnName};
% check if Inf
if isinf(offset)
offset = 0;
end
if isinf(drift)
drift = 0;
end
toaData.toa(startIndex:endIndex) = artoa.toa.addDrift( ...
toaData.toa(startIndex:endIndex), ...
pOffsetsTable{'Float', offsetColumnName}, ...
pOffsetsTable{'Float', driftColumnName}, ...
offset, ...
drift, ...
floor(min(toaData.toaDate) - floatLaunchRafosTime) ...
);
end
......@@ -73,11 +82,22 @@ for i = 1:length(fnames)
[toaDate, sortedDates] = sort(toaDate);
toa = toa(sortedDates);
% prepare offset and drift
offset = pOffsetsTable {fnames{i}, offsetColumnName};
drift = pOffsetsTable{fnames{i}, driftColumnName};
% check if Inf
if isinf(offset)
offset = 0;
end
if isinf(drift)
drift = 0;
end
% calculate drift of soundsource
toa = artoa.toa.addDrift( ...
toa, ...
-1 * pOffsetsTable{fnames{i}, offsetColumnName}, ...
-1 * pOffsetsTable{fnames{i}, driftColumnName}, ...
-1 * offset, ...
-1 * drift, ...
floor(toaDate - rafosBeginEmission) ...
);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment