Merge branch 'master' of github.com:schmiedc/snakemake-workflows into threadbug

175909f0 · Christopher Schmied · c6c2c5dd · 497b2d11 · 175909f0 · 175909f0
Commit 175909f0 authored 9 years ago by Christopher Schmied
--- a/spim_registration/timelapse/Snakefile
+++ b/spim_registration/timelapse/Snakefile
--- a/spim_registration/timelapse/cluster.json
+++ b/spim_registration/timelapse/cluster.json
--- a/spim_registration/timelapse/deconvolution.bsh
+++ b/spim_registration/timelapse/deconvolution.bsh
--- a/spim_registration/timelapse/define_czi.bsh
+++ b/spim_registration/timelapse/define_czi.bsh
--- a/spim_registration/timelapse/define_output.bsh
+++ b/spim_registration/timelapse/define_output.bsh
--- a/spim_registration/timelapse/define_tif_zip.bsh
+++ b/spim_registration/timelapse/define_tif_zip.bsh
--- a/spim_registration/timelapse/dual_OneChannel.yaml
+++ b/spim_registration/timelapse/dual_OneChannel.yaml
--- a/spim_registration/timelapse/dublicate_transformations.bsh
+++ b/spim_registration/timelapse/dublicate_transformations.bsh
--- a/spim_registration/timelapse/export.bsh
+++ b/spim_registration/timelapse/export.bsh
--- a/spim_registration/timelapse/export_output.bsh
+++ b/spim_registration/timelapse/export_output.bsh
--- a/spim_registration/timelapse/fusion.bsh
+++ b/spim_registration/timelapse/fusion.bsh
--- a/spim_registration/timelapse/single_test.yaml
+++ b/spim_registration/timelapse/single_test.yaml
--- a/spim_registration/timelapse/timelapse_registration.bsh
+++ b/spim_registration/timelapse/timelapse_registration.bsh
--- a/spim_registration/timelapse/tomancak_test_cluster.yaml
+++ b/spim_registration/timelapse/tomancak_test_cluster.yaml
--- a/spim_registration/timelapse/transform.bsh
+++ b/spim_registration/timelapse/transform.bsh
--- a/spim_registration/timelapse/xml_merge.bsh
+++ b/spim_registration/timelapse/xml_merge.bsh