# HG changeset patch
# User galaxyp
# Date 1613760896 0
# Node ID 5f066029763e551312647293dc702f57a14d0cf5
# Parent  e215f71d7983d554f102ba9cacfbc88d2ddc13c3
"planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/cardinal commit fd234f7532b34a1b6ced0d3ac53a8f42348e23f7-dirty"

diff -r e215f71d7983 -r 5f066029763e combine.xml
--- a/combine.xml	Wed Dec 23 22:15:48 2020 +0000
+++ b/combine.xml	Fri Feb 19 18:54:56 2021 +0000
@@ -1,4 +1,4 @@
-<tool id="cardinal_combine" name="MSI combine" version="@VERSION@.0">
+<tool id="cardinal_combine" name="MSI combine" version="@VERSION@.1">
     <description>
         combine several mass spectrometry imaging datasets into one
     </description>
@@ -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'