Skip to content
Snippets Groups Projects
Commit 7c52fdd9 authored by Christopher Schmied's avatar Christopher Schmied
Browse files

Fixed bugs in deconvolution.bsh

compute_on is not present in Snakefile

compute_on, directory_cuda and cudafourierconvolution System.getProperty
now correct
parent 3dadc725
No related branches found
No related tags found
No related merge requests found
...@@ -386,6 +386,7 @@ rule deconvolution: ...@@ -386,6 +386,7 @@ rule deconvolution:
-Dosem_acceleration={osem_acceleration} \ -Dosem_acceleration={osem_acceleration} \
-DTikhonov_parameter={Tikhonov_parameter} \ -DTikhonov_parameter={Tikhonov_parameter} \
-Dcompute={compute} \ -Dcompute={compute} \
-Dcompute_on={compute_on} \
-Dcudafourierconvolution={cudafourierconvolution} \ -Dcudafourierconvolution={cudafourierconvolution} \
-Dpsf_estimation={psf_estimation} \ -Dpsf_estimation={psf_estimation} \
-Ddirectory_cuda={directory_cuda} \ -Ddirectory_cuda={directory_cuda} \
......
...@@ -122,9 +122,9 @@ System.out.println( channel_string ); ...@@ -122,9 +122,9 @@ System.out.println( channel_string );
System.out.println( "-------------------------------------------------------" ); System.out.println( "-------------------------------------------------------" );
System.out.println( "GPU/CPU setting: " ); System.out.println( "GPU/CPU setting: " );
compute_on = System.getProperty( "compute_on = " + compute_on ); compute_on = System.getProperty( "compute_on" );
directory_cuda = System.getProperty( "directory_cuda = " + directory_cuda ); directory_cuda = System.getProperty( "directory_cuda" );
System.getProperty( "cudafourierconvolution = " + cudafourierconvolution ); cudafourierconvolution = System.getProperty( "cudafourierconvolution" );
System.out.println( "compute_on = " + compute_on ); System.out.println( "compute_on = " + compute_on );
System.out.println( "directory_cuda = " + directory_cuda ); System.out.println( "directory_cuda = " + directory_cuda );
......
common: { common: {
# directory that contains the bean shell scripts # directory that contains the bean shell scripts
bsh_directory: "/projects/pilot_spim/Christopher/snakemake-workflows/spim_registration/timelapse/", bsh_directory: "/projects/pilot_spim/Christopher/snakemake-workflows/spim_registration/timelapse/",
directory_cuda: "/sw/users/schmied/packages/cuda/lib/", directory_cuda: "/sw/users/schmied/cuda/",
#fiji-app: "/sw/users/schmied/packages/2015-06-08_Fiji.app.cuda/ImageJ-linux64", #fiji-app: "/sw/users/schmied/packages/2015-06-08_Fiji.app.cuda/ImageJ-linux64",
fiji-app: "/sw/users/schmied/packages/2015-05-29_Fiji_2.3.9_SNAP.app.cuda/ImageJ-linux64", fiji-app: "/sw/users/schmied/packages/2015-05-29_Fiji_2.3.9_SNAP.app.cuda/ImageJ-linux64",
fiji-prefix: "/sw/bin/xvfb-run -a", fiji-prefix: "/sw/bin/xvfb-run -a",
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment