added boutiques descriptors

[CreaPhase.git] / SimuPBI_circle_func.m

diff --git a/SimuPBI_circle_func.m b/SimuPBI_circle_func.m
index 2ddcbfb480e5547df6442f0e7c5b734761c1a004..9a85607c08b23e00e9d62b92646fec3befb4618b 100644 (file)
--- a/SimuPBI_circle_func.m
+++ b/SimuPBI_circle_func.m
@@ -20,14 +20,16 @@
 ## Created: 2016-02-11
 
 ## Example of use :
-## SimuPBI_circle_func('Analytical', 2, 'test', [0 0.1 0.5], 19, 2.7, 300, 180, 1, 1, 0.89, 8.265*10^-7, 100, 500, [200 250], '', 'gaussian', 35)
+## SimuPBI_circle_func('Analytical', 2, 'test', [0 0.1 0.5], 19, 2.7, 300, 180, 1, 1, 0.89, 8.265, 100, 500, [200 250], '', 'gaussian', 35)
 
 ## Please note that dir_out, noise_type, noise_amount are optional arguments.
 
 function [] = SimuPBI_circle_func(vers, oversamp, basename_output, dist, energy, ps, nbProj, range_angle, model_ctf, model_Fresnel, mu_mat, delta_mat, R_circle, size_image, circle_center, dir_out, noise_type, noise_amount)
 
-addpath('/users/lweber/Matlab/SimulationsPBI/CreaPhase/utilities_ESRF')
-addpath('/users/lweber/Matlab/SimulationsPBI/CreaPhase/utilities_LW')
+addpath('utilities_ESRF')
+addpath('utilities_LW')
+addpath('octave_packages/image-1.0.15')
+addpath('octave_packages/signal-1.1.3')
 
 ################################################
 ############### INPUT parameters ############### 
@@ -76,7 +78,7 @@ addpath('/users/lweber/Matlab/SimulationsPBI/CreaPhase/utilities_LW')
 
 ## material of the circle (here, PET at 19 keV)
 %mu_mat=0.89889 % (in cm-1); 
-%delta_mat=8.265*10^-7;
+%delta_mat=8.265; (in 10^-7)
 
 ## size and coordinates
 %R_circle=50; % radius of the circle
@@ -160,6 +162,7 @@ end
 
 % absorption and phase parameter 
 mu_mat=mu_mat*100; % in m-1 , to be consistant with lambda!!
+delta_mat=delta_mat*10^-7;
 beta_mat=lambda*mu_mat/(4*pi);
 
 %% Cartes 2D d'attenuation et d/b