Browse code

Merge branch 'master' into write_support

jotsetung authored on 10/07/2017 11:29:35
Showing 7 changed files

... ...
@@ -2,7 +2,7 @@ Package: mzR
2 2
 Type: Package
3 3
 Title: parser for netCDF, mzXML, mzData and mzML and mzIdentML files
4 4
        (mass spectrometry data)
5
-Version: 2.11.4
5
+Version: 2.11.5
6 6
 Author: Bernd Fischer, Steffen Neumann, Laurent Gatto, Qiang Kou
7 7
 Maintainer: Bernd Fischer <b.fischer@dkfz.de>,
8 8
 	    Steffen Neumann <sneumann@ipb-halle.de>,
... ...
@@ -1,7 +1,10 @@
1 1
 CHANGES IN VERSION 2.11.4
2 2
 -------------------------
3
- o writeMSData and copyWriteMSData functions enabling to export MS data to
4
-   mzML or mzXML files.
3
+ o Nothing yet
4
+ 
5
+CHANGES IN VERSION 2.11.4
6
+-------------------------
7
+ o Use full TMT file pattern to select a single file
5 8
  
6 9
 CHANGES IN VERSION 2.11.3
7 10
 -------------------------
... ...
@@ -14,7 +14,8 @@ test_chromatograms1 <- function() {
14 14
 }
15 15
 
16 16
 test_chromatograms2 <- function() {
17
-    f <- proteomics(full.names = TRUE, pattern = "^TMT")
17
+    f <- proteomics(full.names = TRUE,
18
+                    pattern = "TMT_Erwinia_1uLSike_Top10HCD_isol2_45stepped_60min_01.mzML.gz")
18 19
     x <- openMSfile(f, backend = "pwiz")
19 20
     checkIdentical(nChrom(x), 1L)   
20 21
     checkIdentical(tic(x), chromatogram(x, 1L))
... ...
@@ -1,6 +1,7 @@
1 1
 test_isolationWindow <- function() {
2 2
     library("msdata")
3
-    f <- msdata::proteomics(full.names = TRUE, pattern = "TMT_")
3
+    f <- msdata::proteomics(full.names = TRUE,
4
+                            pattern = "TMT_Erwinia_1uLSike_Top10HCD_isol2_45stepped_60min_01.mzML.gz")
4 5
     rw1 <- openMSfile(f, backend = "Ramp")
5 6
     rw2 <- openMSfile(f, backend = "pwiz")
6 7
     i1 <- isolationWindow(f)
... ...
@@ -118,7 +118,8 @@ test_getScanHeaderInfo <- function() {
118 118
     close(ramp)
119 119
 
120 120
     ## Again for an MSn mzml file.
121
-    file <- msdata::proteomics(full.names = TRUE, pattern = "TMT_Erwinia")
121
+    file <- msdata::proteomics(full.names = TRUE,
122
+                               pattern = "TMT_Erwinia_1uLSike_Top10HCD_isol2_45stepped_60min_01.mzML.gz")
122 123
     mzml <- openMSfile(file, backend = "pwiz")
123 124
     ramp <- openMSfile(file, backend = "Ramp")
124 125
     ## Read single scan header.
... ...
@@ -51,7 +51,8 @@
51 51
 
52 52
 \examples{
53 53
 library("msdata")
54
-f <- msdata::proteomics(full.names = TRUE, pattern = "TMT_")
54
+f <- msdata::proteomics(full.names = TRUE,
55
+                        pattern = "TMT_Erwinia_1uLSike_Top10HCD_isol2_45stepped_60min_01.mzML.gz")
55 56
 isolationWindow(f)
56 57
 
57 58
 rw <- openMSfile(f)
... ...
@@ -151,7 +151,8 @@
151 151
  close(mz)
152 152
 
153 153
  ## A shortgun LCMSMS experiment 
154
- f <- proteomics(full.names = TRUE, pattern = "^TMT")
154
+ f <- proteomics(full.names = TRUE,
155
+                 pattern = "TMT_Erwinia_1uLSike_Top10HCD_isol2_45stepped_60min_01.mzML.gz")
155 156
  x <- openMSfile(f, backend = "pwiz")
156 157
  x
157 158
  nChrom(x)