Merge pull request #2327 from willend/format-optics

Format McXtrace optics

Author: willend

mcxtrace-comps/optics/Arm.comp

@@ -68,16 +68,14 @@ FINALLY
 MCDISPLAY
 %{
   /* A bit ugly; hard-coded dimensions. */
-  
-  line(0,0,0,0.2,0,0);
-  line(0,0,0,0,0.2,0);
-  line(0,0,0,0,0,0.2);
 
+  line (0, 0, 0, 0.2, 0, 0);
+  line (0, 0, 0, 0, 0.2, 0);
+  line (0, 0, 0, 0, 0, 0.2);
 
-  cone(0.2,0,0,0.01,0.02,1,0,0);
-  cone(0,0.2,0,0.01,0.02,0,1,0);
-  cone(0,0,0.2,0.01,0.02,0,0,1);
-
+  cone (0.2, 0, 0, 0.01, 0.02, 1, 0, 0);
+  cone (0, 0.2, 0, 0.01, 0.02, 0, 1, 0);
+  cone (0, 0, 0.2, 0.01, 0.02, 0, 0, 1);
 %}
 
 END

mcxtrace-comps/optics/Beamstop.comp

@@ -50,38 +50,42 @@ SETTING PARAMETERS (xmin=-0.05, xmax=0.05, ymin=-0.05, ymax=0.05,
 
 INITIALIZE
 %{
-  if (xwidth  > 0) { xmax = xwidth/2;  xmin = -xmax; }
-  if (yheight > 0) { ymax = yheight/2; ymin = -ymax; }
-  
-  if (xmin == 0 && xmax == 0 && ymin == 0 & ymax == 0 && radius == 0)
-  { fprintf(stderr,"Beamstop: %s: Error: give geometry\n", NAME_CURRENT_COMP); exit(-1); }
+  if (xwidth > 0) {
+    xmax = xwidth / 2;
+    xmin = -xmax;
+  }
+  if (yheight > 0) {
+    ymax = yheight / 2;
+    ymin = -ymax;
+  }
+
+  if (xmin == 0 && xmax == 0 && ymin == 0 & ymax == 0 && radius == 0) {
+    fprintf (stderr, "Beamstop: %s: Error: give geometry\n", NAME_CURRENT_COMP);
+    exit (-1);
+  }
 %}
 
 TRACE
 %{
-    double dz,z0=z;
-    ALLOW_BACKPROP;
-    PROP_Z0;
-    dz=z-z0;/*dz<0 means photon must travel backwards to hit beamstop*/
-    if ( ((dz>=0) && ((radius!=0) && (x*x + y*y <= radius*radius)))
-        || ((dz>=0) && (radius==0) && (x>xmin && x<xmax && y>ymin && y<ymax)) ){
-      SCATTER;
-      ABSORB;
-    } else {
-      RESTORE_XRAY(INDEX_CURRENT_COMP, x, y, z, kx, ky, kz, phi, t, Ex, Ey, Ez, p);
-    }
+  double dz, z0 = z;
+  ALLOW_BACKPROP;
+  PROP_Z0;
+  dz = z - z0; /*dz<0 means photon must travel backwards to hit beamstop*/
+  if (((dz >= 0) && ((radius != 0) && (x * x + y * y <= radius * radius))) || ((dz >= 0) && (radius == 0) && (x > xmin && x < xmax && y > ymin && y < ymax))) {
+    SCATTER;
+    ABSORB;
+  } else {
+    RESTORE_XRAY (INDEX_CURRENT_COMP, x, y, z, kx, ky, kz, phi, t, Ex, Ey, Ez, p);
+  }
 %}
 
 MCDISPLAY
 %{
-  
+
   if (radius != 0)
-    circle("xy", 0, 0, 0, radius);
+    circle ("xy", 0, 0, 0, radius);
   else
-    multiline(5, (double)xmin, (double)ymin, 0.0,
-               (double)xmax, (double)ymin, 0.0,
-               (double)xmax, (double)ymax, 0.0,
-               (double)xmin, (double)ymax, 0.0,
+    multiline (5, (double)xmin, (double)ymin, 0.0, (double)xmax, (double)ymin, 0.0, (double)xmax, (double)ymax, 0.0, (double)xmin, (double)ymax, 0.0,
                (double)xmin, (double)ymin, 0.0);
 %}