Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
snakemake-workflows
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
FIJI
snakemake-workflows
Commits
b37103c7
Commit
b37103c7
authored
9 years ago
by
Christopher Schmied
Browse files
Options
Downloads
Patches
Plain Diff
Modified output of GPU/CPU setting in deconvolution.bsh
parent
445b4be3
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
spim_registration/timelapse/deconvolution.bsh
+34
-1
34 additions, 1 deletion
spim_registration/timelapse/deconvolution.bsh
with
34 additions
and
1 deletion
spim_registration/timelapse/deconvolution.bsh
100644 → 100755
+
34
−
1
View file @
b37103c7
...
@@ -140,6 +140,7 @@ if (compute_on.equalsIgnoreCase( "GPU (Nvidia CUDA via JNA)" ) )
...
@@ -140,6 +140,7 @@ if (compute_on.equalsIgnoreCase( "GPU (Nvidia CUDA via JNA)" ) )
cuda_settings = "cuda_directory=" + directory_cuda + " " +
cuda_settings = "cuda_directory=" + directory_cuda + " " +
"select_native_library_for_cudafourierconvolution=" + cudafourierconvolution + " " +
"select_native_library_for_cudafourierconvolution=" + cudafourierconvolution + " " +
"gpu_1 ";
"gpu_1 ";
System.out.println( "cuda_settings=" + cuda_settings );
}
}
else if (compute_on.equalsIgnoreCase( "CPU (Java)" ) )
else if (compute_on.equalsIgnoreCase( "CPU (Java)" ) )
...
@@ -155,11 +156,43 @@ else
...
@@ -155,11 +156,43 @@ else
}
}
System.out.println( "compute_string=" + compute_string );
System.out.println( "compute_string=" + compute_string );
System.out.println( "cuda_settings=" + cuda_settings );
// Execute Fiji Plugin
// Execute Fiji Plugin
System.out.println( "=======================================================" );
System.out.println( "=======================================================" );
System.out.println( "Starting Deconvolution" );
System.out.println( "Starting Deconvolution" );
System.out.println("Fuse/Deconvolve Dataset select_xml=" + image_file_directory + merged_xml + " " +
"process_angle=[All angles] " +
"process_channel=[All channels] " +
"process_illumination=[All illuminations] " +
"process_timepoint=[" + process_timepoint + "] " +
"processing_timepoint=[Timepoint " + parallel_timepoints + "] " +
"type_of_image_fusion=[Multi-view deconvolution] " +
"bounding_box=[Define manually] " +
"fused_image=[Save as TIFF stack] " +
"minimal_x=" + minimal_x_deco + " " +
"minimal_y=" + minimal_y_deco + " " +
"minimal_z=" + minimal_z_deco + " " +
"maximal_x=" + maximal_x_deco + " " +
"maximal_y=" + maximal_y_deco + " " +
"maximal_z=" + maximal_z_deco + " " +
"imglib2_container=" + imglib2_container_deco + " " +
"type_of_iteration=[" + type_of_iteration + "] " +
"osem_acceleration=[" + osem_acceleration + "] " +
"number_of_iterations=" + iterations + " " +
// "adjust_blending_parameters " +
"use_tikhonov_regularization " +
"tikhonov_parameter=" + Tikhonov_parameter + " " +
"compute=[" + compute + "] " +
compute_string +
"psf_estimation=[" + psf_estimation + "] " +
"psf_display=[Do not show PSFs] " +
"output_file_directory=" + deco_output_file_directory + " " +
cuda_settings +
channel_string +
"psf_size_x=" + psf_size_x + " " +
"psf_size_y=" + psf_size_y + " " +
"psf_size_z=" + psf_size_z + "");
try {
try {
IJ.run("Fuse/Deconvolve Dataset",
IJ.run("Fuse/Deconvolve Dataset",
"select_xml=" + image_file_directory + merged_xml + " " +
"select_xml=" + image_file_directory + merged_xml + " " +
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment