From 3e9d3f3a9b50e4cc5575c3b6e1cbcfe3e627afb6 Mon Sep 17 00:00:00 2001 From: Peter Willendrup Date: Tue, 13 Feb 2024 16:08:32 +0100 Subject: [PATCH] Minor fix to the McXtrace sasmodels generator: There should be no "theta" var in TRACE, defined elsewhere. --- mcxtrace-comps/sasmodels-generator/sasmodels2mcxtrace.py | 2 +- mcxtrace-comps/sasmodels/SasView_adsorbed_layer.comp | 2 +- mcxtrace-comps/sasmodels/SasView_barbell.comp | 2 +- mcxtrace-comps/sasmodels/SasView_barbell_aniso.comp | 2 +- mcxtrace-comps/sasmodels/SasView_bcc_paracrystal.comp | 2 +- mcxtrace-comps/sasmodels/SasView_bcc_paracrystal_aniso.comp | 2 +- mcxtrace-comps/sasmodels/SasView_binary_hard_sphere.comp | 2 +- mcxtrace-comps/sasmodels/SasView_broad_peak.comp | 2 +- mcxtrace-comps/sasmodels/SasView_capped_cylinder.comp | 2 +- mcxtrace-comps/sasmodels/SasView_capped_cylinder_aniso.comp | 2 +- mcxtrace-comps/sasmodels/SasView_core_multi_shell.comp | 2 +- mcxtrace-comps/sasmodels/SasView_core_shell_bicelle.comp | 2 +- .../sasmodels/SasView_core_shell_bicelle_aniso.comp | 2 +- .../sasmodels/SasView_core_shell_bicelle_elliptical.comp | 2 +- .../SasView_core_shell_bicelle_elliptical_aniso.comp | 2 +- .../SasView_core_shell_bicelle_elliptical_belt_rough.comp | 2 +- ...sView_core_shell_bicelle_elliptical_belt_rough_aniso.comp | 2 +- mcxtrace-comps/sasmodels/SasView_core_shell_cylinder.comp | 2 +- .../sasmodels/SasView_core_shell_cylinder_aniso.comp | 2 +- mcxtrace-comps/sasmodels/SasView_core_shell_ellipsoid.comp | 2 +- .../sasmodels/SasView_core_shell_ellipsoid_aniso.comp | 2 +- .../sasmodels/SasView_core_shell_parallelepiped.comp | 2 +- .../sasmodels/SasView_core_shell_parallelepiped_aniso.comp | 2 +- mcxtrace-comps/sasmodels/SasView_core_shell_sphere.comp | 2 +- mcxtrace-comps/sasmodels/SasView_correlation_length.comp | 2 +- mcxtrace-comps/sasmodels/SasView_cylinder.comp | 2 +- mcxtrace-comps/sasmodels/SasView_cylinder_aniso.comp | 2 +- mcxtrace-comps/sasmodels/SasView_dab.comp | 2 +- mcxtrace-comps/sasmodels/SasView_ellipsoid.comp | 2 +- mcxtrace-comps/sasmodels/SasView_ellipsoid_aniso.comp | 2 +- mcxtrace-comps/sasmodels/SasView_elliptical_cylinder.comp | 2 +- .../sasmodels/SasView_elliptical_cylinder_aniso.comp | 2 +- mcxtrace-comps/sasmodels/SasView_fcc_paracrystal.comp | 2 +- mcxtrace-comps/sasmodels/SasView_fcc_paracrystal_aniso.comp | 2 +- mcxtrace-comps/sasmodels/SasView_flexible_cylinder.comp | 2 +- .../sasmodels/SasView_flexible_cylinder_elliptical.comp | 2 +- mcxtrace-comps/sasmodels/SasView_fractal.comp | 5 +---- mcxtrace-comps/sasmodels/SasView_fractal_core_shell.comp | 5 +---- mcxtrace-comps/sasmodels/SasView_fuzzy_sphere.comp | 2 +- mcxtrace-comps/sasmodels/SasView_gauss_lorentz_gel.comp | 2 +- mcxtrace-comps/sasmodels/SasView_gaussian_peak.comp | 2 +- mcxtrace-comps/sasmodels/SasView_gel_fit.comp | 2 +- mcxtrace-comps/sasmodels/SasView_guinier.comp | 2 +- mcxtrace-comps/sasmodels/SasView_guinier_porod.comp | 2 +- mcxtrace-comps/sasmodels/SasView_hardsphere.comp | 2 +- mcxtrace-comps/sasmodels/SasView_hayter_msa.comp | 2 +- mcxtrace-comps/sasmodels/SasView_hollow_cylinder.comp | 2 +- mcxtrace-comps/sasmodels/SasView_hollow_cylinder_aniso.comp | 2 +- .../sasmodels/SasView_hollow_rectangular_prism.comp | 2 +- .../sasmodels/SasView_hollow_rectangular_prism_aniso.comp | 2 +- .../SasView_hollow_rectangular_prism_thin_walls.comp | 2 +- mcxtrace-comps/sasmodels/SasView_lamellar_hg.comp | 2 +- .../sasmodels/SasView_lamellar_hg_stack_caille.comp | 2 +- mcxtrace-comps/sasmodels/SasView_lamellar_stack_caille.comp | 2 +- .../sasmodels/SasView_lamellar_stack_paracrystal.comp | 2 +- mcxtrace-comps/sasmodels/SasView_line.comp | 2 +- mcxtrace-comps/sasmodels/SasView_linear_pearls.comp | 2 +- mcxtrace-comps/sasmodels/SasView_lorentz.comp | 2 +- mcxtrace-comps/sasmodels/SasView_mass_fractal.comp | 2 +- mcxtrace-comps/sasmodels/SasView_mass_surface_fractal.comp | 2 +- mcxtrace-comps/sasmodels/SasView_mono_gauss_coil.comp | 2 +- mcxtrace-comps/sasmodels/SasView_multilayer_vesicle.comp | 2 +- mcxtrace-comps/sasmodels/SasView_onion.comp | 2 +- mcxtrace-comps/sasmodels/SasView_parallelepiped.comp | 2 +- mcxtrace-comps/sasmodels/SasView_parallelepiped_aniso.comp | 2 +- mcxtrace-comps/sasmodels/SasView_peak_lorentz.comp | 2 +- mcxtrace-comps/sasmodels/SasView_pearl_necklace.comp | 2 +- mcxtrace-comps/sasmodels/SasView_poly_gauss_coil.comp | 2 +- mcxtrace-comps/sasmodels/SasView_polymer_excl_volume.comp | 2 +- mcxtrace-comps/sasmodels/SasView_polymer_micelle.comp | 2 +- mcxtrace-comps/sasmodels/SasView_porod.comp | 2 +- mcxtrace-comps/sasmodels/SasView_power_law.comp | 2 +- mcxtrace-comps/sasmodels/SasView_pringle.comp | 2 +- mcxtrace-comps/sasmodels/SasView_raspberry.comp | 2 +- .../sasmodels/SasView_rectangular_prism_aniso.comp | 2 +- mcxtrace-comps/sasmodels/SasView_rpa.comp | 2 +- mcxtrace-comps/sasmodels/SasView_sc_paracrystal.comp | 2 +- mcxtrace-comps/sasmodels/SasView_sc_paracrystal_aniso.comp | 2 +- mcxtrace-comps/sasmodels/SasView_sphere.comp | 2 +- mcxtrace-comps/sasmodels/SasView_spinodal.comp | 2 +- mcxtrace-comps/sasmodels/SasView_squarewell.comp | 2 +- mcxtrace-comps/sasmodels/SasView_stacked_disks.comp | 2 +- mcxtrace-comps/sasmodels/SasView_stacked_disks_aniso.comp | 2 +- mcxtrace-comps/sasmodels/SasView_star_polymer.comp | 2 +- mcxtrace-comps/sasmodels/SasView_stickyhardsphere.comp | 2 +- mcxtrace-comps/sasmodels/SasView_superball.comp | 2 +- mcxtrace-comps/sasmodels/SasView_superball_aniso.comp | 2 +- mcxtrace-comps/sasmodels/SasView_surface_fractal.comp | 2 +- mcxtrace-comps/sasmodels/SasView_teubner_strey.comp | 2 +- mcxtrace-comps/sasmodels/SasView_triaxial_ellipsoid.comp | 2 +- .../sasmodels/SasView_triaxial_ellipsoid_aniso.comp | 2 +- mcxtrace-comps/sasmodels/SasView_two_lorentzian.comp | 2 +- mcxtrace-comps/sasmodels/SasView_two_power_law.comp | 2 +- mcxtrace-comps/sasmodels/SasView_vesicle.comp | 2 +- 94 files changed, 94 insertions(+), 100 deletions(-) diff --git a/mcxtrace-comps/sasmodels-generator/sasmodels2mcxtrace.py b/mcxtrace-comps/sasmodels-generator/sasmodels2mcxtrace.py index 6defe02b2f..0cadf9c78c 100644 --- a/mcxtrace-comps/sasmodels-generator/sasmodels2mcxtrace.py +++ b/mcxtrace-comps/sasmodels-generator/sasmodels2mcxtrace.py @@ -574,7 +574,7 @@ def generate_indiv_files(): TRACE %{ - double l0, l1, k, l_full, l, dl, d_Phi, Theta; + double l0, l1, k, l_full, l, dl, d_Phi; double aim_x=0, aim_y=0, aim_z=1, axis_x, axis_y, axis_z; double f, solid_angle, kx_i, ky_i, kz_i, q, qx, qy, qz; char intersect=0; diff --git a/mcxtrace-comps/sasmodels/SasView_adsorbed_layer.comp b/mcxtrace-comps/sasmodels/SasView_adsorbed_layer.comp index 319ffe29d5..758deed4ec 100644 --- a/mcxtrace-comps/sasmodels/SasView_adsorbed_layer.comp +++ b/mcxtrace-comps/sasmodels/SasView_adsorbed_layer.comp @@ -174,7 +174,7 @@ if (xwidth && yheight && zdepth) TRACE %{ - double l0, l1, k, l_full, l, dl, d_Phi, theta; + double l0, l1, k, l_full, l, dl, d_Phi; double aim_x=0, aim_y=0, aim_z=1, axis_x, axis_y, axis_z; double f, solid_angle, kx_i, ky_i, kz_i, q, qx, qy, qz; char intersect=0; diff --git a/mcxtrace-comps/sasmodels/SasView_barbell.comp b/mcxtrace-comps/sasmodels/SasView_barbell.comp index a1eb326d17..5076505bcd 100644 --- a/mcxtrace-comps/sasmodels/SasView_barbell.comp +++ b/mcxtrace-comps/sasmodels/SasView_barbell.comp @@ -834,7 +834,7 @@ if (xwidth && yheight && zdepth) TRACE %{ - double l0, l1, k, l_full, l, dl, d_Phi, theta; + double l0, l1, k, l_full, l, dl, d_Phi; double aim_x=0, aim_y=0, aim_z=1, axis_x, axis_y, axis_z; double f, solid_angle, kx_i, ky_i, kz_i, q, qx, qy, qz; char intersect=0; diff --git a/mcxtrace-comps/sasmodels/SasView_barbell_aniso.comp b/mcxtrace-comps/sasmodels/SasView_barbell_aniso.comp index f2e967605c..167ea92673 100644 --- a/mcxtrace-comps/sasmodels/SasView_barbell_aniso.comp +++ b/mcxtrace-comps/sasmodels/SasView_barbell_aniso.comp @@ -840,7 +840,7 @@ if (xwidth && yheight && zdepth) TRACE %{ - double l0, l1, k, l_full, l, dl, d_Phi, theta; + double l0, l1, k, l_full, l, dl, d_Phi; double aim_x=0, aim_y=0, aim_z=1, axis_x, axis_y, axis_z; double f, solid_angle, kx_i, ky_i, kz_i, q, qx, qy, qz; char intersect=0; diff --git a/mcxtrace-comps/sasmodels/SasView_bcc_paracrystal.comp b/mcxtrace-comps/sasmodels/SasView_bcc_paracrystal.comp index 41b76688f2..ef46fefde5 100644 --- a/mcxtrace-comps/sasmodels/SasView_bcc_paracrystal.comp +++ b/mcxtrace-comps/sasmodels/SasView_bcc_paracrystal.comp @@ -692,7 +692,7 @@ if (xwidth && yheight && zdepth) TRACE %{ - double l0, l1, k, l_full, l, dl, d_Phi, theta; + double l0, l1, k, l_full, l, dl, d_Phi; double aim_x=0, aim_y=0, aim_z=1, axis_x, axis_y, axis_z; double f, solid_angle, kx_i, ky_i, kz_i, q, qx, qy, qz; char intersect=0; diff --git a/mcxtrace-comps/sasmodels/SasView_bcc_paracrystal_aniso.comp b/mcxtrace-comps/sasmodels/SasView_bcc_paracrystal_aniso.comp index 8642f0b834..ccb95999ea 100644 --- a/mcxtrace-comps/sasmodels/SasView_bcc_paracrystal_aniso.comp +++ b/mcxtrace-comps/sasmodels/SasView_bcc_paracrystal_aniso.comp @@ -701,7 +701,7 @@ if (xwidth && yheight && zdepth) TRACE %{ - double l0, l1, k, l_full, l, dl, d_Phi, theta; + double l0, l1, k, l_full, l, dl, d_Phi; double aim_x=0, aim_y=0, aim_z=1, axis_x, axis_y, axis_z; double f, solid_angle, kx_i, ky_i, kz_i, q, qx, qy, qz; char intersect=0; diff --git a/mcxtrace-comps/sasmodels/SasView_binary_hard_sphere.comp b/mcxtrace-comps/sasmodels/SasView_binary_hard_sphere.comp index 5ddb97b5b9..d5447f2215 100644 --- a/mcxtrace-comps/sasmodels/SasView_binary_hard_sphere.comp +++ b/mcxtrace-comps/sasmodels/SasView_binary_hard_sphere.comp @@ -374,7 +374,7 @@ if (xwidth && yheight && zdepth) TRACE %{ - double l0, l1, k, l_full, l, dl, d_Phi, theta; + double l0, l1, k, l_full, l, dl, d_Phi; double aim_x=0, aim_y=0, aim_z=1, axis_x, axis_y, axis_z; double f, solid_angle, kx_i, ky_i, kz_i, q, qx, qy, qz; char intersect=0; diff --git a/mcxtrace-comps/sasmodels/SasView_broad_peak.comp b/mcxtrace-comps/sasmodels/SasView_broad_peak.comp index 775376992e..e313e0c779 100644 --- a/mcxtrace-comps/sasmodels/SasView_broad_peak.comp +++ b/mcxtrace-comps/sasmodels/SasView_broad_peak.comp @@ -161,7 +161,7 @@ if (xwidth && yheight && zdepth) TRACE %{ - double l0, l1, k, l_full, l, dl, d_Phi, theta; + double l0, l1, k, l_full, l, dl, d_Phi; double aim_x=0, aim_y=0, aim_z=1, axis_x, axis_y, axis_z; double f, solid_angle, kx_i, ky_i, kz_i, q, qx, qy, qz; char intersect=0; diff --git a/mcxtrace-comps/sasmodels/SasView_capped_cylinder.comp b/mcxtrace-comps/sasmodels/SasView_capped_cylinder.comp index 7aea162ead..47af5aba18 100644 --- a/mcxtrace-comps/sasmodels/SasView_capped_cylinder.comp +++ b/mcxtrace-comps/sasmodels/SasView_capped_cylinder.comp @@ -839,7 +839,7 @@ if (xwidth && yheight && zdepth) TRACE %{ - double l0, l1, k, l_full, l, dl, d_Phi, theta; + double l0, l1, k, l_full, l, dl, d_Phi; double aim_x=0, aim_y=0, aim_z=1, axis_x, axis_y, axis_z; double f, solid_angle, kx_i, ky_i, kz_i, q, qx, qy, qz; char intersect=0; diff --git a/mcxtrace-comps/sasmodels/SasView_capped_cylinder_aniso.comp b/mcxtrace-comps/sasmodels/SasView_capped_cylinder_aniso.comp index 6a43adea9f..13613f6d44 100644 --- a/mcxtrace-comps/sasmodels/SasView_capped_cylinder_aniso.comp +++ b/mcxtrace-comps/sasmodels/SasView_capped_cylinder_aniso.comp @@ -845,7 +845,7 @@ if (xwidth && yheight && zdepth) TRACE %{ - double l0, l1, k, l_full, l, dl, d_Phi, theta; + double l0, l1, k, l_full, l, dl, d_Phi; double aim_x=0, aim_y=0, aim_z=1, axis_x, axis_y, axis_z; double f, solid_angle, kx_i, ky_i, kz_i, q, qx, qy, qz; char intersect=0; diff --git a/mcxtrace-comps/sasmodels/SasView_core_multi_shell.comp b/mcxtrace-comps/sasmodels/SasView_core_multi_shell.comp index 8eec3efcf3..b1366be545 100644 --- a/mcxtrace-comps/sasmodels/SasView_core_multi_shell.comp +++ b/mcxtrace-comps/sasmodels/SasView_core_multi_shell.comp @@ -268,7 +268,7 @@ if (xwidth && yheight && zdepth) TRACE %{ - double l0, l1, k, l_full, l, dl, d_Phi, theta; + double l0, l1, k, l_full, l, dl, d_Phi; double aim_x=0, aim_y=0, aim_z=1, axis_x, axis_y, axis_z; double f, solid_angle, kx_i, ky_i, kz_i, q, qx, qy, qz; char intersect=0; diff --git a/mcxtrace-comps/sasmodels/SasView_core_shell_bicelle.comp b/mcxtrace-comps/sasmodels/SasView_core_shell_bicelle.comp index c6a1ea6e8c..2f41781915 100644 --- a/mcxtrace-comps/sasmodels/SasView_core_shell_bicelle.comp +++ b/mcxtrace-comps/sasmodels/SasView_core_shell_bicelle.comp @@ -858,7 +858,7 @@ if (xwidth && yheight && zdepth) TRACE %{ - double l0, l1, k, l_full, l, dl, d_Phi, theta; + double l0, l1, k, l_full, l, dl, d_Phi; double aim_x=0, aim_y=0, aim_z=1, axis_x, axis_y, axis_z; double f, solid_angle, kx_i, ky_i, kz_i, q, qx, qy, qz; char intersect=0; diff --git a/mcxtrace-comps/sasmodels/SasView_core_shell_bicelle_aniso.comp b/mcxtrace-comps/sasmodels/SasView_core_shell_bicelle_aniso.comp index 49ce4e3f42..f0edd9467c 100644 --- a/mcxtrace-comps/sasmodels/SasView_core_shell_bicelle_aniso.comp +++ b/mcxtrace-comps/sasmodels/SasView_core_shell_bicelle_aniso.comp @@ -864,7 +864,7 @@ if (xwidth && yheight && zdepth) TRACE %{ - double l0, l1, k, l_full, l, dl, d_Phi, theta; + double l0, l1, k, l_full, l, dl, d_Phi; double aim_x=0, aim_y=0, aim_z=1, axis_x, axis_y, axis_z; double f, solid_angle, kx_i, ky_i, kz_i, q, qx, qy, qz; char intersect=0; diff --git a/mcxtrace-comps/sasmodels/SasView_core_shell_bicelle_elliptical.comp b/mcxtrace-comps/sasmodels/SasView_core_shell_bicelle_elliptical.comp index 3817bd914c..77df73d8ac 100644 --- a/mcxtrace-comps/sasmodels/SasView_core_shell_bicelle_elliptical.comp +++ b/mcxtrace-comps/sasmodels/SasView_core_shell_bicelle_elliptical.comp @@ -885,7 +885,7 @@ if (xwidth && yheight && zdepth) TRACE %{ - double l0, l1, k, l_full, l, dl, d_Phi, theta; + double l0, l1, k, l_full, l, dl, d_Phi; double aim_x=0, aim_y=0, aim_z=1, axis_x, axis_y, axis_z; double f, solid_angle, kx_i, ky_i, kz_i, q, qx, qy, qz; char intersect=0; diff --git a/mcxtrace-comps/sasmodels/SasView_core_shell_bicelle_elliptical_aniso.comp b/mcxtrace-comps/sasmodels/SasView_core_shell_bicelle_elliptical_aniso.comp index f32b9b0835..14ce9fc420 100644 --- a/mcxtrace-comps/sasmodels/SasView_core_shell_bicelle_elliptical_aniso.comp +++ b/mcxtrace-comps/sasmodels/SasView_core_shell_bicelle_elliptical_aniso.comp @@ -894,7 +894,7 @@ if (xwidth && yheight && zdepth) TRACE %{ - double l0, l1, k, l_full, l, dl, d_Phi, theta; + double l0, l1, k, l_full, l, dl, d_Phi; double aim_x=0, aim_y=0, aim_z=1, axis_x, axis_y, axis_z; double f, solid_angle, kx_i, ky_i, kz_i, q, qx, qy, qz; char intersect=0; diff --git a/mcxtrace-comps/sasmodels/SasView_core_shell_bicelle_elliptical_belt_rough.comp b/mcxtrace-comps/sasmodels/SasView_core_shell_bicelle_elliptical_belt_rough.comp index 94e2fa7d2d..5e6e579513 100644 --- a/mcxtrace-comps/sasmodels/SasView_core_shell_bicelle_elliptical_belt_rough.comp +++ b/mcxtrace-comps/sasmodels/SasView_core_shell_bicelle_elliptical_belt_rough.comp @@ -904,7 +904,7 @@ if (xwidth && yheight && zdepth) TRACE %{ - double l0, l1, k, l_full, l, dl, d_Phi, theta; + double l0, l1, k, l_full, l, dl, d_Phi; double aim_x=0, aim_y=0, aim_z=1, axis_x, axis_y, axis_z; double f, solid_angle, kx_i, ky_i, kz_i, q, qx, qy, qz; char intersect=0; diff --git a/mcxtrace-comps/sasmodels/SasView_core_shell_bicelle_elliptical_belt_rough_aniso.comp b/mcxtrace-comps/sasmodels/SasView_core_shell_bicelle_elliptical_belt_rough_aniso.comp index d79908125f..773f01814e 100644 --- a/mcxtrace-comps/sasmodels/SasView_core_shell_bicelle_elliptical_belt_rough_aniso.comp +++ b/mcxtrace-comps/sasmodels/SasView_core_shell_bicelle_elliptical_belt_rough_aniso.comp @@ -913,7 +913,7 @@ if (xwidth && yheight && zdepth) TRACE %{ - double l0, l1, k, l_full, l, dl, d_Phi, theta; + double l0, l1, k, l_full, l, dl, d_Phi; double aim_x=0, aim_y=0, aim_z=1, axis_x, axis_y, axis_z; double f, solid_angle, kx_i, ky_i, kz_i, q, qx, qy, qz; char intersect=0; diff --git a/mcxtrace-comps/sasmodels/SasView_core_shell_cylinder.comp b/mcxtrace-comps/sasmodels/SasView_core_shell_cylinder.comp index 0c4daf47dd..4b55ef7013 100644 --- a/mcxtrace-comps/sasmodels/SasView_core_shell_cylinder.comp +++ b/mcxtrace-comps/sasmodels/SasView_core_shell_cylinder.comp @@ -804,7 +804,7 @@ if (xwidth && yheight && zdepth) TRACE %{ - double l0, l1, k, l_full, l, dl, d_Phi, theta; + double l0, l1, k, l_full, l, dl, d_Phi; double aim_x=0, aim_y=0, aim_z=1, axis_x, axis_y, axis_z; double f, solid_angle, kx_i, ky_i, kz_i, q, qx, qy, qz; char intersect=0; diff --git a/mcxtrace-comps/sasmodels/SasView_core_shell_cylinder_aniso.comp b/mcxtrace-comps/sasmodels/SasView_core_shell_cylinder_aniso.comp index 7683588d73..afe266d3b7 100644 --- a/mcxtrace-comps/sasmodels/SasView_core_shell_cylinder_aniso.comp +++ b/mcxtrace-comps/sasmodels/SasView_core_shell_cylinder_aniso.comp @@ -810,7 +810,7 @@ if (xwidth && yheight && zdepth) TRACE %{ - double l0, l1, k, l_full, l, dl, d_Phi, theta; + double l0, l1, k, l_full, l, dl, d_Phi; double aim_x=0, aim_y=0, aim_z=1, axis_x, axis_y, axis_z; double f, solid_angle, kx_i, ky_i, kz_i, q, qx, qy, qz; char intersect=0; diff --git a/mcxtrace-comps/sasmodels/SasView_core_shell_ellipsoid.comp b/mcxtrace-comps/sasmodels/SasView_core_shell_ellipsoid.comp index ece5834b1c..8787adf487 100644 --- a/mcxtrace-comps/sasmodels/SasView_core_shell_ellipsoid.comp +++ b/mcxtrace-comps/sasmodels/SasView_core_shell_ellipsoid.comp @@ -550,7 +550,7 @@ if (xwidth && yheight && zdepth) TRACE %{ - double l0, l1, k, l_full, l, dl, d_Phi, theta; + double l0, l1, k, l_full, l, dl, d_Phi; double aim_x=0, aim_y=0, aim_z=1, axis_x, axis_y, axis_z; double f, solid_angle, kx_i, ky_i, kz_i, q, qx, qy, qz; char intersect=0; diff --git a/mcxtrace-comps/sasmodels/SasView_core_shell_ellipsoid_aniso.comp b/mcxtrace-comps/sasmodels/SasView_core_shell_ellipsoid_aniso.comp index a3713be2a8..e8cc148cf2 100644 --- a/mcxtrace-comps/sasmodels/SasView_core_shell_ellipsoid_aniso.comp +++ b/mcxtrace-comps/sasmodels/SasView_core_shell_ellipsoid_aniso.comp @@ -556,7 +556,7 @@ if (xwidth && yheight && zdepth) TRACE %{ - double l0, l1, k, l_full, l, dl, d_Phi, theta; + double l0, l1, k, l_full, l, dl, d_Phi; double aim_x=0, aim_y=0, aim_z=1, axis_x, axis_y, axis_z; double f, solid_angle, kx_i, ky_i, kz_i, q, qx, qy, qz; char intersect=0; diff --git a/mcxtrace-comps/sasmodels/SasView_core_shell_parallelepiped.comp b/mcxtrace-comps/sasmodels/SasView_core_shell_parallelepiped.comp index 520df9a13a..02384a86e3 100644 --- a/mcxtrace-comps/sasmodels/SasView_core_shell_parallelepiped.comp +++ b/mcxtrace-comps/sasmodels/SasView_core_shell_parallelepiped.comp @@ -574,7 +574,7 @@ if (xwidth && yheight && zdepth) TRACE %{ - double l0, l1, k, l_full, l, dl, d_Phi, theta; + double l0, l1, k, l_full, l, dl, d_Phi; double aim_x=0, aim_y=0, aim_z=1, axis_x, axis_y, axis_z; double f, solid_angle, kx_i, ky_i, kz_i, q, qx, qy, qz; char intersect=0; diff --git a/mcxtrace-comps/sasmodels/SasView_core_shell_parallelepiped_aniso.comp b/mcxtrace-comps/sasmodels/SasView_core_shell_parallelepiped_aniso.comp index 9a87d63377..126bfa07a5 100644 --- a/mcxtrace-comps/sasmodels/SasView_core_shell_parallelepiped_aniso.comp +++ b/mcxtrace-comps/sasmodels/SasView_core_shell_parallelepiped_aniso.comp @@ -583,7 +583,7 @@ if (xwidth && yheight && zdepth) TRACE %{ - double l0, l1, k, l_full, l, dl, d_Phi, theta; + double l0, l1, k, l_full, l, dl, d_Phi; double aim_x=0, aim_y=0, aim_z=1, axis_x, axis_y, axis_z; double f, solid_angle, kx_i, ky_i, kz_i, q, qx, qy, qz; char intersect=0; diff --git a/mcxtrace-comps/sasmodels/SasView_core_shell_sphere.comp b/mcxtrace-comps/sasmodels/SasView_core_shell_sphere.comp index c0a989977f..1a411a2c12 100644 --- a/mcxtrace-comps/sasmodels/SasView_core_shell_sphere.comp +++ b/mcxtrace-comps/sasmodels/SasView_core_shell_sphere.comp @@ -294,7 +294,7 @@ if (xwidth && yheight && zdepth) TRACE %{ - double l0, l1, k, l_full, l, dl, d_Phi, theta; + double l0, l1, k, l_full, l, dl, d_Phi; double aim_x=0, aim_y=0, aim_z=1, axis_x, axis_y, axis_z; double f, solid_angle, kx_i, ky_i, kz_i, q, qx, qy, qz; char intersect=0; diff --git a/mcxtrace-comps/sasmodels/SasView_correlation_length.comp b/mcxtrace-comps/sasmodels/SasView_correlation_length.comp index 6ddd9aae8c..cfaec8464e 100644 --- a/mcxtrace-comps/sasmodels/SasView_correlation_length.comp +++ b/mcxtrace-comps/sasmodels/SasView_correlation_length.comp @@ -156,7 +156,7 @@ if (xwidth && yheight && zdepth) TRACE %{ - double l0, l1, k, l_full, l, dl, d_Phi, theta; + double l0, l1, k, l_full, l, dl, d_Phi; double aim_x=0, aim_y=0, aim_z=1, axis_x, axis_y, axis_z; double f, solid_angle, kx_i, ky_i, kz_i, q, qx, qy, qz; char intersect=0; diff --git a/mcxtrace-comps/sasmodels/SasView_cylinder.comp b/mcxtrace-comps/sasmodels/SasView_cylinder.comp index 7864b3b7f0..2fa4f0c7e6 100644 --- a/mcxtrace-comps/sasmodels/SasView_cylinder.comp +++ b/mcxtrace-comps/sasmodels/SasView_cylinder.comp @@ -779,7 +779,7 @@ if (xwidth && yheight && zdepth) TRACE %{ - double l0, l1, k, l_full, l, dl, d_Phi, theta; + double l0, l1, k, l_full, l, dl, d_Phi; double aim_x=0, aim_y=0, aim_z=1, axis_x, axis_y, axis_z; double f, solid_angle, kx_i, ky_i, kz_i, q, qx, qy, qz; char intersect=0; diff --git a/mcxtrace-comps/sasmodels/SasView_cylinder_aniso.comp b/mcxtrace-comps/sasmodels/SasView_cylinder_aniso.comp index b0782305b6..8bda1024b2 100644 --- a/mcxtrace-comps/sasmodels/SasView_cylinder_aniso.comp +++ b/mcxtrace-comps/sasmodels/SasView_cylinder_aniso.comp @@ -785,7 +785,7 @@ if (xwidth && yheight && zdepth) TRACE %{ - double l0, l1, k, l_full, l, dl, d_Phi, theta; + double l0, l1, k, l_full, l, dl, d_Phi; double aim_x=0, aim_y=0, aim_z=1, axis_x, axis_y, axis_z; double f, solid_angle, kx_i, ky_i, kz_i, q, qx, qy, qz; char intersect=0; diff --git a/mcxtrace-comps/sasmodels/SasView_dab.comp b/mcxtrace-comps/sasmodels/SasView_dab.comp index 9d4affdfe1..c0c4960a96 100644 --- a/mcxtrace-comps/sasmodels/SasView_dab.comp +++ b/mcxtrace-comps/sasmodels/SasView_dab.comp @@ -139,7 +139,7 @@ if (xwidth && yheight && zdepth) TRACE %{ - double l0, l1, k, l_full, l, dl, d_Phi, theta; + double l0, l1, k, l_full, l, dl, d_Phi; double aim_x=0, aim_y=0, aim_z=1, axis_x, axis_y, axis_z; double f, solid_angle, kx_i, ky_i, kz_i, q, qx, qy, qz; char intersect=0; diff --git a/mcxtrace-comps/sasmodels/SasView_ellipsoid.comp b/mcxtrace-comps/sasmodels/SasView_ellipsoid.comp index 9939a567d0..3452ef1b1c 100644 --- a/mcxtrace-comps/sasmodels/SasView_ellipsoid.comp +++ b/mcxtrace-comps/sasmodels/SasView_ellipsoid.comp @@ -489,7 +489,7 @@ if (xwidth && yheight && zdepth) TRACE %{ - double l0, l1, k, l_full, l, dl, d_Phi, theta; + double l0, l1, k, l_full, l, dl, d_Phi; double aim_x=0, aim_y=0, aim_z=1, axis_x, axis_y, axis_z; double f, solid_angle, kx_i, ky_i, kz_i, q, qx, qy, qz; char intersect=0; diff --git a/mcxtrace-comps/sasmodels/SasView_ellipsoid_aniso.comp b/mcxtrace-comps/sasmodels/SasView_ellipsoid_aniso.comp index 07a878ce76..fd64c6d233 100644 --- a/mcxtrace-comps/sasmodels/SasView_ellipsoid_aniso.comp +++ b/mcxtrace-comps/sasmodels/SasView_ellipsoid_aniso.comp @@ -495,7 +495,7 @@ if (xwidth && yheight && zdepth) TRACE %{ - double l0, l1, k, l_full, l, dl, d_Phi, theta; + double l0, l1, k, l_full, l, dl, d_Phi; double aim_x=0, aim_y=0, aim_z=1, axis_x, axis_y, axis_z; double f, solid_angle, kx_i, ky_i, kz_i, q, qx, qy, qz; char intersect=0; diff --git a/mcxtrace-comps/sasmodels/SasView_elliptical_cylinder.comp b/mcxtrace-comps/sasmodels/SasView_elliptical_cylinder.comp index a00491e9d9..b29439f165 100644 --- a/mcxtrace-comps/sasmodels/SasView_elliptical_cylinder.comp +++ b/mcxtrace-comps/sasmodels/SasView_elliptical_cylinder.comp @@ -820,7 +820,7 @@ if (xwidth && yheight && zdepth) TRACE %{ - double l0, l1, k, l_full, l, dl, d_Phi, theta; + double l0, l1, k, l_full, l, dl, d_Phi; double aim_x=0, aim_y=0, aim_z=1, axis_x, axis_y, axis_z; double f, solid_angle, kx_i, ky_i, kz_i, q, qx, qy, qz; char intersect=0; diff --git a/mcxtrace-comps/sasmodels/SasView_elliptical_cylinder_aniso.comp b/mcxtrace-comps/sasmodels/SasView_elliptical_cylinder_aniso.comp index c21a9a0d52..f4b984bb85 100644 --- a/mcxtrace-comps/sasmodels/SasView_elliptical_cylinder_aniso.comp +++ b/mcxtrace-comps/sasmodels/SasView_elliptical_cylinder_aniso.comp @@ -829,7 +829,7 @@ if (xwidth && yheight && zdepth) TRACE %{ - double l0, l1, k, l_full, l, dl, d_Phi, theta; + double l0, l1, k, l_full, l, dl, d_Phi; double aim_x=0, aim_y=0, aim_z=1, axis_x, axis_y, axis_z; double f, solid_angle, kx_i, ky_i, kz_i, q, qx, qy, qz; char intersect=0; diff --git a/mcxtrace-comps/sasmodels/SasView_fcc_paracrystal.comp b/mcxtrace-comps/sasmodels/SasView_fcc_paracrystal.comp index 985d639795..5dc6dce4ae 100644 --- a/mcxtrace-comps/sasmodels/SasView_fcc_paracrystal.comp +++ b/mcxtrace-comps/sasmodels/SasView_fcc_paracrystal.comp @@ -658,7 +658,7 @@ if (xwidth && yheight && zdepth) TRACE %{ - double l0, l1, k, l_full, l, dl, d_Phi, theta; + double l0, l1, k, l_full, l, dl, d_Phi; double aim_x=0, aim_y=0, aim_z=1, axis_x, axis_y, axis_z; double f, solid_angle, kx_i, ky_i, kz_i, q, qx, qy, qz; char intersect=0; diff --git a/mcxtrace-comps/sasmodels/SasView_fcc_paracrystal_aniso.comp b/mcxtrace-comps/sasmodels/SasView_fcc_paracrystal_aniso.comp index a085b37ea5..f8175fff90 100644 --- a/mcxtrace-comps/sasmodels/SasView_fcc_paracrystal_aniso.comp +++ b/mcxtrace-comps/sasmodels/SasView_fcc_paracrystal_aniso.comp @@ -667,7 +667,7 @@ if (xwidth && yheight && zdepth) TRACE %{ - double l0, l1, k, l_full, l, dl, d_Phi, theta; + double l0, l1, k, l_full, l, dl, d_Phi; double aim_x=0, aim_y=0, aim_z=1, axis_x, axis_y, axis_z; double f, solid_angle, kx_i, ky_i, kz_i, q, qx, qy, qz; char intersect=0; diff --git a/mcxtrace-comps/sasmodels/SasView_flexible_cylinder.comp b/mcxtrace-comps/sasmodels/SasView_flexible_cylinder.comp index c732d48199..200c317a97 100644 --- a/mcxtrace-comps/sasmodels/SasView_flexible_cylinder.comp +++ b/mcxtrace-comps/sasmodels/SasView_flexible_cylinder.comp @@ -765,7 +765,7 @@ if (xwidth && yheight && zdepth) TRACE %{ - double l0, l1, k, l_full, l, dl, d_Phi, theta; + double l0, l1, k, l_full, l, dl, d_Phi; double aim_x=0, aim_y=0, aim_z=1, axis_x, axis_y, axis_z; double f, solid_angle, kx_i, ky_i, kz_i, q, qx, qy, qz; char intersect=0; diff --git a/mcxtrace-comps/sasmodels/SasView_flexible_cylinder_elliptical.comp b/mcxtrace-comps/sasmodels/SasView_flexible_cylinder_elliptical.comp index f4c821c84b..65fb6401d6 100644 --- a/mcxtrace-comps/sasmodels/SasView_flexible_cylinder_elliptical.comp +++ b/mcxtrace-comps/sasmodels/SasView_flexible_cylinder_elliptical.comp @@ -1000,7 +1000,7 @@ if (xwidth && yheight && zdepth) TRACE %{ - double l0, l1, k, l_full, l, dl, d_Phi, theta; + double l0, l1, k, l_full, l, dl, d_Phi; double aim_x=0, aim_y=0, aim_z=1, axis_x, axis_y, axis_z; double f, solid_angle, kx_i, ky_i, kz_i, q, qx, qy, qz; char intersect=0; diff --git a/mcxtrace-comps/sasmodels/SasView_fractal.comp b/mcxtrace-comps/sasmodels/SasView_fractal.comp index 6273a87631..38bcb71de5 100644 --- a/mcxtrace-comps/sasmodels/SasView_fractal.comp +++ b/mcxtrace-comps/sasmodels/SasView_fractal.comp @@ -85,9 +85,6 @@ SETTING PARAMETERS ( SHARE %{ -#ifdef OPENACC -#define USE_CUDA -#endif %include "sas_kernel_header.c" /* BEGIN Required header for SASmodel fractal */ @@ -444,7 +441,7 @@ if (xwidth && yheight && zdepth) TRACE %{ - double l0, l1, k, l_full, l, dl, d_Phi, theta; + double l0, l1, k, l_full, l, dl, d_Phi; double aim_x=0, aim_y=0, aim_z=1, axis_x, axis_y, axis_z; double f, solid_angle, kx_i, ky_i, kz_i, q, qx, qy, qz; char intersect=0; diff --git a/mcxtrace-comps/sasmodels/SasView_fractal_core_shell.comp b/mcxtrace-comps/sasmodels/SasView_fractal_core_shell.comp index 120e18495f..9a8a678538 100644 --- a/mcxtrace-comps/sasmodels/SasView_fractal_core_shell.comp +++ b/mcxtrace-comps/sasmodels/SasView_fractal_core_shell.comp @@ -91,9 +91,6 @@ SETTING PARAMETERS ( SHARE %{ -#ifdef OPENACC -#define USE_CUDA -#endif %include "sas_kernel_header.c" /* BEGIN Required header for SASmodel fractal_core_shell */ @@ -502,7 +499,7 @@ if (xwidth && yheight && zdepth) TRACE %{ - double l0, l1, k, l_full, l, dl, d_Phi, theta; + double l0, l1, k, l_full, l, dl, d_Phi; double aim_x=0, aim_y=0, aim_z=1, axis_x, axis_y, axis_z; double f, solid_angle, kx_i, ky_i, kz_i, q, qx, qy, qz; char intersect=0; diff --git a/mcxtrace-comps/sasmodels/SasView_fuzzy_sphere.comp b/mcxtrace-comps/sasmodels/SasView_fuzzy_sphere.comp index 4867ecf041..1c9e4f96e5 100644 --- a/mcxtrace-comps/sasmodels/SasView_fuzzy_sphere.comp +++ b/mcxtrace-comps/sasmodels/SasView_fuzzy_sphere.comp @@ -234,7 +234,7 @@ if (xwidth && yheight && zdepth) TRACE %{ - double l0, l1, k, l_full, l, dl, d_Phi, theta; + double l0, l1, k, l_full, l, dl, d_Phi; double aim_x=0, aim_y=0, aim_z=1, axis_x, axis_y, axis_z; double f, solid_angle, kx_i, ky_i, kz_i, q, qx, qy, qz; char intersect=0; diff --git a/mcxtrace-comps/sasmodels/SasView_gauss_lorentz_gel.comp b/mcxtrace-comps/sasmodels/SasView_gauss_lorentz_gel.comp index 3d58ca5271..bec2727428 100644 --- a/mcxtrace-comps/sasmodels/SasView_gauss_lorentz_gel.comp +++ b/mcxtrace-comps/sasmodels/SasView_gauss_lorentz_gel.comp @@ -156,7 +156,7 @@ if (xwidth && yheight && zdepth) TRACE %{ - double l0, l1, k, l_full, l, dl, d_Phi, theta; + double l0, l1, k, l_full, l, dl, d_Phi; double aim_x=0, aim_y=0, aim_z=1, axis_x, axis_y, axis_z; double f, solid_angle, kx_i, ky_i, kz_i, q, qx, qy, qz; char intersect=0; diff --git a/mcxtrace-comps/sasmodels/SasView_gaussian_peak.comp b/mcxtrace-comps/sasmodels/SasView_gaussian_peak.comp index 43cdc1279b..b12fa7e0e6 100644 --- a/mcxtrace-comps/sasmodels/SasView_gaussian_peak.comp +++ b/mcxtrace-comps/sasmodels/SasView_gaussian_peak.comp @@ -138,7 +138,7 @@ if (xwidth && yheight && zdepth) TRACE %{ - double l0, l1, k, l_full, l, dl, d_Phi, theta; + double l0, l1, k, l_full, l, dl, d_Phi; double aim_x=0, aim_y=0, aim_z=1, axis_x, axis_y, axis_z; double f, solid_angle, kx_i, ky_i, kz_i, q, qx, qy, qz; char intersect=0; diff --git a/mcxtrace-comps/sasmodels/SasView_gel_fit.comp b/mcxtrace-comps/sasmodels/SasView_gel_fit.comp index 6bb7aae2be..350378ad66 100644 --- a/mcxtrace-comps/sasmodels/SasView_gel_fit.comp +++ b/mcxtrace-comps/sasmodels/SasView_gel_fit.comp @@ -165,7 +165,7 @@ if (xwidth && yheight && zdepth) TRACE %{ - double l0, l1, k, l_full, l, dl, d_Phi, theta; + double l0, l1, k, l_full, l, dl, d_Phi; double aim_x=0, aim_y=0, aim_z=1, axis_x, axis_y, axis_z; double f, solid_angle, kx_i, ky_i, kz_i, q, qx, qy, qz; char intersect=0; diff --git a/mcxtrace-comps/sasmodels/SasView_guinier.comp b/mcxtrace-comps/sasmodels/SasView_guinier.comp index 110bfa8a22..652b149fd7 100644 --- a/mcxtrace-comps/sasmodels/SasView_guinier.comp +++ b/mcxtrace-comps/sasmodels/SasView_guinier.comp @@ -138,7 +138,7 @@ if (xwidth && yheight && zdepth) TRACE %{ - double l0, l1, k, l_full, l, dl, d_Phi, theta; + double l0, l1, k, l_full, l, dl, d_Phi; double aim_x=0, aim_y=0, aim_z=1, axis_x, axis_y, axis_z; double f, solid_angle, kx_i, ky_i, kz_i, q, qx, qy, qz; char intersect=0; diff --git a/mcxtrace-comps/sasmodels/SasView_guinier_porod.comp b/mcxtrace-comps/sasmodels/SasView_guinier_porod.comp index e7e5c3f639..5362e4af98 100644 --- a/mcxtrace-comps/sasmodels/SasView_guinier_porod.comp +++ b/mcxtrace-comps/sasmodels/SasView_guinier_porod.comp @@ -162,7 +162,7 @@ if (xwidth && yheight && zdepth) TRACE %{ - double l0, l1, k, l_full, l, dl, d_Phi, theta; + double l0, l1, k, l_full, l, dl, d_Phi; double aim_x=0, aim_y=0, aim_z=1, axis_x, axis_y, axis_z; double f, solid_angle, kx_i, ky_i, kz_i, q, qx, qy, qz; char intersect=0; diff --git a/mcxtrace-comps/sasmodels/SasView_hardsphere.comp b/mcxtrace-comps/sasmodels/SasView_hardsphere.comp index f061dcad1f..98c6541e4d 100644 --- a/mcxtrace-comps/sasmodels/SasView_hardsphere.comp +++ b/mcxtrace-comps/sasmodels/SasView_hardsphere.comp @@ -220,7 +220,7 @@ if (xwidth && yheight && zdepth) TRACE %{ - double l0, l1, k, l_full, l, dl, d_Phi, theta; + double l0, l1, k, l_full, l, dl, d_Phi; double aim_x=0, aim_y=0, aim_z=1, axis_x, axis_y, axis_z; double f, solid_angle, kx_i, ky_i, kz_i, q, qx, qy, qz; char intersect=0; diff --git a/mcxtrace-comps/sasmodels/SasView_hayter_msa.comp b/mcxtrace-comps/sasmodels/SasView_hayter_msa.comp index 33a4126da6..9c12ebb00c 100644 --- a/mcxtrace-comps/sasmodels/SasView_hayter_msa.comp +++ b/mcxtrace-comps/sasmodels/SasView_hayter_msa.comp @@ -686,7 +686,7 @@ if (xwidth && yheight && zdepth) TRACE %{ - double l0, l1, k, l_full, l, dl, d_Phi, theta; + double l0, l1, k, l_full, l, dl, d_Phi; double aim_x=0, aim_y=0, aim_z=1, axis_x, axis_y, axis_z; double f, solid_angle, kx_i, ky_i, kz_i, q, qx, qy, qz; char intersect=0; diff --git a/mcxtrace-comps/sasmodels/SasView_hollow_cylinder.comp b/mcxtrace-comps/sasmodels/SasView_hollow_cylinder.comp index 8d60b488a2..92e3875dec 100644 --- a/mcxtrace-comps/sasmodels/SasView_hollow_cylinder.comp +++ b/mcxtrace-comps/sasmodels/SasView_hollow_cylinder.comp @@ -786,7 +786,7 @@ if (xwidth && yheight && zdepth) TRACE %{ - double l0, l1, k, l_full, l, dl, d_Phi, theta; + double l0, l1, k, l_full, l, dl, d_Phi; double aim_x=0, aim_y=0, aim_z=1, axis_x, axis_y, axis_z; double f, solid_angle, kx_i, ky_i, kz_i, q, qx, qy, qz; char intersect=0; diff --git a/mcxtrace-comps/sasmodels/SasView_hollow_cylinder_aniso.comp b/mcxtrace-comps/sasmodels/SasView_hollow_cylinder_aniso.comp index cffa531e9f..4e653dc454 100644 --- a/mcxtrace-comps/sasmodels/SasView_hollow_cylinder_aniso.comp +++ b/mcxtrace-comps/sasmodels/SasView_hollow_cylinder_aniso.comp @@ -792,7 +792,7 @@ if (xwidth && yheight && zdepth) TRACE %{ - double l0, l1, k, l_full, l, dl, d_Phi, theta; + double l0, l1, k, l_full, l, dl, d_Phi; double aim_x=0, aim_y=0, aim_z=1, axis_x, axis_y, axis_z; double f, solid_angle, kx_i, ky_i, kz_i, q, qx, qy, qz; char intersect=0; diff --git a/mcxtrace-comps/sasmodels/SasView_hollow_rectangular_prism.comp b/mcxtrace-comps/sasmodels/SasView_hollow_rectangular_prism.comp index 49efa120bd..51fc4744b6 100644 --- a/mcxtrace-comps/sasmodels/SasView_hollow_rectangular_prism.comp +++ b/mcxtrace-comps/sasmodels/SasView_hollow_rectangular_prism.comp @@ -499,7 +499,7 @@ if (xwidth && yheight && zdepth) TRACE %{ - double l0, l1, k, l_full, l, dl, d_Phi, theta; + double l0, l1, k, l_full, l, dl, d_Phi; double aim_x=0, aim_y=0, aim_z=1, axis_x, axis_y, axis_z; double f, solid_angle, kx_i, ky_i, kz_i, q, qx, qy, qz; char intersect=0; diff --git a/mcxtrace-comps/sasmodels/SasView_hollow_rectangular_prism_aniso.comp b/mcxtrace-comps/sasmodels/SasView_hollow_rectangular_prism_aniso.comp index 057660fb37..3e7ca0ed67 100644 --- a/mcxtrace-comps/sasmodels/SasView_hollow_rectangular_prism_aniso.comp +++ b/mcxtrace-comps/sasmodels/SasView_hollow_rectangular_prism_aniso.comp @@ -508,7 +508,7 @@ if (xwidth && yheight && zdepth) TRACE %{ - double l0, l1, k, l_full, l, dl, d_Phi, theta; + double l0, l1, k, l_full, l, dl, d_Phi; double aim_x=0, aim_y=0, aim_z=1, axis_x, axis_y, axis_z; double f, solid_angle, kx_i, ky_i, kz_i, q, qx, qy, qz; char intersect=0; diff --git a/mcxtrace-comps/sasmodels/SasView_hollow_rectangular_prism_thin_walls.comp b/mcxtrace-comps/sasmodels/SasView_hollow_rectangular_prism_thin_walls.comp index 2c7897a5d5..8a2eb37a0d 100644 --- a/mcxtrace-comps/sasmodels/SasView_hollow_rectangular_prism_thin_walls.comp +++ b/mcxtrace-comps/sasmodels/SasView_hollow_rectangular_prism_thin_walls.comp @@ -453,7 +453,7 @@ if (xwidth && yheight && zdepth) TRACE %{ - double l0, l1, k, l_full, l, dl, d_Phi, theta; + double l0, l1, k, l_full, l, dl, d_Phi; double aim_x=0, aim_y=0, aim_z=1, axis_x, axis_y, axis_z; double f, solid_angle, kx_i, ky_i, kz_i, q, qx, qy, qz; char intersect=0; diff --git a/mcxtrace-comps/sasmodels/SasView_lamellar_hg.comp b/mcxtrace-comps/sasmodels/SasView_lamellar_hg.comp index c1dd40c468..6960933820 100644 --- a/mcxtrace-comps/sasmodels/SasView_lamellar_hg.comp +++ b/mcxtrace-comps/sasmodels/SasView_lamellar_hg.comp @@ -160,7 +160,7 @@ if (xwidth && yheight && zdepth) TRACE %{ - double l0, l1, k, l_full, l, dl, d_Phi, theta; + double l0, l1, k, l_full, l, dl, d_Phi; double aim_x=0, aim_y=0, aim_z=1, axis_x, axis_y, axis_z; double f, solid_angle, kx_i, ky_i, kz_i, q, qx, qy, qz; char intersect=0; diff --git a/mcxtrace-comps/sasmodels/SasView_lamellar_hg_stack_caille.comp b/mcxtrace-comps/sasmodels/SasView_lamellar_hg_stack_caille.comp index e528b0c601..fc24221489 100644 --- a/mcxtrace-comps/sasmodels/SasView_lamellar_hg_stack_caille.comp +++ b/mcxtrace-comps/sasmodels/SasView_lamellar_hg_stack_caille.comp @@ -206,7 +206,7 @@ if (xwidth && yheight && zdepth) TRACE %{ - double l0, l1, k, l_full, l, dl, d_Phi, theta; + double l0, l1, k, l_full, l, dl, d_Phi; double aim_x=0, aim_y=0, aim_z=1, axis_x, axis_y, axis_z; double f, solid_angle, kx_i, ky_i, kz_i, q, qx, qy, qz; char intersect=0; diff --git a/mcxtrace-comps/sasmodels/SasView_lamellar_stack_caille.comp b/mcxtrace-comps/sasmodels/SasView_lamellar_stack_caille.comp index 3c5ab0641a..f46aaf02eb 100644 --- a/mcxtrace-comps/sasmodels/SasView_lamellar_stack_caille.comp +++ b/mcxtrace-comps/sasmodels/SasView_lamellar_stack_caille.comp @@ -196,7 +196,7 @@ if (xwidth && yheight && zdepth) TRACE %{ - double l0, l1, k, l_full, l, dl, d_Phi, theta; + double l0, l1, k, l_full, l, dl, d_Phi; double aim_x=0, aim_y=0, aim_z=1, axis_x, axis_y, axis_z; double f, solid_angle, kx_i, ky_i, kz_i, q, qx, qy, qz; char intersect=0; diff --git a/mcxtrace-comps/sasmodels/SasView_lamellar_stack_paracrystal.comp b/mcxtrace-comps/sasmodels/SasView_lamellar_stack_paracrystal.comp index a0f9b4b658..c9445782e8 100644 --- a/mcxtrace-comps/sasmodels/SasView_lamellar_stack_paracrystal.comp +++ b/mcxtrace-comps/sasmodels/SasView_lamellar_stack_paracrystal.comp @@ -216,7 +216,7 @@ if (xwidth && yheight && zdepth) TRACE %{ - double l0, l1, k, l_full, l, dl, d_Phi, theta; + double l0, l1, k, l_full, l, dl, d_Phi; double aim_x=0, aim_y=0, aim_z=1, axis_x, axis_y, axis_z; double f, solid_angle, kx_i, ky_i, kz_i, q, qx, qy, qz; char intersect=0; diff --git a/mcxtrace-comps/sasmodels/SasView_line.comp b/mcxtrace-comps/sasmodels/SasView_line.comp index 8d3cdf43ff..af486b3edb 100644 --- a/mcxtrace-comps/sasmodels/SasView_line.comp +++ b/mcxtrace-comps/sasmodels/SasView_line.comp @@ -144,7 +144,7 @@ if (xwidth && yheight && zdepth) TRACE %{ - double l0, l1, k, l_full, l, dl, d_Phi, theta; + double l0, l1, k, l_full, l, dl, d_Phi; double aim_x=0, aim_y=0, aim_z=1, axis_x, axis_y, axis_z; double f, solid_angle, kx_i, ky_i, kz_i, q, qx, qy, qz; char intersect=0; diff --git a/mcxtrace-comps/sasmodels/SasView_linear_pearls.comp b/mcxtrace-comps/sasmodels/SasView_linear_pearls.comp index cfc54c1a36..d389fc4345 100644 --- a/mcxtrace-comps/sasmodels/SasView_linear_pearls.comp +++ b/mcxtrace-comps/sasmodels/SasView_linear_pearls.comp @@ -284,7 +284,7 @@ if (xwidth && yheight && zdepth) TRACE %{ - double l0, l1, k, l_full, l, dl, d_Phi, theta; + double l0, l1, k, l_full, l, dl, d_Phi; double aim_x=0, aim_y=0, aim_z=1, axis_x, axis_y, axis_z; double f, solid_angle, kx_i, ky_i, kz_i, q, qx, qy, qz; char intersect=0; diff --git a/mcxtrace-comps/sasmodels/SasView_lorentz.comp b/mcxtrace-comps/sasmodels/SasView_lorentz.comp index 5143e82663..e70de9b616 100644 --- a/mcxtrace-comps/sasmodels/SasView_lorentz.comp +++ b/mcxtrace-comps/sasmodels/SasView_lorentz.comp @@ -137,7 +137,7 @@ if (xwidth && yheight && zdepth) TRACE %{ - double l0, l1, k, l_full, l, dl, d_Phi, theta; + double l0, l1, k, l_full, l, dl, d_Phi; double aim_x=0, aim_y=0, aim_z=1, axis_x, axis_y, axis_z; double f, solid_angle, kx_i, ky_i, kz_i, q, qx, qy, qz; char intersect=0; diff --git a/mcxtrace-comps/sasmodels/SasView_mass_fractal.comp b/mcxtrace-comps/sasmodels/SasView_mass_fractal.comp index b06eef86df..a588cc34cf 100644 --- a/mcxtrace-comps/sasmodels/SasView_mass_fractal.comp +++ b/mcxtrace-comps/sasmodels/SasView_mass_fractal.comp @@ -397,7 +397,7 @@ if (xwidth && yheight && zdepth) TRACE %{ - double l0, l1, k, l_full, l, dl, d_Phi, theta; + double l0, l1, k, l_full, l, dl, d_Phi; double aim_x=0, aim_y=0, aim_z=1, axis_x, axis_y, axis_z; double f, solid_angle, kx_i, ky_i, kz_i, q, qx, qy, qz; char intersect=0; diff --git a/mcxtrace-comps/sasmodels/SasView_mass_surface_fractal.comp b/mcxtrace-comps/sasmodels/SasView_mass_surface_fractal.comp index 9ff791f585..41ab0ac9d6 100644 --- a/mcxtrace-comps/sasmodels/SasView_mass_surface_fractal.comp +++ b/mcxtrace-comps/sasmodels/SasView_mass_surface_fractal.comp @@ -158,7 +158,7 @@ if (xwidth && yheight && zdepth) TRACE %{ - double l0, l1, k, l_full, l, dl, d_Phi, theta; + double l0, l1, k, l_full, l, dl, d_Phi; double aim_x=0, aim_y=0, aim_z=1, axis_x, axis_y, axis_z; double f, solid_angle, kx_i, ky_i, kz_i, q, qx, qy, qz; char intersect=0; diff --git a/mcxtrace-comps/sasmodels/SasView_mono_gauss_coil.comp b/mcxtrace-comps/sasmodels/SasView_mono_gauss_coil.comp index df64fc113d..13fe3fe275 100644 --- a/mcxtrace-comps/sasmodels/SasView_mono_gauss_coil.comp +++ b/mcxtrace-comps/sasmodels/SasView_mono_gauss_coil.comp @@ -199,7 +199,7 @@ if (xwidth && yheight && zdepth) TRACE %{ - double l0, l1, k, l_full, l, dl, d_Phi, theta; + double l0, l1, k, l_full, l, dl, d_Phi; double aim_x=0, aim_y=0, aim_z=1, axis_x, axis_y, axis_z; double f, solid_angle, kx_i, ky_i, kz_i, q, qx, qy, qz; char intersect=0; diff --git a/mcxtrace-comps/sasmodels/SasView_multilayer_vesicle.comp b/mcxtrace-comps/sasmodels/SasView_multilayer_vesicle.comp index 9097785c05..7668d44454 100644 --- a/mcxtrace-comps/sasmodels/SasView_multilayer_vesicle.comp +++ b/mcxtrace-comps/sasmodels/SasView_multilayer_vesicle.comp @@ -296,7 +296,7 @@ if (xwidth && yheight && zdepth) TRACE %{ - double l0, l1, k, l_full, l, dl, d_Phi, theta; + double l0, l1, k, l_full, l, dl, d_Phi; double aim_x=0, aim_y=0, aim_z=1, axis_x, axis_y, axis_z; double f, solid_angle, kx_i, ky_i, kz_i, q, qx, qy, qz; char intersect=0; diff --git a/mcxtrace-comps/sasmodels/SasView_onion.comp b/mcxtrace-comps/sasmodels/SasView_onion.comp index 97f81458cb..0f33473b5c 100644 --- a/mcxtrace-comps/sasmodels/SasView_onion.comp +++ b/mcxtrace-comps/sasmodels/SasView_onion.comp @@ -289,7 +289,7 @@ if (xwidth && yheight && zdepth) TRACE %{ - double l0, l1, k, l_full, l, dl, d_Phi, theta; + double l0, l1, k, l_full, l, dl, d_Phi; double aim_x=0, aim_y=0, aim_z=1, axis_x, axis_y, axis_z; double f, solid_angle, kx_i, ky_i, kz_i, q, qx, qy, qz; char intersect=0; diff --git a/mcxtrace-comps/sasmodels/SasView_parallelepiped.comp b/mcxtrace-comps/sasmodels/SasView_parallelepiped.comp index b4ba7a90a8..f08baf3358 100644 --- a/mcxtrace-comps/sasmodels/SasView_parallelepiped.comp +++ b/mcxtrace-comps/sasmodels/SasView_parallelepiped.comp @@ -462,7 +462,7 @@ if (xwidth && yheight && zdepth) TRACE %{ - double l0, l1, k, l_full, l, dl, d_Phi, theta; + double l0, l1, k, l_full, l, dl, d_Phi; double aim_x=0, aim_y=0, aim_z=1, axis_x, axis_y, axis_z; double f, solid_angle, kx_i, ky_i, kz_i, q, qx, qy, qz; char intersect=0; diff --git a/mcxtrace-comps/sasmodels/SasView_parallelepiped_aniso.comp b/mcxtrace-comps/sasmodels/SasView_parallelepiped_aniso.comp index c1947c1dff..16ff2650a6 100644 --- a/mcxtrace-comps/sasmodels/SasView_parallelepiped_aniso.comp +++ b/mcxtrace-comps/sasmodels/SasView_parallelepiped_aniso.comp @@ -471,7 +471,7 @@ if (xwidth && yheight && zdepth) TRACE %{ - double l0, l1, k, l_full, l, dl, d_Phi, theta; + double l0, l1, k, l_full, l, dl, d_Phi; double aim_x=0, aim_y=0, aim_z=1, axis_x, axis_y, axis_z; double f, solid_angle, kx_i, ky_i, kz_i, q, qx, qy, qz; char intersect=0; diff --git a/mcxtrace-comps/sasmodels/SasView_peak_lorentz.comp b/mcxtrace-comps/sasmodels/SasView_peak_lorentz.comp index f722d631af..855e42d960 100644 --- a/mcxtrace-comps/sasmodels/SasView_peak_lorentz.comp +++ b/mcxtrace-comps/sasmodels/SasView_peak_lorentz.comp @@ -144,7 +144,7 @@ if (xwidth && yheight && zdepth) TRACE %{ - double l0, l1, k, l_full, l, dl, d_Phi, theta; + double l0, l1, k, l_full, l, dl, d_Phi; double aim_x=0, aim_y=0, aim_z=1, axis_x, axis_y, axis_z; double f, solid_angle, kx_i, ky_i, kz_i, q, qx, qy, qz; char intersect=0; diff --git a/mcxtrace-comps/sasmodels/SasView_pearl_necklace.comp b/mcxtrace-comps/sasmodels/SasView_pearl_necklace.comp index 19057a79e2..702b7005b7 100644 --- a/mcxtrace-comps/sasmodels/SasView_pearl_necklace.comp +++ b/mcxtrace-comps/sasmodels/SasView_pearl_necklace.comp @@ -354,7 +354,7 @@ if (xwidth && yheight && zdepth) TRACE %{ - double l0, l1, k, l_full, l, dl, d_Phi, theta; + double l0, l1, k, l_full, l, dl, d_Phi; double aim_x=0, aim_y=0, aim_z=1, axis_x, axis_y, axis_z; double f, solid_angle, kx_i, ky_i, kz_i, q, qx, qy, qz; char intersect=0; diff --git a/mcxtrace-comps/sasmodels/SasView_poly_gauss_coil.comp b/mcxtrace-comps/sasmodels/SasView_poly_gauss_coil.comp index 75d1070ef7..7d275015bc 100644 --- a/mcxtrace-comps/sasmodels/SasView_poly_gauss_coil.comp +++ b/mcxtrace-comps/sasmodels/SasView_poly_gauss_coil.comp @@ -166,7 +166,7 @@ if (xwidth && yheight && zdepth) TRACE %{ - double l0, l1, k, l_full, l, dl, d_Phi, theta; + double l0, l1, k, l_full, l, dl, d_Phi; double aim_x=0, aim_y=0, aim_z=1, axis_x, axis_y, axis_z; double f, solid_angle, kx_i, ky_i, kz_i, q, qx, qy, qz; char intersect=0; diff --git a/mcxtrace-comps/sasmodels/SasView_polymer_excl_volume.comp b/mcxtrace-comps/sasmodels/SasView_polymer_excl_volume.comp index 5e6a3942fa..080583c31e 100644 --- a/mcxtrace-comps/sasmodels/SasView_polymer_excl_volume.comp +++ b/mcxtrace-comps/sasmodels/SasView_polymer_excl_volume.comp @@ -176,7 +176,7 @@ if (xwidth && yheight && zdepth) TRACE %{ - double l0, l1, k, l_full, l, dl, d_Phi, theta; + double l0, l1, k, l_full, l, dl, d_Phi; double aim_x=0, aim_y=0, aim_z=1, axis_x, axis_y, axis_z; double f, solid_angle, kx_i, ky_i, kz_i, q, qx, qy, qz; char intersect=0; diff --git a/mcxtrace-comps/sasmodels/SasView_polymer_micelle.comp b/mcxtrace-comps/sasmodels/SasView_polymer_micelle.comp index 17e7769dde..aa2c0b3638 100644 --- a/mcxtrace-comps/sasmodels/SasView_polymer_micelle.comp +++ b/mcxtrace-comps/sasmodels/SasView_polymer_micelle.comp @@ -306,7 +306,7 @@ if (xwidth && yheight && zdepth) TRACE %{ - double l0, l1, k, l_full, l, dl, d_Phi, theta; + double l0, l1, k, l_full, l, dl, d_Phi; double aim_x=0, aim_y=0, aim_z=1, axis_x, axis_y, axis_z; double f, solid_angle, kx_i, ky_i, kz_i, q, qx, qy, qz; char intersect=0; diff --git a/mcxtrace-comps/sasmodels/SasView_porod.comp b/mcxtrace-comps/sasmodels/SasView_porod.comp index 9baff86e6d..9ab0cb5600 100644 --- a/mcxtrace-comps/sasmodels/SasView_porod.comp +++ b/mcxtrace-comps/sasmodels/SasView_porod.comp @@ -139,7 +139,7 @@ if (xwidth && yheight && zdepth) TRACE %{ - double l0, l1, k, l_full, l, dl, d_Phi, theta; + double l0, l1, k, l_full, l, dl, d_Phi; double aim_x=0, aim_y=0, aim_z=1, axis_x, axis_y, axis_z; double f, solid_angle, kx_i, ky_i, kz_i, q, qx, qy, qz; char intersect=0; diff --git a/mcxtrace-comps/sasmodels/SasView_power_law.comp b/mcxtrace-comps/sasmodels/SasView_power_law.comp index f3625784de..5aad2cb447 100644 --- a/mcxtrace-comps/sasmodels/SasView_power_law.comp +++ b/mcxtrace-comps/sasmodels/SasView_power_law.comp @@ -142,7 +142,7 @@ if (xwidth && yheight && zdepth) TRACE %{ - double l0, l1, k, l_full, l, dl, d_Phi, theta; + double l0, l1, k, l_full, l, dl, d_Phi; double aim_x=0, aim_y=0, aim_z=1, axis_x, axis_y, axis_z; double f, solid_angle, kx_i, ky_i, kz_i, q, qx, qy, qz; char intersect=0; diff --git a/mcxtrace-comps/sasmodels/SasView_pringle.comp b/mcxtrace-comps/sasmodels/SasView_pringle.comp index 13da785e89..00db4bc3fd 100644 --- a/mcxtrace-comps/sasmodels/SasView_pringle.comp +++ b/mcxtrace-comps/sasmodels/SasView_pringle.comp @@ -1317,7 +1317,7 @@ if (xwidth && yheight && zdepth) TRACE %{ - double l0, l1, k, l_full, l, dl, d_Phi, theta; + double l0, l1, k, l_full, l, dl, d_Phi; double aim_x=0, aim_y=0, aim_z=1, axis_x, axis_y, axis_z; double f, solid_angle, kx_i, ky_i, kz_i, q, qx, qy, qz; char intersect=0; diff --git a/mcxtrace-comps/sasmodels/SasView_raspberry.comp b/mcxtrace-comps/sasmodels/SasView_raspberry.comp index 7904982c62..171ba7e75f 100644 --- a/mcxtrace-comps/sasmodels/SasView_raspberry.comp +++ b/mcxtrace-comps/sasmodels/SasView_raspberry.comp @@ -314,7 +314,7 @@ if (xwidth && yheight && zdepth) TRACE %{ - double l0, l1, k, l_full, l, dl, d_Phi, theta; + double l0, l1, k, l_full, l, dl, d_Phi; double aim_x=0, aim_y=0, aim_z=1, axis_x, axis_y, axis_z; double f, solid_angle, kx_i, ky_i, kz_i, q, qx, qy, qz; char intersect=0; diff --git a/mcxtrace-comps/sasmodels/SasView_rectangular_prism_aniso.comp b/mcxtrace-comps/sasmodels/SasView_rectangular_prism_aniso.comp index 24176064ed..bcdfe61bcc 100644 --- a/mcxtrace-comps/sasmodels/SasView_rectangular_prism_aniso.comp +++ b/mcxtrace-comps/sasmodels/SasView_rectangular_prism_aniso.comp @@ -529,7 +529,7 @@ if (xwidth && yheight && zdepth) TRACE %{ - double l0, l1, k, l_full, l, dl, d_Phi, theta; + double l0, l1, k, l_full, l, dl, d_Phi; double aim_x=0, aim_y=0, aim_z=1, axis_x, axis_y, axis_z; double f, solid_angle, kx_i, ky_i, kz_i, q, qx, qy, qz; char intersect=0; diff --git a/mcxtrace-comps/sasmodels/SasView_rpa.comp b/mcxtrace-comps/sasmodels/SasView_rpa.comp index 960e642bd1..e6ff5710e0 100644 --- a/mcxtrace-comps/sasmodels/SasView_rpa.comp +++ b/mcxtrace-comps/sasmodels/SasView_rpa.comp @@ -769,7 +769,7 @@ if (xwidth && yheight && zdepth) TRACE %{ - double l0, l1, k, l_full, l, dl, d_Phi, theta; + double l0, l1, k, l_full, l, dl, d_Phi; double aim_x=0, aim_y=0, aim_z=1, axis_x, axis_y, axis_z; double f, solid_angle, kx_i, ky_i, kz_i, q, qx, qy, qz; char intersect=0; diff --git a/mcxtrace-comps/sasmodels/SasView_sc_paracrystal.comp b/mcxtrace-comps/sasmodels/SasView_sc_paracrystal.comp index 9899f5bcf6..fd230f8db4 100644 --- a/mcxtrace-comps/sasmodels/SasView_sc_paracrystal.comp +++ b/mcxtrace-comps/sasmodels/SasView_sc_paracrystal.comp @@ -659,7 +659,7 @@ if (xwidth && yheight && zdepth) TRACE %{ - double l0, l1, k, l_full, l, dl, d_Phi, theta; + double l0, l1, k, l_full, l, dl, d_Phi; double aim_x=0, aim_y=0, aim_z=1, axis_x, axis_y, axis_z; double f, solid_angle, kx_i, ky_i, kz_i, q, qx, qy, qz; char intersect=0; diff --git a/mcxtrace-comps/sasmodels/SasView_sc_paracrystal_aniso.comp b/mcxtrace-comps/sasmodels/SasView_sc_paracrystal_aniso.comp index be3dba2887..152174dec9 100644 --- a/mcxtrace-comps/sasmodels/SasView_sc_paracrystal_aniso.comp +++ b/mcxtrace-comps/sasmodels/SasView_sc_paracrystal_aniso.comp @@ -668,7 +668,7 @@ if (xwidth && yheight && zdepth) TRACE %{ - double l0, l1, k, l_full, l, dl, d_Phi, theta; + double l0, l1, k, l_full, l, dl, d_Phi; double aim_x=0, aim_y=0, aim_z=1, axis_x, axis_y, axis_z; double f, solid_angle, kx_i, ky_i, kz_i, q, qx, qy, qz; char intersect=0; diff --git a/mcxtrace-comps/sasmodels/SasView_sphere.comp b/mcxtrace-comps/sasmodels/SasView_sphere.comp index 2be5f29951..28349caf92 100644 --- a/mcxtrace-comps/sasmodels/SasView_sphere.comp +++ b/mcxtrace-comps/sasmodels/SasView_sphere.comp @@ -224,7 +224,7 @@ if (xwidth && yheight && zdepth) TRACE %{ - double l0, l1, k, l_full, l, dl, d_Phi, theta; + double l0, l1, k, l_full, l, dl, d_Phi; double aim_x=0, aim_y=0, aim_z=1, axis_x, axis_y, axis_z; double f, solid_angle, kx_i, ky_i, kz_i, q, qx, qy, qz; char intersect=0; diff --git a/mcxtrace-comps/sasmodels/SasView_spinodal.comp b/mcxtrace-comps/sasmodels/SasView_spinodal.comp index 32f82cbe1a..19c2aee9a4 100644 --- a/mcxtrace-comps/sasmodels/SasView_spinodal.comp +++ b/mcxtrace-comps/sasmodels/SasView_spinodal.comp @@ -144,7 +144,7 @@ if (xwidth && yheight && zdepth) TRACE %{ - double l0, l1, k, l_full, l, dl, d_Phi, theta; + double l0, l1, k, l_full, l, dl, d_Phi; double aim_x=0, aim_y=0, aim_z=1, axis_x, axis_y, axis_z; double f, solid_angle, kx_i, ky_i, kz_i, q, qx, qy, qz; char intersect=0; diff --git a/mcxtrace-comps/sasmodels/SasView_squarewell.comp b/mcxtrace-comps/sasmodels/SasView_squarewell.comp index 0f942c6915..5790b375cd 100644 --- a/mcxtrace-comps/sasmodels/SasView_squarewell.comp +++ b/mcxtrace-comps/sasmodels/SasView_squarewell.comp @@ -184,7 +184,7 @@ if (xwidth && yheight && zdepth) TRACE %{ - double l0, l1, k, l_full, l, dl, d_Phi, theta; + double l0, l1, k, l_full, l, dl, d_Phi; double aim_x=0, aim_y=0, aim_z=1, axis_x, axis_y, axis_z; double f, solid_angle, kx_i, ky_i, kz_i, q, qx, qy, qz; char intersect=0; diff --git a/mcxtrace-comps/sasmodels/SasView_stacked_disks.comp b/mcxtrace-comps/sasmodels/SasView_stacked_disks.comp index 4165174746..aacd054739 100644 --- a/mcxtrace-comps/sasmodels/SasView_stacked_disks.comp +++ b/mcxtrace-comps/sasmodels/SasView_stacked_disks.comp @@ -863,7 +863,7 @@ if (xwidth && yheight && zdepth) TRACE %{ - double l0, l1, k, l_full, l, dl, d_Phi, theta; + double l0, l1, k, l_full, l, dl, d_Phi; double aim_x=0, aim_y=0, aim_z=1, axis_x, axis_y, axis_z; double f, solid_angle, kx_i, ky_i, kz_i, q, qx, qy, qz; char intersect=0; diff --git a/mcxtrace-comps/sasmodels/SasView_stacked_disks_aniso.comp b/mcxtrace-comps/sasmodels/SasView_stacked_disks_aniso.comp index 0978c25438..931dead4f7 100644 --- a/mcxtrace-comps/sasmodels/SasView_stacked_disks_aniso.comp +++ b/mcxtrace-comps/sasmodels/SasView_stacked_disks_aniso.comp @@ -869,7 +869,7 @@ if (xwidth && yheight && zdepth) TRACE %{ - double l0, l1, k, l_full, l, dl, d_Phi, theta; + double l0, l1, k, l_full, l, dl, d_Phi; double aim_x=0, aim_y=0, aim_z=1, axis_x, axis_y, axis_z; double f, solid_angle, kx_i, ky_i, kz_i, q, qx, qy, qz; char intersect=0; diff --git a/mcxtrace-comps/sasmodels/SasView_star_polymer.comp b/mcxtrace-comps/sasmodels/SasView_star_polymer.comp index 8b5d821a12..3d813d8b37 100644 --- a/mcxtrace-comps/sasmodels/SasView_star_polymer.comp +++ b/mcxtrace-comps/sasmodels/SasView_star_polymer.comp @@ -162,7 +162,7 @@ if (xwidth && yheight && zdepth) TRACE %{ - double l0, l1, k, l_full, l, dl, d_Phi, theta; + double l0, l1, k, l_full, l, dl, d_Phi; double aim_x=0, aim_y=0, aim_z=1, axis_x, axis_y, axis_z; double f, solid_angle, kx_i, ky_i, kz_i, q, qx, qy, qz; char intersect=0; diff --git a/mcxtrace-comps/sasmodels/SasView_stickyhardsphere.comp b/mcxtrace-comps/sasmodels/SasView_stickyhardsphere.comp index 9e5f16baef..f9fbd7a12c 100644 --- a/mcxtrace-comps/sasmodels/SasView_stickyhardsphere.comp +++ b/mcxtrace-comps/sasmodels/SasView_stickyhardsphere.comp @@ -205,7 +205,7 @@ if (xwidth && yheight && zdepth) TRACE %{ - double l0, l1, k, l_full, l, dl, d_Phi, theta; + double l0, l1, k, l_full, l, dl, d_Phi; double aim_x=0, aim_y=0, aim_z=1, axis_x, axis_y, axis_z; double f, solid_angle, kx_i, ky_i, kz_i, q, qx, qy, qz; char intersect=0; diff --git a/mcxtrace-comps/sasmodels/SasView_superball.comp b/mcxtrace-comps/sasmodels/SasView_superball.comp index 092953ebdf..76f8c87d94 100644 --- a/mcxtrace-comps/sasmodels/SasView_superball.comp +++ b/mcxtrace-comps/sasmodels/SasView_superball.comp @@ -533,7 +533,7 @@ if (xwidth && yheight && zdepth) TRACE %{ - double l0, l1, k, l_full, l, dl, d_Phi, theta; + double l0, l1, k, l_full, l, dl, d_Phi; double aim_x=0, aim_y=0, aim_z=1, axis_x, axis_y, axis_z; double f, solid_angle, kx_i, ky_i, kz_i, q, qx, qy, qz; char intersect=0; diff --git a/mcxtrace-comps/sasmodels/SasView_superball_aniso.comp b/mcxtrace-comps/sasmodels/SasView_superball_aniso.comp index d88c41cce1..dbb27519f3 100644 --- a/mcxtrace-comps/sasmodels/SasView_superball_aniso.comp +++ b/mcxtrace-comps/sasmodels/SasView_superball_aniso.comp @@ -542,7 +542,7 @@ if (xwidth && yheight && zdepth) TRACE %{ - double l0, l1, k, l_full, l, dl, d_Phi, theta; + double l0, l1, k, l_full, l, dl, d_Phi; double aim_x=0, aim_y=0, aim_z=1, axis_x, axis_y, axis_z; double f, solid_angle, kx_i, ky_i, kz_i, q, qx, qy, qz; char intersect=0; diff --git a/mcxtrace-comps/sasmodels/SasView_surface_fractal.comp b/mcxtrace-comps/sasmodels/SasView_surface_fractal.comp index 90eff2c717..ad710592a3 100644 --- a/mcxtrace-comps/sasmodels/SasView_surface_fractal.comp +++ b/mcxtrace-comps/sasmodels/SasView_surface_fractal.comp @@ -416,7 +416,7 @@ if (xwidth && yheight && zdepth) TRACE %{ - double l0, l1, k, l_full, l, dl, d_Phi, theta; + double l0, l1, k, l_full, l, dl, d_Phi; double aim_x=0, aim_y=0, aim_z=1, axis_x, axis_y, axis_z; double f, solid_angle, kx_i, ky_i, kz_i, q, qx, qy, qz; char intersect=0; diff --git a/mcxtrace-comps/sasmodels/SasView_teubner_strey.comp b/mcxtrace-comps/sasmodels/SasView_teubner_strey.comp index c9b6fdeec8..c6964bd9ea 100644 --- a/mcxtrace-comps/sasmodels/SasView_teubner_strey.comp +++ b/mcxtrace-comps/sasmodels/SasView_teubner_strey.comp @@ -157,7 +157,7 @@ if (xwidth && yheight && zdepth) TRACE %{ - double l0, l1, k, l_full, l, dl, d_Phi, theta; + double l0, l1, k, l_full, l, dl, d_Phi; double aim_x=0, aim_y=0, aim_z=1, axis_x, axis_y, axis_z; double f, solid_angle, kx_i, ky_i, kz_i, q, qx, qy, qz; char intersect=0; diff --git a/mcxtrace-comps/sasmodels/SasView_triaxial_ellipsoid.comp b/mcxtrace-comps/sasmodels/SasView_triaxial_ellipsoid.comp index 7ef97c4817..bcb0fa3741 100644 --- a/mcxtrace-comps/sasmodels/SasView_triaxial_ellipsoid.comp +++ b/mcxtrace-comps/sasmodels/SasView_triaxial_ellipsoid.comp @@ -548,7 +548,7 @@ if (xwidth && yheight && zdepth) TRACE %{ - double l0, l1, k, l_full, l, dl, d_Phi, theta; + double l0, l1, k, l_full, l, dl, d_Phi; double aim_x=0, aim_y=0, aim_z=1, axis_x, axis_y, axis_z; double f, solid_angle, kx_i, ky_i, kz_i, q, qx, qy, qz; char intersect=0; diff --git a/mcxtrace-comps/sasmodels/SasView_triaxial_ellipsoid_aniso.comp b/mcxtrace-comps/sasmodels/SasView_triaxial_ellipsoid_aniso.comp index 4c69ff21b3..596e346d58 100644 --- a/mcxtrace-comps/sasmodels/SasView_triaxial_ellipsoid_aniso.comp +++ b/mcxtrace-comps/sasmodels/SasView_triaxial_ellipsoid_aniso.comp @@ -557,7 +557,7 @@ if (xwidth && yheight && zdepth) TRACE %{ - double l0, l1, k, l_full, l, dl, d_Phi, theta; + double l0, l1, k, l_full, l, dl, d_Phi; double aim_x=0, aim_y=0, aim_z=1, axis_x, axis_y, axis_z; double f, solid_angle, kx_i, ky_i, kz_i, q, qx, qy, qz; char intersect=0; diff --git a/mcxtrace-comps/sasmodels/SasView_two_lorentzian.comp b/mcxtrace-comps/sasmodels/SasView_two_lorentzian.comp index 96301e2392..5c124a56b9 100644 --- a/mcxtrace-comps/sasmodels/SasView_two_lorentzian.comp +++ b/mcxtrace-comps/sasmodels/SasView_two_lorentzian.comp @@ -168,7 +168,7 @@ if (xwidth && yheight && zdepth) TRACE %{ - double l0, l1, k, l_full, l, dl, d_Phi, theta; + double l0, l1, k, l_full, l, dl, d_Phi; double aim_x=0, aim_y=0, aim_z=1, axis_x, axis_y, axis_z; double f, solid_angle, kx_i, ky_i, kz_i, q, qx, qy, qz; char intersect=0; diff --git a/mcxtrace-comps/sasmodels/SasView_two_power_law.comp b/mcxtrace-comps/sasmodels/SasView_two_power_law.comp index 3e018cf891..dfa887fabb 100644 --- a/mcxtrace-comps/sasmodels/SasView_two_power_law.comp +++ b/mcxtrace-comps/sasmodels/SasView_two_power_law.comp @@ -155,7 +155,7 @@ if (xwidth && yheight && zdepth) TRACE %{ - double l0, l1, k, l_full, l, dl, d_Phi, theta; + double l0, l1, k, l_full, l, dl, d_Phi; double aim_x=0, aim_y=0, aim_z=1, axis_x, axis_y, axis_z; double f, solid_angle, kx_i, ky_i, kz_i, q, qx, qy, qz; char intersect=0; diff --git a/mcxtrace-comps/sasmodels/SasView_vesicle.comp b/mcxtrace-comps/sasmodels/SasView_vesicle.comp index 895f073f13..2d789cb64d 100644 --- a/mcxtrace-comps/sasmodels/SasView_vesicle.comp +++ b/mcxtrace-comps/sasmodels/SasView_vesicle.comp @@ -271,7 +271,7 @@ if (xwidth && yheight && zdepth) TRACE %{ - double l0, l1, k, l_full, l, dl, d_Phi, theta; + double l0, l1, k, l_full, l, dl, d_Phi; double aim_x=0, aim_y=0, aim_z=1, axis_x, axis_y, axis_z; double f, solid_angle, kx_i, ky_i, kz_i, q, qx, qy, qz; char intersect=0;