git-svn-id: file:///home/git/hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/crlmm@53854 bc3139a8-67e5-0310-9ffc-ced21a209358
... | ... |
@@ -1251,20 +1251,17 @@ genotype.Illumina <- function(sampleSheet=NULL, |
1251 | 1251 |
recallRegMin=1000, |
1252 | 1252 |
gender=NULL, |
1253 | 1253 |
returnParams=TRUE, |
1254 |
- badSNP=0.7, |
|
1255 |
- callSet) { |
|
1254 |
+ badSNP=0.7) { |
|
1256 | 1255 |
is.lds = ifelse(isPackageLoaded("ff"), TRUE, FALSE) |
1257 | 1256 |
stopifnot(is.lds) |
1258 | 1257 |
if(missing(cdfName)) stop("must specify cdfName") |
1259 | 1258 |
if(!isValidCdfName(cdfName)) stop("cdfName not valid. see validCdfNames") |
1260 | 1259 |
pkgname = getCrlmmAnnotationName(cdfName) |
1261 |
- if(missing(callSet) | !validObject(callSet)){ |
|
1262 |
- callSet <- construct.Illumina(sampleSheet=sampleSheet, arrayNames=arrayNames, |
|
1260 |
+ callSet <- construct.Illumina(sampleSheet=sampleSheet, arrayNames=arrayNames, |
|
1263 | 1261 |
ids=ids, path=path, arrayInfoColNames=arrayInfoColNames, |
1264 | 1262 |
highDensity=highDensity, sep=sep, fileExt=fileExt, |
1265 | 1263 |
cdfName=cdfName, copynumber=copynumber, verbose=verbose, batch=batch, # fns=fns, |
1266 | 1264 |
saveDate=saveDate) #, outdir=outdir) |
1267 |
- } |
|
1268 | 1265 |
## Basic checks |
1269 | 1266 |
##check that mixtureParams provided |
1270 | 1267 |
if(missing(mixtureParams)) |