Merge pull request #22 from serbinsh/mApply_fix

Quick patch to call correct mApply from Hmisc

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: FieldSpectra
 Type: Package
 Title: Functions for processing field spectroscopy data. Current supported instruments include ADS FieldSpec, Spectral Evolution, and Spectra Vista Corporation
-Version: 0.9.6
+Version: 0.9.7
 Date: 2021-02-18
 Author: Shawn P. Serbin
 Authors@R:
@@ -10,6 +10,7 @@ Authors@R:
            role = c("aut", "cre", "ctb"),
            email = "[email protected]",
            comment = c(ORCID = "0000-0003-4136-8971")))
+Maintainer: Shawn P. Serbin <[email protected]>
 Description: A field spectroscopy package containing functions to process
     spectral files collected using an Analytical Spectral Devices (ASD),
     Spectral Evolution, or Spectra Vista Corporation (SVS) instruments. The goal 
@@ -33,5 +34,4 @@ Copyright: Authors
 LazyLoad: yes
 LazyData: FALSE
 Encoding: UTF-8
-RoxygenNote: 7.1.1
-VignetteBuilder: knitr
+RoxygenNote: 7.1.2

R/average.spec.R

@@ -255,7 +255,7 @@ average.spec <- function(file.dir=NULL,out.dir=NULL,spec.type="Reflectance",star
     stop("******** ERROR: Bias threshold too strict, no remaining spectra to average. Please correct ********")
   }
   ### Get spectra averages
-  spec.avg <- mApply(mat.data,ind,colMeans,simplify=TRUE)
+  spec.avg <- Hmisc::Apply(mat.data,ind,colMeans,simplify=TRUE)
   ### Reformat data for further processing
   if (is.null(dim(spec.avg)[1])) {
     spec.avg <- data.frame(Spectra=unique(good.spec$Spectra), t(as.vector(spec.avg)))
@@ -343,7 +343,7 @@ average.spec <- function(file.dir=NULL,out.dir=NULL,spec.type="Reflectance",star
   #ind <- factor(as.numeric(good.spec$Spectra))
   ind <- factor(good.spec$Spectra)
   mat.data <- as.matrix(good.spec[,2:dim(good.spec)[2]])
-  spec.avg <- mApply(mat.data,ind,colMeans,simplify=TRUE)
+  spec.avg <- Hmisc::mApply(mat.data,ind,colMeans,simplify=TRUE)
   ### Reformat spectral data for output
   if (is.null(dim(spec.avg)[1])){
     spec.avg <- data.frame(Spectra=unique(good.spec$Spectra), t(as.vector(spec.avg)))