# HG changeset patch # User galaxyp # Date 1620381035 0 # Node ID d64858cd48c600d0d10c1045103579a2372385ea # Parent 11d9b3ebbabdfca4ec08624a2e814775208ab731 "planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/cardinal commit 888b3e991d0752b694bf480531ce0e5318c2f337-dirty" diff -r 11d9b3ebbabd -r d64858cd48c6 combine.xml --- a/combine.xml Tue Nov 03 22:22:18 2020 +0000 +++ b/combine.xml Fri May 07 09:50:35 2021 +0000 @@ -1,4 +1,4 @@ - + combine several mass spectrometry imaging datasets into one @@ -120,6 +120,11 @@ ## same name for MSI data files necessary to combine data into one single coordinate system run(msidata_$i) = "msidata" + ## remove z dimension and 3D information in pixelData to allow combining datasets with and without z dimension + coord(msidata_${i})\$z <- NULL + pData(msidata_${i})\$'3DPositionX' <- NULL + pData(msidata_${i})\$'3DPositionY' <- NULL + ############ 3) Read and process annotation tabular files ###################### #if str($annotation_cond.annotation_tabular) == 'annotation' diff -r 11d9b3ebbabd -r d64858cd48c6 test-data/Heatmaps_LM8_file16.pdf Binary file test-data/Heatmaps_LM8_file16.pdf has changed diff -r 11d9b3ebbabd -r d64858cd48c6 test-data/Heatmaps_analyze75.pdf Binary file test-data/Heatmaps_analyze75.pdf has changed diff -r 11d9b3ebbabd -r d64858cd48c6 test-data/Heatmaps_imzml.pdf Binary file test-data/Heatmaps_imzml.pdf has changed diff -r 11d9b3ebbabd -r d64858cd48c6 test-data/Heatmaps_processed.pdf Binary file test-data/Heatmaps_processed.pdf has changed diff -r 11d9b3ebbabd -r d64858cd48c6 test-data/Heatmaps_rdata.pdf Binary file test-data/Heatmaps_rdata.pdf has changed diff -r 11d9b3ebbabd -r d64858cd48c6 test-data/Plot_analyze75.pdf Binary file test-data/Plot_analyze75.pdf has changed diff -r 11d9b3ebbabd -r d64858cd48c6 test-data/Plot_analyze75_allpixels.pdf Binary file test-data/Plot_analyze75_allpixels.pdf has changed diff -r 11d9b3ebbabd -r d64858cd48c6 test-data/Plot_imzml.pdf Binary file test-data/Plot_imzml.pdf has changed diff -r 11d9b3ebbabd -r d64858cd48c6 test-data/Plot_picked.pdf Binary file test-data/Plot_picked.pdf has changed diff -r 11d9b3ebbabd -r d64858cd48c6 test-data/Plot_processed.pdf Binary file test-data/Plot_processed.pdf has changed diff -r 11d9b3ebbabd -r d64858cd48c6 test-data/Plot_rdata.pdf Binary file test-data/Plot_rdata.pdf has changed diff -r 11d9b3ebbabd -r d64858cd48c6 test-data/centroids_proc.pdf Binary file test-data/centroids_proc.pdf has changed diff -r 11d9b3ebbabd -r d64858cd48c6 test-data/pixels_test6.tabular --- a/test-data/pixels_test6.tabular Tue Nov 03 22:22:18 2020 +0000 +++ b/test-data/pixels_test6.tabular Fri May 07 09:50:35 2021 +0000 @@ -1,25 +1,25 @@ -pixel names x y predicted condition -xy_1_1 1 1 A -xy_2_1 2 1 A -xy_3_1 3 1 B -xy_4_1 4 1 C -xy_1_2 1 2 C -xy_2_2 2 2 C -xy_3_2 3 2 A -xy_4_2 4 2 A -xy_1_3 1 3 A -xy_2_3 2 3 B -xy_3_3 3 3 C -xy_4_3 4 3 A -xy_10_1 10 1 C -xy_11_1 11 1 C -xy_12_1 12 1 C -xy_13_1 13 1 B -xy_10_2 10 2 C -xy_11_2 11 2 B -xy_12_2 12 2 C -xy_13_2 13 2 C -xy_10_3 10 3 C -xy_11_3 11 3 C -xy_12_3 12 3 B -xy_13_3 13 3 C +pixel names x y predicted condition A B C +xy_1_1 1 1 A 0.434439526064797 0.195646317191818 0.369914156743386 +xy_2_1 2 1 A 0.38219998209377 0.242372158141275 0.375427859764956 +xy_3_1 3 1 B 0.312531499299517 0.385612104162858 0.301856396537625 +xy_4_1 4 1 C 0.393153488582866 0.191107087820634 0.4157394235965 +xy_1_2 1 2 C 0.366986470447772 0.216121568441093 0.416891961111135 +xy_2_2 2 2 C 0.381682206547616 0.213188918797062 0.405128874655322 +xy_3_2 3 2 A 0.376695037169723 0.260689491088564 0.362615471741713 +xy_4_2 4 2 A 0.42305935188829 0.174038449100755 0.402902199010954 +xy_1_3 1 3 A 0.382420991383021 0.249364697048677 0.368214311568302 +xy_2_3 2 3 B 0.272145998315727 0.446525938567718 0.281328063116555 +xy_3_3 3 3 C 0.36296987427851 0.255631013944556 0.381399111776934 +xy_4_3 4 3 A 0.444812272103175 0.132274264153212 0.422913463743613 +xy_10_1 10 1 C 0.376216993893763 0.227584528606788 0.39619847749945 +xy_11_1 11 1 C 0.358430578177403 0.236120068794936 0.405449353027661 +xy_12_1 12 1 C 0.359751662628136 0.218620985552221 0.421627351819643 +xy_13_1 13 1 B 0.101486342705225 0.813997511218961 0.0845161460758142 +xy_10_2 10 2 C 0.354612526523361 0.272635192773437 0.372752280703202 +xy_11_2 11 2 B 0.291635599769993 0.444466545540823 0.263897854689184 +xy_12_2 12 2 C 0.36763798979782 0.203911653614431 0.428450356587749 +xy_13_2 13 2 C 0.344608135177236 0.304026642707691 0.351365222115073 +xy_10_3 10 3 C 0.37046458150651 0.205561286708086 0.423974131785404 +xy_11_3 11 3 C 0.358113833435286 0.262878459144526 0.379007707420187 +xy_12_3 12 3 B 0.180921926305915 0.66902588624642 0.150052187447665 +xy_13_3 13 3 C 0.378266307042675 0.20859472985319 0.413138963104135 diff -r 11d9b3ebbabd -r d64858cd48c6 test-data/preprocessing_results1.ibd Binary file test-data/preprocessing_results1.ibd has changed diff -r 11d9b3ebbabd -r d64858cd48c6 test-data/preprocessing_results1.imzml --- a/test-data/preprocessing_results1.imzml Tue Nov 03 22:22:18 2020 +0000 +++ b/test-data/preprocessing_results1.imzml Fri May 07 09:50:35 2021 +0000 @@ -9,8 +9,8 @@ - - + + @@ -86,15 +86,15 @@ - - + + - - - + + + @@ -115,15 +115,15 @@ - - + + - - - + + + @@ -144,15 +144,15 @@ - - + + - - - + + + @@ -173,15 +173,15 @@ - - + + - - - + + + @@ -202,15 +202,15 @@ - - + + - - - + + + @@ -231,15 +231,15 @@ - - + + - - - + + + @@ -260,15 +260,15 @@ - - + + - - - + + + @@ -289,15 +289,15 @@ - - + + - - - + + + @@ -318,15 +318,15 @@ - - + + - - - + + + diff -r 11d9b3ebbabd -r d64858cd48c6 test-data/preprocessing_results1.imzml.txt --- a/test-data/preprocessing_results1.imzml.txt Tue Nov 03 22:22:18 2020 +0000 +++ b/test-data/preprocessing_results1.imzml.txt Fri May 07 09:50:35 2021 +0000 @@ -1,4 +1,4 @@ imzML file: total 24 --rw-rw-r-- 1 meli meli 216 Oct 5 19:57 ibd --rw-rw-r-- 1 meli meli 18090 Oct 5 19:57 imzml +-rw-rw-r-- 1 meli meli 336 Nov 29 01:14 ibd +-rw-rw-r-- 1 meli meli 18092 Nov 29 01:14 imzml diff -r 11d9b3ebbabd -r d64858cd48c6 test-data/preprocessing_results1.pdf Binary file test-data/preprocessing_results1.pdf has changed diff -r 11d9b3ebbabd -r d64858cd48c6 test-data/preprocessing_results2.ibd Binary file test-data/preprocessing_results2.ibd has changed diff -r 11d9b3ebbabd -r d64858cd48c6 test-data/preprocessing_results2.imzml --- a/test-data/preprocessing_results2.imzml Tue Nov 03 22:22:18 2020 +0000 +++ b/test-data/preprocessing_results2.imzml Fri May 07 09:50:35 2021 +0000 @@ -9,8 +9,8 @@ - - + + diff -r 11d9b3ebbabd -r d64858cd48c6 test-data/preprocessing_results2.imzml.txt --- a/test-data/preprocessing_results2.imzml.txt Tue Nov 03 22:22:18 2020 +0000 +++ b/test-data/preprocessing_results2.imzml.txt Fri May 07 09:50:35 2021 +0000 @@ -1,4 +1,4 @@ imzML file: total 64 --rw-rw-r-- 1 meli meli 37404 Oct 5 19:57 ibd --rw-rw-r-- 1 meli meli 22796 Oct 5 19:57 imzml +-rw-rw-r-- 1 meli meli 37404 Nov 29 18:03 ibd +-rw-rw-r-- 1 meli meli 22796 Nov 29 18:03 imzml diff -r 11d9b3ebbabd -r d64858cd48c6 test-data/preprocessing_results2.pdf Binary file test-data/preprocessing_results2.pdf has changed diff -r 11d9b3ebbabd -r d64858cd48c6 test-data/preprocessing_results3.ibd Binary file test-data/preprocessing_results3.ibd has changed diff -r 11d9b3ebbabd -r d64858cd48c6 test-data/preprocessing_results3.imzml --- a/test-data/preprocessing_results3.imzml Tue Nov 03 22:22:18 2020 +0000 +++ b/test-data/preprocessing_results3.imzml Fri May 07 09:50:35 2021 +0000 @@ -9,9 +9,9 @@ - - - + + + @@ -86,15 +86,15 @@ - - + + - - - + + + @@ -114,16 +114,16 @@ - - - + + + - - - + + + @@ -143,16 +143,16 @@ - - - + + + - - - + + + @@ -172,16 +172,16 @@ - - - + + + - - - + + + @@ -201,16 +201,16 @@ - - - + + + - - - + + + @@ -230,16 +230,16 @@ - - - + + + - - - + + + @@ -259,16 +259,16 @@ - - - + + + - - - + + + @@ -288,16 +288,16 @@ - - - + + + - - - + + + @@ -317,16 +317,16 @@ - - - + + + - - - + + + diff -r 11d9b3ebbabd -r d64858cd48c6 test-data/preprocessing_results3.imzml.txt --- a/test-data/preprocessing_results3.imzml.txt Tue Nov 03 22:22:18 2020 +0000 +++ b/test-data/preprocessing_results3.imzml.txt Fri May 07 09:50:35 2021 +0000 @@ -1,4 +1,4 @@ imzML file: total 24 --rw-rw-r-- 1 meli meli 960 Oct 5 19:58 ibd --rw-rw-r-- 1 meli meli 18112 Oct 5 19:58 imzml +-rw-rw-r-- 1 meli meli 1456 Nov 29 18:04 ibd +-rw-rw-r-- 1 meli meli 18133 Nov 29 18:04 imzml diff -r 11d9b3ebbabd -r d64858cd48c6 test-data/preprocessing_results3.pdf Binary file test-data/preprocessing_results3.pdf has changed diff -r 11d9b3ebbabd -r d64858cd48c6 test-data/test6.pdf Binary file test-data/test6.pdf has changed diff -r 11d9b3ebbabd -r d64858cd48c6 test-data/test6.rdata Binary file test-data/test6.rdata has changed