RDI adp distance change in formula

TheEarnest · Mar 5, 2012 · f0b327b · f0b327b
1 parent 3f81b62
commit f0b327b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/R/adp.R b/R/adp.R
@@ -303,7 +303,7 @@ summary.adp <- function(object, ...)
     cat("* Coordinate system: ", object@metadata$coordinateSystem, "[originally],", object@metadata$oceCoordinate, "[presently]\n", ...)
     cat("* Frequency:         ", object@metadata$frequency, "kHz\n", ...)
     cat("* Beams:             ", object@metadata$numberOfBeams, if (!is.null(object@metadata$oceBeamUnattenuated) & object@metadata$oceBeamUnattenuated) "beams (attenuated)" else "beams (not attenuated)",
-        "oriented", object@metadata$orientation, "with angle", object@metadata$beam.angle, "deg to axis\n", ...)
+        "oriented", object@metadata$orientation, "with angle", object@metadata$beamAngle, "deg to axis\n", ...)
     if (!is.null(object@metadata$transformationMatrix)) {
         digits <- 4
         cat("* Transformation matrix::\n\n")

diff --git a/R/adp.rdi.R b/R/adp.rdi.R
@@ -598,7 +598,7 @@ read.adp.rdi <- function(file, from=1, to, by=1, tz=getOption("oceTz"),
                 bottomRange[bottomRange.na] <- NA
                 data <- list(v=v, a=a, q=q, 
                              bottomRange=bottomRange, bottomVelocity=bottomVelocity,
-                             distance=seq(bin1Distance, by=cellSize, length.out=numberOfCells),
+                             distance=seq(bin1Distance+cellSize, by=cellSize, length.out=numberOfCells),
                              time=time,
                              pressure=pressure,
                              temperature=temperature,
@@ -609,7 +609,7 @@ read.adp.rdi <- function(file, from=1, to, by=1, tz=getOption("oceTz"),
                              roll=roll)
             } else {
                 data <- list(v=v, a=a, q=q, 
-                             distance=seq(bin1Distance, by=cellSize, length.out=numberOfCells),
+                             distance=seq(bin1Distance+cellSize, by=cellSize, length.out=numberOfCells),
                              time=time,
                              pressure=pressure,
                              temperature=temperature,