minor simplification of code regarding calibration issue

Author: jhmigueles

R/ReadAndCalibrate.R

@@ -85,16 +85,15 @@ ReadAndCalibrate = function(file, sf, blocksize, blocknumber, inspectfileobject,
     }
     # -------------------------------------------------------------------------
     # MODULE 3 - EXTRACT CALIBRATION COEFFICIENTS -----------------------------
-    calCoefs = vm.error.st = vm.error.end = NULL
+    calCoefs = list(offset = c(0,0,0), scale = c(1, 1, 1))
+    vm.error.st = vm.error.end = NA
     if (do.calibration == TRUE & iteration == 1) {
       accCols = which(colnames(data) %in% c("x","y","z"))
-      cal = try(calibrateRaw(data[, accCols], sf = sf, verbose = verbose),silent = T)
-
+      cal = try(calibrateRaw(data[, accCols], sf = sf, verbose = verbose),
+                silent = T)
       if (is.list(cal)) {
         calCoefs = cal$calCoefs; vm.error.st = cal$vm.error.st;
         vm.error.end = cal$vm.error.end
-      } else{
-        calCoefs = list(offset = c(0,0,0), scale = c(1, 1, 1))
       }
     }
     # -------------------------------------------------------------------------