Mercurial > repos > galaxyp > cardinal_classification

changeset 10:3f4cb76b0c5f draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
"planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/cardinal commit ca89f8e007c6b17f7c30066729e05b8686ab975a"
author galaxyp
date Sun, 27 Sep 2020 10:48:37 +0000
parents 24c000517173
children 2308bd817e3e
files macros.xml test-data/QC_analyze75.pdf test-data/QC_empty_spectra.pdf test-data/QC_imzml.pdf test-data/QC_rdata.pdf test-data/analyze75_filtered2.pdf test-data/imzml_filtered3.pdf test-data/imzml_filtered4.pdf test-data/imzml_filtered5.pdf test-data/imzml_filtered8.pdf test-data/out3.ibd test-data/out3.imzml test-data/out3.imzml.txt test-data/out4.ibd test-data/out4.imzml test-data/out4.imzml.txt test-data/out5.ibd test-data/out5.imzml test-data/out5.imzml.txt test-data/out6.ibd test-data/out6.imzml test-data/out6.imzml.txt test-data/out7.ibd test-data/out7.imzml test-data/out7.imzml.txt test-data/out8.ibd test-data/out8.imzml test-data/out8.imzml.txt test-data/rdata_notfiltered.pdf
diffstat 29 files changed, 66 insertions(+), 61 deletions(-) [+]
line wrap: on
line diff
--- a/macros.xml	Thu Sep 24 11:34:50 2020 +0000
+++ b/macros.xml	Sun Sep 27 10:48:37 2020 +0000
@@ -117,6 +117,13 @@
     <token name="@DATA_PROPERTIES_INRAM@"><![CDATA[ 
 ########################### QC numbers ########################
 ## including intensity calculations which need data in RAM
+
+	int_matrix = as.matrix(spectra(msidata)) ## only load once into RAM, then re-use
+	## Number of NA in spectra matrix
+        NAcount = sum(is.na(int_matrix))
+	## replace NA with zero to calculate data properties based on intensity matrix, no change in msidata
+	int_matrix[is.na(int_matrix)] <- 0
+	
         ## Number of features (mz)
         maxfeatures = length(features(msidata))
         ## Range mz
@@ -131,14 +138,12 @@
         minimumy = min(coord(msidata)[,2])
         maximumy = max(coord(msidata)[,2])
         ## Range of intensities
-        minint = round(min(as.matrix(spectra(msidata)), na.rm=TRUE), digits=2)
-        maxint = round(max(as.matrix(spectra(msidata)), na.rm=TRUE), digits=2)
+        minint = round(min(int_matrix), digits=2)
+        maxint = round(max(int_matrix), digits=2)
         ## Number of intensities > 0, for if conditions
-        npeaks= sum(as.matrix(spectra(msidata))>0, na.rm=TRUE)
+        npeaks= sum(int_matrix>0)
         ## Number of NA in spectra matrix
-        NAcount = sum(is.na(spectra(msidata)))
-        ## Number of NA in spectra matrix
-        infcount = sum(is.infinite(as.matrix(spectra(msidata))))
+        infcount = sum(is.infinite(int_matrix))
         ## Number of duplicated coordinates
         dupl_coord = sum(duplicated(coord(msidata)))
         properties = c("Number of m/z features",
Binary file test-data/QC_analyze75.pdf has changed
Binary file test-data/QC_empty_spectra.pdf has changed
Binary file test-data/QC_imzml.pdf has changed
Binary file test-data/QC_rdata.pdf has changed
Binary file test-data/analyze75_filtered2.pdf has changed
Binary file test-data/imzml_filtered3.pdf has changed
Binary file test-data/imzml_filtered4.pdf has changed
Binary file test-data/imzml_filtered5.pdf has changed
Binary file test-data/imzml_filtered8.pdf has changed
Binary file test-data/out3.ibd has changed
--- a/test-data/out3.imzml	Thu Sep 24 11:34:50 2020 +0000
+++ b/test-data/out3.imzml	Sun Sep 27 10:48:37 2020 +0000
@@ -9,8 +9,8 @@
 		<fileContent>
 			<cvParam cvRef="MS" accession="MS:1000579" name="MS1 spectrum" value="" />
 			<cvParam cvRef="MS" accession="MS:1000128" name="profile spectrum" value="" />
-			<cvParam cvRef="IMS" accession="IMS:1000080" name="universally unique identifier" value="c6cc990a-d910-4c17-aedd-ceb204b4d105" />
-			<cvParam cvRef="IMS" accession="IMS:1000091" name="ibd SHA-1" value="ef8c4f864d0386736c986ebb4d4eb29a726e42d4" />
+			<cvParam cvRef="IMS" accession="IMS:1000080" name="universally unique identifier" value="97f42eea-750c-49e4-b46d-08c548dc3b9d" />
+			<cvParam cvRef="IMS" accession="IMS:1000091" name="ibd SHA-1" value="4e046226f81e9c78255df625ca3546ef26dd0693" />
 			<cvParam cvRef="IMS" accession="IMS:1000030" name="continuous" value="" />
 		</fileContent>
 	</fileDescription>
--- a/test-data/out3.imzml.txt	Thu Sep 24 11:34:50 2020 +0000
+++ b/test-data/out3.imzml.txt	Sun Sep 27 10:48:37 2020 +0000
@@ -1,4 +1,4 @@
 imzML file:
 total 24
--rw-rw-r-- 1 meli meli 9616 Aug 23 17:39 ibd
--rw-rw-r-- 1 meli meli 8958 Aug 23 17:39 imzml
+-rw-rw-r-- 1 meli meli 9616 Sep 27 10:51 ibd
+-rw-rw-r-- 1 meli meli 8958 Sep 27 10:51 imzml
Binary file test-data/out4.ibd has changed
--- a/test-data/out4.imzml	Thu Sep 24 11:34:50 2020 +0000
+++ b/test-data/out4.imzml	Sun Sep 27 10:48:37 2020 +0000
@@ -9,8 +9,8 @@
 		<fileContent>
 			<cvParam cvRef="MS" accession="MS:1000579" name="MS1 spectrum" value="" />
 			<cvParam cvRef="MS" accession="MS:1000128" name="profile spectrum" value="" />
-			<cvParam cvRef="IMS" accession="IMS:1000080" name="universally unique identifier" value="78fa5a7c-8dc8-4ff1-ad77-b19714f285cb" />
-			<cvParam cvRef="IMS" accession="IMS:1000091" name="ibd SHA-1" value="64d40f8c65af1399e24d94569f4dd3fdbf43a901" />
+			<cvParam cvRef="IMS" accession="IMS:1000080" name="universally unique identifier" value="37f3f75a-82c4-47c5-b78e-28fb8697e59b" />
+			<cvParam cvRef="IMS" accession="IMS:1000091" name="ibd SHA-1" value="1746fd2ec8a12707330a78ff5a0ff98cb53dca42" />
 			<cvParam cvRef="IMS" accession="IMS:1000030" name="continuous" value="" />
 		</fileContent>
 	</fileDescription>
--- a/test-data/out4.imzml.txt	Thu Sep 24 11:34:50 2020 +0000
+++ b/test-data/out4.imzml.txt	Sun Sep 27 10:48:37 2020 +0000
@@ -1,4 +1,4 @@
 imzML file:
 total 44
--rw-rw-r-- 1 meli meli 28792 Aug 23 17:39 ibd
--rw-rw-r-- 1 meli meli 12046 Aug 23 17:39 imzml
+-rw-rw-r-- 1 meli meli 28792 Sep 27 10:52 ibd
+-rw-rw-r-- 1 meli meli 12046 Sep 27 10:52 imzml
Binary file test-data/out5.ibd has changed
--- a/test-data/out5.imzml	Thu Sep 24 11:34:50 2020 +0000
+++ b/test-data/out5.imzml	Sun Sep 27 10:48:37 2020 +0000
@@ -9,8 +9,8 @@
 		<fileContent>
 			<cvParam cvRef="MS" accession="MS:1000579" name="MS1 spectrum" value="" />
 			<cvParam cvRef="MS" accession="MS:1000128" name="profile spectrum" value="" />
-			<cvParam cvRef="IMS" accession="IMS:1000080" name="universally unique identifier" value="30751422-deca-429e-9f8e-24639c108d6d" />
-			<cvParam cvRef="IMS" accession="IMS:1000091" name="ibd SHA-1" value="2c7f19c6447844039a112152c19f7cfd50dbf12e" />
+			<cvParam cvRef="IMS" accession="IMS:1000080" name="universally unique identifier" value="37236c7e-6e93-4ccc-9111-1b1153aac713" />
+			<cvParam cvRef="IMS" accession="IMS:1000091" name="ibd SHA-1" value="ccb886aaf3cb7564f518884413ea988c59a1de57" />
 			<cvParam cvRef="IMS" accession="IMS:1000030" name="continuous" value="" />
 		</fileContent>
 	</fileDescription>
--- a/test-data/out5.imzml.txt	Thu Sep 24 11:34:50 2020 +0000
+++ b/test-data/out5.imzml.txt	Sun Sep 27 10:48:37 2020 +0000
@@ -1,4 +1,4 @@
 imzML file:
 total 20
--rw-rw-r-- 1 meli meli   380 Aug 23 17:40 ibd
--rw-rw-r-- 1 meli meli 13525 Aug 23 17:40 imzml
+-rw-rw-r-- 1 meli meli   380 Sep 27 10:53 ibd
+-rw-rw-r-- 1 meli meli 13525 Sep 27 10:53 imzml
Binary file test-data/out6.ibd has changed
--- a/test-data/out6.imzml	Thu Sep 24 11:34:50 2020 +0000
+++ b/test-data/out6.imzml	Sun Sep 27 10:48:37 2020 +0000
@@ -9,8 +9,8 @@
 		<fileContent>
 			<cvParam cvRef="MS" accession="MS:1000579" name="MS1 spectrum" value="" />
 			<cvParam cvRef="MS" accession="MS:1000128" name="profile spectrum" value="" />
-			<cvParam cvRef="IMS" accession="IMS:1000080" name="universally unique identifier" value="254b991f-92f5-46d5-8069-6f9ecd53b05a" />
-			<cvParam cvRef="IMS" accession="IMS:1000091" name="ibd SHA-1" value="0aaa784dc2a335da176a4bc2d12a43f2d18bdbf1" />
+			<cvParam cvRef="IMS" accession="IMS:1000080" name="universally unique identifier" value="734d4b50-4440-4747-a0e9-de78974d1487" />
+			<cvParam cvRef="IMS" accession="IMS:1000091" name="ibd SHA-1" value="b1636b28fd4e0ab9caf5aaa4c1a40760030a4e73" />
 			<cvParam cvRef="IMS" accession="IMS:1000030" name="continuous" value="" />
 		</fileContent>
 	</fileDescription>
--- a/test-data/out6.imzml.txt	Thu Sep 24 11:34:50 2020 +0000
+++ b/test-data/out6.imzml.txt	Sun Sep 27 10:48:37 2020 +0000
@@ -1,4 +1,4 @@
 imzML file:
 total 164
--rw-rw-r-- 1 meli meli 146896 Aug 23 17:41 ibd
--rw-rw-r-- 1 meli meli  18221 Aug 23 17:41 imzml
+-rw-rw-r-- 1 meli meli 146896 Sep 27 10:53 ibd
+-rw-rw-r-- 1 meli meli  18221 Sep 27 10:53 imzml
Binary file test-data/out7.ibd has changed
--- a/test-data/out7.imzml	Thu Sep 24 11:34:50 2020 +0000
+++ b/test-data/out7.imzml	Sun Sep 27 10:48:37 2020 +0000
@@ -9,8 +9,8 @@
 		<fileContent>
 			<cvParam cvRef="MS" accession="MS:1000579" name="MS1 spectrum" value="" />
 			<cvParam cvRef="MS" accession="MS:1000128" name="profile spectrum" value="" />
-			<cvParam cvRef="IMS" accession="IMS:1000080" name="universally unique identifier" value="227ecc2e-a494-4018-afc5-45eaa790e812" />
-			<cvParam cvRef="IMS" accession="IMS:1000091" name="ibd SHA-1" value="e22162d1dd762607ca6d31c0b8892e0ae5a3a772" />
+			<cvParam cvRef="IMS" accession="IMS:1000080" name="universally unique identifier" value="f81632b3-50b0-4a57-88a2-5f7cf97f9bae" />
+			<cvParam cvRef="IMS" accession="IMS:1000091" name="ibd SHA-1" value="9f88294c3cff3e8c30e80632d6ad616b7db18089" />
 			<cvParam cvRef="IMS" accession="IMS:1000030" name="continuous" value="" />
 		</fileContent>
 	</fileDescription>
--- a/test-data/out7.imzml.txt	Thu Sep 24 11:34:50 2020 +0000
+++ b/test-data/out7.imzml.txt	Sun Sep 27 10:48:37 2020 +0000
@@ -1,4 +1,4 @@
 imzML file:
 total 116
--rw-rw-r-- 1 meli meli 95976 Aug 23 17:41 ibd
--rw-rw-r-- 1 meli meli 18199 Aug 23 17:41 imzml
+-rw-rw-r-- 1 meli meli 95976 Sep 27 10:54 ibd
+-rw-rw-r-- 1 meli meli 18199 Sep 27 10:54 imzml
Binary file test-data/out8.ibd has changed
--- a/test-data/out8.imzml	Thu Sep 24 11:34:50 2020 +0000
+++ b/test-data/out8.imzml	Sun Sep 27 10:48:37 2020 +0000
@@ -9,9 +9,9 @@
 		<fileContent>
 			<cvParam cvRef="MS" accession="MS:1000579" name="MS1 spectrum" value="" />
 			<cvParam cvRef="MS" accession="MS:1000128" name="profile spectrum" value="" />
-			<cvParam cvRef="IMS" accession="IMS:1000080" name="universally unique identifier" value="91ed729b-0b8d-49f6-b832-e4d3834fe733" />
-			<cvParam cvRef="IMS" accession="IMS:1000091" name="ibd SHA-1" value="efd09bddeebeb334efe9dffad3a4f3bed35442d1" />
-			<cvParam cvRef="IMS" accession="IMS:1000031" name="processed" value="" />
+			<cvParam cvRef="IMS" accession="IMS:1000080" name="universally unique identifier" value="02059ae7-7beb-4ecf-92ae-7a767e04bf43" />
+			<cvParam cvRef="IMS" accession="IMS:1000091" name="ibd SHA-1" value="dc3960918fa3008824889b4ac142be1d0534ded8" />
+			<cvParam cvRef="IMS" accession="IMS:1000030" name="continuous" value="" />
 		</fileContent>
 	</fileDescription>
 	<referenceableParamGroupList count="4">
@@ -90,15 +90,15 @@
 					<binaryDataArray encodedLength="0">
 						<referenceableParamGroupRef ref="mzArray" />
 						<cvParam cvRef="IMS" accession="IMS:1000102" name="external offset" value="16" />
-						<cvParam cvRef="IMS" accession="IMS:1000103" name="external array length" value="8399" />
-						<cvParam cvRef="IMS" accession="IMS:1000104" name="external encoded length" value="33596" />
+						<cvParam cvRef="IMS" accession="IMS:1000103" name="external array length" value="10367" />
+						<cvParam cvRef="IMS" accession="IMS:1000104" name="external encoded length" value="41468" />
 						<binary />
 					</binaryDataArray>
 					<binaryDataArray encodedLength="0">
 						<referenceableParamGroupRef ref="intensityArray" />
-						<cvParam cvRef="IMS" accession="IMS:1000102" name="external offset" value="33612" />
-						<cvParam cvRef="IMS" accession="IMS:1000103" name="external array length" value="8399" />
-						<cvParam cvRef="IMS" accession="IMS:1000104" name="external encoded length" value="33596" />
+						<cvParam cvRef="IMS" accession="IMS:1000102" name="external offset" value="41484" />
+						<cvParam cvRef="IMS" accession="IMS:1000103" name="external array length" value="10367" />
+						<cvParam cvRef="IMS" accession="IMS:1000104" name="external encoded length" value="41468" />
 						<binary />
 					</binaryDataArray>
 				</binaryDataArrayList>
@@ -118,16 +118,16 @@
 				<binaryDataArrayList count="2">
 					<binaryDataArray encodedLength="0">
 						<referenceableParamGroupRef ref="mzArray" />
-						<cvParam cvRef="IMS" accession="IMS:1000102" name="external offset" value="67208" />
-						<cvParam cvRef="IMS" accession="IMS:1000103" name="external array length" value="8399" />
-						<cvParam cvRef="IMS" accession="IMS:1000104" name="external encoded length" value="33596" />
+						<cvParam cvRef="IMS" accession="IMS:1000102" name="external offset" value="16" />
+						<cvParam cvRef="IMS" accession="IMS:1000103" name="external array length" value="10367" />
+						<cvParam cvRef="IMS" accession="IMS:1000104" name="external encoded length" value="41468" />
 						<binary />
 					</binaryDataArray>
 					<binaryDataArray encodedLength="0">
 						<referenceableParamGroupRef ref="intensityArray" />
-						<cvParam cvRef="IMS" accession="IMS:1000102" name="external offset" value="100804" />
-						<cvParam cvRef="IMS" accession="IMS:1000103" name="external array length" value="8399" />
-						<cvParam cvRef="IMS" accession="IMS:1000104" name="external encoded length" value="33596" />
+						<cvParam cvRef="IMS" accession="IMS:1000102" name="external offset" value="82952" />
+						<cvParam cvRef="IMS" accession="IMS:1000103" name="external array length" value="10367" />
+						<cvParam cvRef="IMS" accession="IMS:1000104" name="external encoded length" value="41468" />
 						<binary />
 					</binaryDataArray>
 				</binaryDataArrayList>
@@ -147,16 +147,16 @@
 				<binaryDataArrayList count="2">
 					<binaryDataArray encodedLength="0">
 						<referenceableParamGroupRef ref="mzArray" />
-						<cvParam cvRef="IMS" accession="IMS:1000102" name="external offset" value="134400" />
-						<cvParam cvRef="IMS" accession="IMS:1000103" name="external array length" value="8399" />
-						<cvParam cvRef="IMS" accession="IMS:1000104" name="external encoded length" value="33596" />
+						<cvParam cvRef="IMS" accession="IMS:1000102" name="external offset" value="16" />
+						<cvParam cvRef="IMS" accession="IMS:1000103" name="external array length" value="10367" />
+						<cvParam cvRef="IMS" accession="IMS:1000104" name="external encoded length" value="41468" />
 						<binary />
 					</binaryDataArray>
 					<binaryDataArray encodedLength="0">
 						<referenceableParamGroupRef ref="intensityArray" />
-						<cvParam cvRef="IMS" accession="IMS:1000102" name="external offset" value="167996" />
-						<cvParam cvRef="IMS" accession="IMS:1000103" name="external array length" value="8399" />
-						<cvParam cvRef="IMS" accession="IMS:1000104" name="external encoded length" value="33596" />
+						<cvParam cvRef="IMS" accession="IMS:1000102" name="external offset" value="124420" />
+						<cvParam cvRef="IMS" accession="IMS:1000103" name="external array length" value="10367" />
+						<cvParam cvRef="IMS" accession="IMS:1000104" name="external encoded length" value="41468" />
 						<binary />
 					</binaryDataArray>
 				</binaryDataArrayList>
@@ -176,16 +176,16 @@
 				<binaryDataArrayList count="2">
 					<binaryDataArray encodedLength="0">
 						<referenceableParamGroupRef ref="mzArray" />
-						<cvParam cvRef="IMS" accession="IMS:1000102" name="external offset" value="201592" />
-						<cvParam cvRef="IMS" accession="IMS:1000103" name="external array length" value="8399" />
-						<cvParam cvRef="IMS" accession="IMS:1000104" name="external encoded length" value="33596" />
+						<cvParam cvRef="IMS" accession="IMS:1000102" name="external offset" value="16" />
+						<cvParam cvRef="IMS" accession="IMS:1000103" name="external array length" value="10367" />
+						<cvParam cvRef="IMS" accession="IMS:1000104" name="external encoded length" value="41468" />
 						<binary />
 					</binaryDataArray>
 					<binaryDataArray encodedLength="0">
 						<referenceableParamGroupRef ref="intensityArray" />
-						<cvParam cvRef="IMS" accession="IMS:1000102" name="external offset" value="235188" />
-						<cvParam cvRef="IMS" accession="IMS:1000103" name="external array length" value="8399" />
-						<cvParam cvRef="IMS" accession="IMS:1000104" name="external encoded length" value="33596" />
+						<cvParam cvRef="IMS" accession="IMS:1000102" name="external offset" value="165888" />
+						<cvParam cvRef="IMS" accession="IMS:1000103" name="external array length" value="10367" />
+						<cvParam cvRef="IMS" accession="IMS:1000104" name="external encoded length" value="41468" />
 						<binary />
 					</binaryDataArray>
 				</binaryDataArrayList>
@@ -205,16 +205,16 @@
 				<binaryDataArrayList count="2">
 					<binaryDataArray encodedLength="0">
 						<referenceableParamGroupRef ref="mzArray" />
-						<cvParam cvRef="IMS" accession="IMS:1000102" name="external offset" value="268784" />
-						<cvParam cvRef="IMS" accession="IMS:1000103" name="external array length" value="8399" />
-						<cvParam cvRef="IMS" accession="IMS:1000104" name="external encoded length" value="33596" />
+						<cvParam cvRef="IMS" accession="IMS:1000102" name="external offset" value="16" />
+						<cvParam cvRef="IMS" accession="IMS:1000103" name="external array length" value="10367" />
+						<cvParam cvRef="IMS" accession="IMS:1000104" name="external encoded length" value="41468" />
 						<binary />
 					</binaryDataArray>
 					<binaryDataArray encodedLength="0">
 						<referenceableParamGroupRef ref="intensityArray" />
-						<cvParam cvRef="IMS" accession="IMS:1000102" name="external offset" value="302380" />
-						<cvParam cvRef="IMS" accession="IMS:1000103" name="external array length" value="8399" />
-						<cvParam cvRef="IMS" accession="IMS:1000104" name="external encoded length" value="33596" />
+						<cvParam cvRef="IMS" accession="IMS:1000102" name="external offset" value="207356" />
+						<cvParam cvRef="IMS" accession="IMS:1000103" name="external array length" value="10367" />
+						<cvParam cvRef="IMS" accession="IMS:1000104" name="external encoded length" value="41468" />
 						<binary />
 					</binaryDataArray>
 				</binaryDataArrayList>
--- a/test-data/out8.imzml.txt	Thu Sep 24 11:34:50 2020 +0000
+++ b/test-data/out8.imzml.txt	Sun Sep 27 10:48:37 2020 +0000
@@ -1,4 +1,4 @@
 imzML file:
-total 348
--rw-rw-r-- 1 meli meli 335976 Aug 23 17:42 ibd
--rw-rw-r-- 1 meli meli  12402 Aug 23 17:42 imzml
+total 260
+-rw-rw-r-- 1 meli meli 248824 Sep 27 11:44 ibd
+-rw-rw-r-- 1 meli meli  12397 Sep 27 11:44 imzml
Binary file test-data/rdata_notfiltered.pdf has changed