Minor fix to the McXtrace sasmodels generator: There should be no "th…

…eta" var in TRACE, defined elsewhere.
McStasMcXtrace · Feb 13, 2024 · 3e9d3f3 · 3e9d3f3
1 parent eb708cb
commit 3e9d3f3
Show file tree

Hide file tree

Showing 94 changed files with 94 additions and 100 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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;