--- a/tomo_setup.xml	Wed Apr 06 19:48:22 2022 +0000
+++ b/tomo_setup.xml	Thu Apr 07 21:09:58 2022 +0000
@@ -1,9 +1,9 @@
 <tool id="tomo_setup" name="Tomo Setup" version="0.1.1" python_template_version="3.9">
     <description>Preprocess tomography images</description>
-    <requirements>
-        <requirement type="package" version="1.11.0">tomopy</requirement>
-        <requirement type="package" version="3.6.0">h5py</requirement>
-    </requirements>
+    <macros>
+        <import>tomo_macros.xml</import>
+    </macros>
+    <expand macro="requirements" />
     <command detect_errors="exit_code"><![CDATA[
         cp '$inputfiles' inputfiles.txt &&
         $__tool_directory__/tomo_setup.py
@@ -29,7 +29,7 @@
 ]]></configfile>
     </configfiles>
     <inputs>
-        <param name="config" type='data' format='yaml' optional='false' label="Input config"/>
+        <expand macro="common_inputs"/>
         <section name="thetas" title="Tomography angles">
             <param name="theta_start" type="float" min="0.0" max="360.0" value="0.0" label="Lower bound"/>
             <param name="theta_end" type="float" min="0.0" max="360.0" value="0.0" label="Upper bound"/>
@@ -42,25 +42,16 @@
         </repeat>
     </inputs>
     <outputs>
+        <expand macro="common_outputs"/>
         <data name="inputfiles" format="txt" label="Input files" from_work_dir="inputfiles.txt" hidden="true"/>
         <data name="dark_field" format="png" label="Dark field" from_work_dir="dark_field.png"/>
         <data name="bright_field" format="png" label="Bright field" from_work_dir="bright_field.png"/>
         <data name="tomo" format="png" label="First tomography image" from_work_dir="tomo.png"/>
         <data name="detectorbounds" format="png" label="Detector bounds" from_work_dir="detectorbounds.png"/>
         <data name="output_data" format="npz" label="Preprocessed tomography data" from_work_dir="output_data.npz"/>
-        <data name="output_config" format="yaml" label="Output config" from_work_dir="output_config.yaml"/>
-        <data name="log" format="txt" label="Log"/>
     </outputs>
     <help><![CDATA[
         Preprocess tomography images.
     ]]></help>
-    <citations>
-        <citation type="bibtex">
-@misc{githubsum_files,
-  author = {Verberg, Rolf},
-  year = {2022},
-  title = {Tomo Setup},
-}</citation>
-    </citations>
-
+    <expand macro="citations"/>
 </tool>