Renamed chronoamp2df() to amp2df(). Added stringsAsFactors.

Renamed because the technique I have used so far is regular amperometry,
not chronoamperometry. Whatever the distinction is, I am not really sure.
Anyway, this function corresponds to the amperometry2df() function for CHI760.
master
Taha Ahmed 13 years ago
parent ab65adee9d
commit 77fd0b5aef

@ -4,21 +4,21 @@
# CONTENTS # CONTENTS
source("/home/taha/chepec/chetex/common/R/common.R") source("/home/taha/chepec/chetex/common/R/common.R")
# >>>> chronoamp2df # >>>> amp2df
################################################## ##################################################
################# chronoamp2df ################### #################### amp2df ######################
################################################## ##################################################
chronoamp2df <- function(datafilename, wearea = 1) { amp2df <- function(datafilename, wearea = 1) {
## Description: ## Description:
## Reads current-time data (from AUTOLAB potentiostat) ## Reads current-time data (from AUTOLAB potentiostat)
## and returns a dataframe with the data and some ## and returns a dataframe with the data and some
## calculated quantities based on the data. ## calculated quantities based on the data.
## Usage: ## Usage:
## chronoamp2df(datafilename, wearea) ## amp2df(datafilename, wearea)
## Arguments: ## Arguments:
## datafilename: text string with full path to experimental file ## datafilename: text string with full path to experimental file
## wearea: (optional) area of working electrode (in square centimeters) ## wearea: (optional) area of working electrode (in square centimeters)
@ -67,6 +67,7 @@ chronoamp2df <- function(datafilename, wearea = 1) {
zz <- textConnection(chifile[starts[s]:ends[s]], "r") zz <- textConnection(chifile[starts[s]:ends[s]], "r")
ff <- rbind(ff, ff <- rbind(ff,
data.frame(sampleid, data.frame(sampleid,
stringsAsFactors = FALSE,
matrix(scan(zz, what = numeric(), sep = ""), matrix(scan(zz, what = numeric(), sep = ""),
ncol = 2, byrow = T))) ncol = 2, byrow = T)))
close(zz) close(zz)

Loading…
Cancel
Save