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

fix: Empirical shift is now applied before any calculation takes place

parent 0ce8b8a4
No related branches found
No related tags found
No related merge requests found
318
\ No newline at end of file
319
\ No newline at end of file
......@@ -8,9 +8,8 @@ global artoaWorkspace artoaDataInput artoaConfig;
soundsources = artoaDataInput.soundsources;
satData = artoaWorkspace.satData;
%% Setup original toa data with applied soundsources
toaData = artoaWorkspace.toaData;
toaData.toa = artoaDataInput.toaData.toa;
%% Prepare toa data for recalculation
toaData = artoa.controller.prepareToaDataForCalculations();
%% Calculate offsets
......
......@@ -2,7 +2,7 @@ function [] = recalculateToaGpsAndPlot()
%RECALCULATETOAGPSANDPLOT Summary of this function goes here
% Detailed explanation goes here
global artoaWorkspace artoaDataInput;
global artoaWorkspace;
if ~isfield(artoaWorkspace, 'toaData')
return;
......@@ -10,9 +10,8 @@ end
%% Recalculate TOAs
% combine initial toa and current applied soundsources
toaData = artoaWorkspace.toaData;
toaData.toa = artoaDataInput.toaData.toa;
% prepare toa data for recalculation
toaData = artoa.controller.prepareToaDataForCalculations();
if artoaWorkspace.editOffsets.useOffsets
artoaWorkspace.toaData = artoa.toa.recalculate( ...
......@@ -20,8 +19,6 @@ if artoaWorkspace.editOffsets.useOffsets
toaData, ...
artoaWorkspace.editOffsets.offsets ...
);
% Add the empirical shift again.
artoaWorkspace.toaData.toa = artoaWorkspace.toaData.toa + artoaWorkspace.toaData.empiricalShift;
else
artoaWorkspace.toaData = toaData;
end
......
......@@ -67,9 +67,8 @@ trajectoryObject.temperature(dateIndices) = artoaWorkspace.temperature(indices);
artoaWorkspace.rafosDate(artoaWorkspace.statusPressure == 1) ...
};
% restore initial toa, because it is required by the calculate function
toaData = artoaWorkspace.toaData;
toaData.toa = artoaDataInput.toaData.toa;
% prepare the toa data for recalculation
toaData = artoa.controller.prepareToaDataForCalculations();
[ ...
trajectory, ...
......
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