Mercurial > repos > galaxyp > cardinal_combine

diff test-data/out6.imzml @ 6:bb1ac6b47a6c 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 15e24b1f0143679647906bc427654f66b417a45c"
author galaxyp
date Wed, 25 Mar 2020 07:02:41 -0400
parents 129cddd02600
children 7e18fcb92a6a
line wrap: on
line diff
--- a/test-data/out6.imzml	Fri Dec 13 13:54:23 2019 -0500
+++ b/test-data/out6.imzml	Wed Mar 25 07:02:41 2020 -0400
@@ -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="{24BF18EC-E1DE-4B67-BC12-C3EB475CFC0A}" />
-			<cvParam cvRef="IMS" accession="IMS:1000091" name="ibd SHA-1" value="DA0417F6AA4EDD71F808B6EA0D7A0706737464EB" />
+			<cvParam cvRef="IMS" accession="IMS:1000080" name="universally unique identifier" value="8b625a26-987e-4e32-b7d4-729efe840814" />
+			<cvParam cvRef="IMS" accession="IMS:1000091" name="ibd SHA-1" value="78e6eb56507d789575ee0495e60f9d44a192c0dd" />
 			<cvParam cvRef="IMS" accession="IMS:1000030" name="continuous" value="" />
 		</fileContent>
 	</fileDescription>
@@ -22,19 +22,18 @@
 		</referenceableParamGroup>
 		<referenceableParamGroup id="scan1">
 			<cvParam cvRef="MS" accession="MS:1000093" name="increasing m/z scan" value="" />
-			<cvParam cvRef="MS" accession="MS:1000095" name="linear" value="" />
 		</referenceableParamGroup>
 		<referenceableParamGroup id="mzArray">
 			<cvParam cvRef="MS" accession="MS:1000576" name="no compression" value="" />
 			<cvParam cvRef="MS" accession="MS:1000514" name="m/z array" value="" unitCvRef="MS" unitAccession="MS:1000040" unitName="m/z" />
 			<cvParam cvRef="IMS" accession="IMS:1000101" name="external data" value="true" />
-			<cvParam cvRef="MS" accession="MS:1000521" name="32-bit float" value="32-bit float" />
+			<cvParam cvRef="MS" accession="MS:1000521" name="32-bit float" value="" />
 		</referenceableParamGroup>
 		<referenceableParamGroup id="intensityArray">
 			<cvParam cvRef="MS" accession="MS:1000576" name="no compression" value="" />
 			<cvParam cvRef="MS" accession="MS:1000515" name="intensity array" value="" unitCvRef="MS" unitAccession="MS:1000131" unitName="number of counts" />
 			<cvParam cvRef="IMS" accession="IMS:1000101" name="external data" value="true" />
-			<cvParam cvRef="MS" accession="MS:1000521" name="32-bit float" value="32-bit float" />
+			<cvParam cvRef="MS" accession="MS:1000521" name="32-bit float" value="" />
 		</referenceableParamGroup>
 	</referenceableParamGroupList>
 	<sampleList count="1">
@@ -43,7 +42,7 @@
 		</sample>
 	</sampleList>
 	<softwareList count="1">
-		<software id="Cardinal" version="1.12.1">
+		<software id="Cardinal" version="2.4.0">
 			<cvParam cvRef="MS" accession="MS:1000799" name="custom unreleased software tool" value="" />
 		</software>
 	</softwareList>
@@ -51,10 +50,16 @@
 		<scanSettings id="scansettings1">
 			<cvParam cvRef="IMS" accession="IMS:1000042" name="max count of pixel x" value="3" />
 			<cvParam cvRef="IMS" accession="IMS:1000043" name="max count of pixel y" value="3" />
+			<cvParam cvRef="IMS" accession="IMS:1000044" name="max dimension x" value="3" />
+			<cvParam cvRef="IMS" accession="IMS:1000045" name="max dimension y" value="3" />
+			<cvParam cvRef="IMS" accession="IMS:1000046" name="pixel size x" value="1.000000" />
+			<cvParam cvRef="IMS" accession="IMS:1000047" name="pixel size y" value="1.000000" />
 		</scanSettings>
 	</scanSettingsList>
 	<instrumentConfigurationList count="1">
-		<instrumentConfiguration id="IC1" />
+		<instrumentConfiguration id="IC1">
+			<cvParam cvRef="MS" accession="MS:1000031" name="instrument model" />
+		</instrumentConfiguration>
 	</instrumentConfigurationList>
 	<dataProcessingList count="1">
 		<dataProcessing id="CardinalWriteImzML">
