[Seqinr-commits] r1662 - pkg/R

[noreply at r-forge.r-project.org]

Author: lobry
Date: 2009-10-12 10:54:51 +0200 (Mon, 12 Oct 2009)
New Revision: 1662

Modified:
   pkg/R/peakabif.R
Log:
 

Modified: pkg/R/peakabif.R
===================================================================
--- pkg/R/peakabif.R	2009-10-12 08:34:30 UTC (rev 1661)
+++ pkg/R/peakabif.R	2009-10-12 08:54:51 UTC (rev 1662)
@@ -11,7 +11,8 @@
   yscale = 1000,
   irange = (tmin*tscale):(tmax*tscale),
   y = abifdata$Data[[DATA]][irange]/yscale,
-  method = "monoH.FC", ...) {
+  method = "monoH.FC",
+  maxrfu = 1000, ...) {
   	
 	y[y < thres] <- 0
 	heights <- surfaces <- maxis <- starts <- stops <- numeric(npeak)
@@ -57,8 +58,8 @@
 	#
 	# Compute baseline:
 	#
-	y <- abifdata$Data[[DATA]][irange]/yscale
-	baseline <- as.numeric(names(which.max(table(y))))
+        baseline <- baselineabif(abifdata$Data[[DATA]][irange], maxrfu = maxrfu)
+        baseline <- baseline/yscale
 	
 	if(fig) mtext(paste(deparse(substitute(abifdata)), ",",
 	  DATA, ", tmin =", tmin, ", tmax =", tmax, ", thres =", thres, ", npeak =", npeak, ", yscale = ", yscale), side = 3, outer = TRUE)