git-svn-id: file:///home/git/hedgehog.fhcrc.org/bioconductor/branches/RELEASE_2_6/madman/Rpacks/crlmm@49111 bc3139a8-67e5-0310-9ffc-ced21a209358
... | ... |
@@ -43,7 +43,6 @@ options(continue=" ", width=70) |
43 | 43 |
CRLMM supports the following platforms: |
44 | 44 |
|
45 | 45 |
<<cdfname>>= |
46 |
-library(oligoClasses) |
|
47 | 46 |
library(crlmm) |
48 | 47 |
crlmm:::validCdfNames() |
49 | 48 |
cdfName <- "genomewidesnp6" |
... | ... |
@@ -60,8 +59,13 @@ array as a surrogate for batch. Adjusting by date or chemistry plate |
60 | 59 |
can be helpful for limiting the influence of batch effects. |
61 | 60 |
|
62 | 61 |
<<celfiles>>= |
63 |
-celFiles <- list.celfiles("/thumper/ctsa/snpmicroarray/hapmap/raw/affy/1m", full.names=TRUE, pattern=".CEL") |
|
64 |
-outdir <- "/thumper/ctsa/snpmicroarray/rs/data/hapmap/crlmmVignette/release/affy" |
|
62 |
+if(getRversion() < "2.12.0"){ |
|
63 |
+ rpath <- getRversion() |
|
64 |
+} else rpath <- "trunk" |
|
65 |
+outdir <- paste("/thumper/ctsa/snpmicroarray/rs/ProcessedData/crlmm/", rpath, "/affy_vignette", sep="") |
|
66 |
+datadir <- "/thumper/ctsa/snpmicroarray/hapmap/raw/affy/1m" |
|
67 |
+celFiles <- list.celfiles(datadir, full.names=TRUE, pattern=".CEL") |
|
68 |
+##outdir <- "/thumper/ctsa/snpmicroarray/rs/data/hapmap/crlmmVignette/release/affy" |
|
65 | 69 |
dir.create(outdir, showWarnings=FALSE) |
66 | 70 |
## CEPH and Yoruban |
67 | 71 |
batch <- substr(basename(celFiles), 13, 13) |