Browse code

git-svn-id: file:///home/git/hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/crlmm@43356 bc3139a8-67e5-0310-9ffc-ced21a209358

unknown authored on 03/12/2009 07:05:16
Showing 2 changed files

... ...
@@ -344,3 +344,5 @@ is decoded and scanned
344 344
 
345 345
  * bug fixed in stripNormalize() [X+16,Y+16 which avoids log(0) = -Inf values, 
346 346
       removed inadvertantly in version 1.3.7, put back]
347
+ * removed header checking from readIdatFiles() (seems to fail often).  
348
+      Instead check that the number of SNPs agrees (to within +/- 10K SNPs)
... ...
@@ -95,7 +95,8 @@ readIdatFiles <- function(sampleSheet=NULL,
95 95
 	       headerInfo$ChipType[i] = G$ChipType
96 96
 	       headerInfo$Manifest[i] = G$Unknown$MostlyNull
97 97
 	       headerInfo$Position[i] = G$Unknowns$MostlyA
98
-	       if(headerInfo$ChipType[i]!=headerInfo$ChipType[1] || headerInfo$Manifest[i]!=headerInfo$Manifest[1]) {
98
+               if(headerInfo$nProbes[i]>(headerInfo$nProbes[1]+10000) || headerInfo$nProbes[i]<(headerInfo$nProbes[1]-10000)) {
99
+                       ## headerInfo$ChipType[i]!=headerInfo$ChipType[1] || headerInfo$Manifest[i]!=headerInfo$Manifest[1]) {
99 100
 		       ## || headerInfo$nProbes[i]!=headerInfo$nProbes[1] ## removed this condition as some arrays used the same manifest
100 101
 		       ## but differed by a few SNPs for some reason - most of the chip was the same though
101 102
 		       ##           stop("Chips are not of all of the same type - please check your data")