Merge pull request #2329 from willend/format-sasmodels

Format McXtrace sasmodels

Author: willend

mcxtrace-comps/sasmodels/SasView_adsorbed_layer.comp

@@ -139,115 +139,107 @@ double Iq_adsorbed_layer(
 
 INITIALIZE
 %{
-shape=-1;  /* -1:no shape, 0:cyl, 1:box, 2:sphere  */
-if (xwidth && yheight && zdepth)
-    shape=1;
+  shape = -1; /* -1:no shape, 0:cyl, 1:box, 2:sphere  */
+  if (xwidth && yheight && zdepth)
+    shape = 1;
   else if (R > 0 && yheight)
-    shape=0;
+    shape = 0;
   else if (R > 0 && !yheight)
-    shape=2;
+    shape = 2;
   if (shape < 0)
-    exit(fprintf(stderr, "SasView_model: %s: sample has invalid dimensions.\n"
-                         "ERROR     Please check parameter values.\n", NAME_CURRENT_COMP));
+    exit (fprintf (stderr,
+                   "SasView_model: %s: sample has invalid dimensions.\n"
+                   "ERROR     Please check parameter values.\n",
+                   NAME_CURRENT_COMP));
 
   /* now compute target coords if a component index is supplied */
-  if (!target_index && !target_x && !target_y && !target_z) target_index=1;
-  if (target_index)
-  {
+  if (!target_index && !target_x && !target_y && !target_z)
+    target_index = 1;
+  if (target_index) {
     Coords ToTarget;
-    ToTarget = coords_sub(POS_A_COMP_INDEX(INDEX_CURRENT_COMP+target_index),POS_A_CURRENT_COMP);
-    ToTarget = rot_apply(ROT_A_CURRENT_COMP, ToTarget);
-    coords_get(ToTarget, &target_x, &target_y, &target_z);
+    ToTarget = coords_sub (POS_A_COMP_INDEX (INDEX_CURRENT_COMP + target_index), POS_A_CURRENT_COMP);
+    ToTarget = rot_apply (ROT_A_CURRENT_COMP, ToTarget);
+    coords_get (ToTarget, &target_x, &target_y, &target_z);
   }
 
   if (!(target_x || target_y || target_z)) {
-    printf("SasView_model: %s: The target is not defined. Using direct beam (Z-axis).\n",
-      NAME_CURRENT_COMP);
-    target_z=1;
+    printf ("SasView_model: %s: The target is not defined. Using direct beam (Z-axis).\n", NAME_CURRENT_COMP);
+    target_z = 1;
   }
 
   /*TODO fix absorption*/
   my_a_k = model_abs; /* assume absorption is given in 1/m */
-
 %}
 
 
 TRACE
 %{
   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 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;
+  char intersect = 0;
 
   /* Intersection photon trajectory / sample (sample surface) */
-  if (shape == 0){
-    intersect = cylinder_intersect(&l0, &l1, x, y, z, kx, ky, kz, R, yheight);}
-  else if (shape == 1){
-    intersect = box_intersect(&l0, &l1, x, y, z, kx, ky, kz, xwidth, yheight, zdepth);}
-  else if (shape == 2){
-    intersect = sphere_intersect(&l0, &l1, x, y, z, kx, ky, kz, R);}
-  if(intersect)
-  {
-    if(l0 < 0)
+  if (shape == 0) {
+    intersect = cylinder_intersect (&l0, &l1, x, y, z, kx, ky, kz, R, yheight);
+  } else if (shape == 1) {
+    intersect = box_intersect (&l0, &l1, x, y, z, kx, ky, kz, xwidth, yheight, zdepth);
+  } else if (shape == 2) {
+    intersect = sphere_intersect (&l0, &l1, x, y, z, kx, ky, kz, R);
+  }
+  if (intersect) {
+    if (l0 < 0)
       ABSORB;
 
     /* Photon enters at l0. */
-    k = sqrt(kx*kx + ky*ky + kz*kz);
-    l_full = (l1 - l0);          /* Length of full path through sample */
-    dl = rand01()*(l1 - l0) + l0;    /* Point of scattering */
-    PROP_DL(dl);                     /* Point of scattering */
-    l = (dl-l0);                   /* Penetration in sample */
-
-    kx_i=kx;
-    ky_i=ky;
-    kz_i=kz;
+    k = sqrt (kx * kx + ky * ky + kz * kz);
+    l_full = (l1 - l0);              /* Length of full path through sample */
+    dl = rand01 () * (l1 - l0) + l0; /* Point of scattering */
+    PROP_DL (dl);                    /* Point of scattering */
+    l = (dl - l0);                   /* Penetration in sample */
+
+    kx_i = kx;
+    ky_i = ky;
+    kz_i = kz;
     if ((target_x || target_y || target_z)) {
-      aim_x = target_x-x;            /* Vector pointing at target (anal./det.) */
-      aim_y = target_y-y;
-      aim_z = target_z-z;
+      aim_x = target_x - x; /* Vector pointing at target (anal./det.) */
+      aim_y = target_y - y;
+      aim_z = target_z - z;
     }
-    if(focus_aw && focus_ah) {
-      randvec_target_rect_angular(&kx, &ky, &kz, &solid_angle,
-        aim_x, aim_y, aim_z, focus_aw, focus_ah, ROT_A_CURRENT_COMP);
-    } else if(focus_xw && focus_yh) {
-      randvec_target_rect(&kx, &ky, &kz, &solid_angle,
-        aim_x, aim_y, aim_z, focus_xw, focus_yh, ROT_A_CURRENT_COMP);
+    if (focus_aw && focus_ah) {
+      randvec_target_rect_angular (&kx, &ky, &kz, &solid_angle, aim_x, aim_y, aim_z, focus_aw, focus_ah, ROT_A_CURRENT_COMP);
+    } else if (focus_xw && focus_yh) {
+      randvec_target_rect (&kx, &ky, &kz, &solid_angle, aim_x, aim_y, aim_z, focus_xw, focus_yh, ROT_A_CURRENT_COMP);
     } else {
-      randvec_target_circle(&kx, &ky, &kz, &solid_angle, aim_x, aim_y, aim_z, focus_r);
+      randvec_target_circle (&kx, &ky, &kz, &solid_angle, aim_x, aim_y, aim_z, focus_r);
     }
-    NORM(kx, ky, kz);
+    NORM (kx, ky, kz);
     kx *= k;
     ky *= k;
     kz *= k;
-    qx = (kx_i-kx);
-    qy = (ky_i-ky);
-    qz = (kz_i-kz);
-    q = sqrt(qx*qx+qy*qy+qz*qz);
-    
-    double trace_radius=radius;
-    if ( pd_radius!=0.0 ){
-    trace_radius = (randnorm()*pd_radius+1.0)*radius;
+    qx = (kx_i - kx);
+    qy = (ky_i - ky);
+    qz = (kz_i - kz);
+    q = sqrt (qx * qx + qy * qy + qz * qz);
+
+    double trace_radius = radius;
+    if (pd_radius != 0.0) {
+      trace_radius = (randnorm () * pd_radius + 1.0) * radius;
     }
 
-        
-
-
     // Sample dependent. Retrieved from SasView./////////////////////
     float Iq_out;
     Iq_out = 1;
 
-    Iq_out = Iq_adsorbed_layer(q, second_moment, adsorbed_amount, density_shell, trace_radius, volfraction, sld_shell, sld_solvent);
-
+    Iq_out = Iq_adsorbed_layer (q, second_moment, adsorbed_amount, density_shell, trace_radius, volfraction, sld_shell, sld_solvent);
 
     float vol;
     vol = 1;
 
     // Scale by 1.0E2 [SasView: 1/cm  ->   McXtrace: 1/m]
-    Iq_out = model_scale*Iq_out / vol * 1.0E2;
-
-    
-    p *= l_full*solid_angle/(4*PI)*Iq_out*exp(-my_a_k*(l+l1));
+    Iq_out = model_scale * Iq_out / vol * 1.0E2;
 
+    p *= l_full * solid_angle / (4 * PI) * Iq_out * exp (-my_a_k * (l + l1));
 
     SCATTER;
   }
@@ -256,40 +248,30 @@ TRACE
 MCDISPLAY
 %{
 
-  if (shape == 0) {	/* cylinder */
-    circle("xz", 0,  yheight/2.0, 0, R);
-    circle("xz", 0, -yheight/2.0, 0, R);
-    line(-R, -yheight/2.0, 0, -R, +yheight/2.0, 0);
-    line(+R, -yheight/2.0, 0, +R, +yheight/2.0, 0);
-    line(0, -yheight/2.0, -R, 0, +yheight/2.0, -R);
-    line(0, -yheight/2.0, +R, 0, +yheight/2.0, +R);
-  }
-  else if (shape == 1) { 	/* box */
-    double xmin = -0.5*xwidth;
-    double xmax =  0.5*xwidth;
-    double ymin = -0.5*yheight;
-    double ymax =  0.5*yheight;
-    double zmin = -0.5*zdepth;
-    double zmax =  0.5*zdepth;
-    multiline(5, xmin, ymin, zmin,
-                 xmax, ymin, zmin,
-                 xmax, ymax, zmin,
-                 xmin, ymax, zmin,
-                 xmin, ymin, zmin);
-    multiline(5, xmin, ymin, zmax,
-                 xmax, ymin, zmax,
-                 xmax, ymax, zmax,
-                 xmin, ymax, zmax,
-                 xmin, ymin, zmax);
-    line(xmin, ymin, zmin, xmin, ymin, zmax);
-    line(xmax, ymin, zmin, xmax, ymin, zmax);
-    line(xmin, ymax, zmin, xmin, ymax, zmax);
-    line(xmax, ymax, zmin, xmax, ymax, zmax);
-  }
-  else if (shape == 2) {	/* sphere */
-    circle("xy", 0,  0.0, 0, R);
-    circle("xz", 0,  0.0, 0, R);
-    circle("yz", 0,  0.0, 0, R);
+  if (shape == 0) { /* cylinder */
+    circle ("xz", 0, yheight / 2.0, 0, R);
+    circle ("xz", 0, -yheight / 2.0, 0, R);
+    line (-R, -yheight / 2.0, 0, -R, +yheight / 2.0, 0);
+    line (+R, -yheight / 2.0, 0, +R, +yheight / 2.0, 0);
+    line (0, -yheight / 2.0, -R, 0, +yheight / 2.0, -R);
+    line (0, -yheight / 2.0, +R, 0, +yheight / 2.0, +R);
+  } else if (shape == 1) { /* box */
+    double xmin = -0.5 * xwidth;
+    double xmax = 0.5 * xwidth;
+    double ymin = -0.5 * yheight;
+    double ymax = 0.5 * yheight;
+    double zmin = -0.5 * zdepth;
+    double zmax = 0.5 * zdepth;
+    multiline (5, xmin, ymin, zmin, xmax, ymin, zmin, xmax, ymax, zmin, xmin, ymax, zmin, xmin, ymin, zmin);
+    multiline (5, xmin, ymin, zmax, xmax, ymin, zmax, xmax, ymax, zmax, xmin, ymax, zmax, xmin, ymin, zmax);
+    line (xmin, ymin, zmin, xmin, ymin, zmax);
+    line (xmax, ymin, zmin, xmax, ymin, zmax);
+    line (xmin, ymax, zmin, xmin, ymax, zmax);
+    line (xmax, ymax, zmin, xmax, ymax, zmax);
+  } else if (shape == 2) { /* sphere */
+    circle ("xy", 0, 0.0, 0, R);
+    circle ("xz", 0, 0.0, 0, R);
+    circle ("yz", 0, 0.0, 0, R);
   }
 %}
 END