@@ -73,6 +78,8 @@
 						<referenceableParamGroupRef ref="scan1" />
 						<cvParam cvRef="IMS" accession="IMS:1000050" name="position x" value="1" />
 						<cvParam cvRef="IMS" accession="IMS:1000051" name="position y" value="1" />
+						<userParam name="3DPositionX" value="1.000000" />
+						<userParam name="3DPositionY" value="1.000000" />
 					</scan>
 				</scanList>
 				<binaryDataArrayList count="2">
@@ -100,6 +107,8 @@
 						<referenceableParamGroupRef ref="scan1" />
 						<cvParam cvRef="IMS" accession="IMS:1000050" name="position x" value="2" />
 						<cvParam cvRef="IMS" accession="IMS:1000051" name="position y" value="1" />
+						<userParam name="3DPositionX" value="2.000000" />
+						<userParam name="3DPositionY" value="1.000000" />
 					</scan>
 				</scanList>
 				<binaryDataArrayList count="2">
@@ -127,6 +136,8 @@
 						<referenceableParamGroupRef ref="scan1" />
 						<cvParam cvRef="IMS" accession="IMS:1000050" name="position x" value="3" />
 						<cvParam cvRef="IMS" accession="IMS:1000051" name="position y" value="1" />
+						<userParam name="3DPositionX" value="3.000000" />
+						<userParam name="3DPositionY" value="1.000000" />
 					</scan>
 				</scanList>
 				<binaryDataArrayList count="2">
@@ -154,6 +165,8 @@
 						<referenceableParamGroupRef ref="scan1" />
 						<cvParam cvRef="IMS" accession="IMS:1000050" name="position x" value="1" />
 						<cvParam cvRef="IMS" accession="IMS:1000051" name="position y" value="2" />
+						<userParam name="3DPositionX" value="1.000000" />
+						<userParam name="3DPositionY" value="2.000000" />
 					</scan>
 				</scanList>
 				<binaryDataArrayList count="2">
@@ -181,6 +194,8 @@
 						<referenceableParamGroupRef ref="scan1" />
 						<cvParam cvRef="IMS" accession="IMS:1000050" name="position x" value="2" />
 						<cvParam cvRef="IMS" accession="IMS:1000051" name="position y" value="2" />
+						<userParam name="3DPositionX" value="2.000000" />
+						<userParam name="3DPositionY" value="2.000000" />
 					</scan>
 				</scanList>
 				<binaryDataArrayList count="2">
@@ -208,6 +223,8 @@
 						<referenceableParamGroupRef ref="scan1" />
 						<cvParam cvRef="IMS" accession="IMS:1000050" name="position x" value="3" />
 						<cvParam cvRef="IMS" accession="IMS:1000051" name="position y" value="2" />
+						<userParam name="3DPositionX" value="3.000000" />
+						<userParam name="3DPositionY" value="2.000000" />
 					</scan>
 				</scanList>
 				<binaryDataArrayList count="2">
@@ -235,6 +252,8 @@
 						<referenceableParamGroupRef ref="scan1" />
 						<cvParam cvRef="IMS" accession="IMS:1000050" name="position x" value="1" />
 						<cvParam cvRef="IMS" accession="IMS:1000051" name="position y" value="3" />
+						<userParam name="3DPositionX" value="1.000000" />
+						<userParam name="3DPositionY" value="3.000000" />
 					</scan>
 				</scanList>
 				<binaryDataArrayList count="2">
@@ -262,6 +281,8 @@
 						<referenceableParamGroupRef ref="scan1" />
 						<cvParam cvRef="IMS" accession="IMS:1000050" name="position x" value="2" />
 						<cvParam cvRef="IMS" accession="IMS:1000051" name="position y" value="3" />
+						<userParam name="3DPositionX" value="2.000000" />
+						<userParam name="3DPositionY" value="3.000000" />
 					</scan>
 				</scanList>
 				<binaryDataArrayList count="2">
@@ -289,6 +310,8 @@
 						<referenceableParamGroupRef ref="scan1" />
 						<cvParam cvRef="IMS" accession="IMS:1000050" name="position x" value="3" />
 						<cvParam cvRef="IMS" accession="IMS:1000051" name="position y" value="3" />
+						<userParam name="3DPositionX" value="3.000000" />
+						<userParam name="3DPositionY" value="3.000000" />
 					</scan>
 				</scanList>
 				<binaryDataArrayList count="2">