Cleanup predictFromGps.

VERSION

-130
+131
\ No newline at end of file

lib/+artoa/+toa/predictFromGps.m

@@ -13,25 +13,13 @@ floatLaunchTime = artoa.convert.dmy2rd( ...
     pRfb.FLOAT.launchtime(2), ...
     pRfb.FLOAT.launchtime(1) ...
 ) + pRfb.FLOAT.launchtime(4)/24 + pRfb.FLOAT.launchtime(5)/24/60;
-% floatSurfaceEnd = artoa.convert.dmy2rd( ...
-%     pRfb.FLOAT.cycle(13), pRfb.FLOAT.cycle(12), pRfb.FLOAT.cycle(11) ...
-% ) + pRfb.FLOAT.cycle(14)/24 + pRfb.FLOAT.cycle(15)/24/60;
 
 %% Collect sound source data
 soundSourceTime = pSoundSource.reftime(1) + pSoundSource.reftime(2)/60;
-%soundSourceSchedule = pSoundSource.schedule;
-%soundSourceLaunchDate = [pSoundSource.launchtime(3) pSoundSource.launchtime(2) pSoundSource.launchtime(1)];
 soundSourceEmissionBegin = artoa.convert.dmy2rd( ...
     [pSoundSource.begemis(3) pSoundSource.begemis(2) pSoundSource.begemis(1)] ...
 ) + pSoundSource.begemis(4)/24 + pSoundSource.begemis(5)/24/60;
-%soundSourceOffset = 0;
-% if (~isempty(pSoundSource.offset))
-%     soundSourceOffset = pSoundSource.offset(4);
-% end
-soundSourceDrift = 0;
-if ~isempty(pSoundSource.drift) && ~isnan(pSoundSource.drift)
-    soundSourceDrift = pSoundSource.drift;
-end
+
 soundSourcePosition = pSoundSource.position;
 
 %% Collect generic variables
@@ -57,18 +45,6 @@ indicesInRange = (travelCorrection <= maxTime + buffer) & (travelCorrection >= m
 windowStartTime = min(travelCorrection(indicesInRange));
 clear maxTime minTime indicesInRange;
 
-% sound xmit time (seconds) = (hours*60 plus minutes)*60 -leapseconds - sosooffset
-%soundXmitTime = windowStartTime * 3600 - leapSeconds + soundSourceOffset + pAdditionalOffset;
-
-soundSourceDriftSinceLaunch = soundSourceDrift ...
-    * (floatLaunchTime - soundSourceEmissionBegin);
-%soundSourceDriftSinceSurfaceEnd = soundSourceDrift ...
-%    * (floatSurfaceEnd - artoa.convert.dmy2rd(soundSourceEmissionBegin));
-
-%predictedToaAtLaunch =  soundXmitTime + soundSourceDriftSinceLaunch;
-%predictedToaAtSurface = soundXmitTime + soundSourceDriftSinceSurfaceEnd;
-
-
 %% Predict toa for every gps position
 
 gpsMeasurementCount = size(gpsData, 1);
@@ -85,11 +61,10 @@ for o = 1:gpsMeasurementCount
         gpsData(o, pRfb.SAT_FORMAT.month_sat), ...
         gpsData(o, pRfb.SAT_FORMAT.year_sat) ...
     );
-    currentSoundsourceDrift = soundSourceDrift * (gpsRafosDates(o) - soundSourceEmissionBegin);
     % calculate distance between sound source and gps
     distanceSoundSourceToFloat = artoa.data.calculateGeodist(currentGpsPosition, soundSourcePosition);
     
-    predictedToa(o) = windowStartTime * 3600 - leapSeconds + currentSoundsourceDrift ...
+    predictedToa(o) = windowStartTime * 3600 - leapSeconds ...
         + distanceSoundSourceToFloat / (artoa.data.calculateSoundVelocity( ...
             pSoundSpeedParameter.temperature, pSoundSpeedParameter.pressure, ...
             pSoundSpeedParameter.method ...