Changeset 3228

Timestamp:

12/15/11 17:03:34 (5 months ago)

Author:

erkn

Message:

checks for mcxtrace or mcstas

The calcualtion block of code now checks for the existance of
RESTORE_NEUTRON or RESTORE_XRAY. They are mutually exclusive and
available at compile time, so can be used as a flag for mcstas/mcxtrace.
This to avoid code duplication

Files:

• trunk/lib/share/monitor_nd-lib.c (modified) (4 diffs)

trunk/lib/share/monitor_nd-lib.c

@@ -798 +798 @@
     }
     if (Vars->Flag_Auto_Limits != 2 || !Vars->Coord_Number) /* Vars->Flag_Auto_Limits == 0 (no auto limits/list) or 1 (store events into Buffer) */
-#if MCCODE_PARTICULE==neutron
-    {/*{{{*/
+    {
+#if defined ( RESTORE_NEUTRON )
+    /*{{{*/
       /* automatically compute area and steradian solid angle when in AUTO mode */
       /* compute the steradian solid angle incoming on the monitor */
@@ -926 +927 @@
       } /* end for i */
       While_End = 1;
-    }/* end else if Vars->Flag_Auto_Limits == 2 *//*}}}*/
-#elif MCCODE_PARTICULE==Xray
+      /*}}}*/    
+#elif defined ( RESTORE_XRAY )
       /* compute values - this is somewhat different for xrays in some cases.*/
-    {/*{{{*/
+      /*{{{*/
       /* automatically compute area and steradian solid angle when in AUTO mode */
       /* compute the steradian solid angle incoming on the monitor */
@@ -941 +942 @@
       if (Vars->max_y < Vars->cy) Vars->max_y = Vars->cy;
       Vars->mean_p  += Vars->cp;
-      if (v) {
-        Vars->mean_dx += Vars->cp*fabs(Vars->cvx/v);
-        Vars->mean_dy += Vars->cp*fabs(Vars->cvy/v);
+      if (k) {
+        Vars->mean_dx += Vars->cp*fabs(Vars->ckx/k);
+        Vars->mean_dy += Vars->cp*fabs(Vars->cky/k);
       }
       Vars->area =(Vars->max_x-Vars->min_x)
@@ -1060 +1061 @@
         } /* else will get Index later from Buffer when Flag_Auto_Limits == 2 */
       } /* end for i */
+      /*}}}*/
       While_End = 1;
-    }/* end else if Vars->Flag_Auto_Limits == 2 *//*}}}*/
 #endif
+    }/* end else if Vars->Flag_Auto_Limits == 2 */
 
     if (Vars->Flag_Auto_Limits != 2) /* not when reading auto limits Buffer */