Changeset 3207

Timestamp:

11/18/11 12:16:26 (6 months ago)

Author:

farhi

Message:

monitor_nD: fixed per_cm2 and per_steradian options which may have caused spikes

Location:

trunk/lib/share

Files:

• monitor_nd-lib.c (modified) (9 diffs)
• monitor_nd-lib.h (modified) (2 diffs)

trunk/lib/share/monitor_nd-lib.c

@@ -140 +140 @@
     Vars->Flag_Exclusive    = 0;   /* absorb neutrons out of monitor limits */
     Vars->Flag_per_cm2      = 0;   /* flux is per cm2 */
-    Vars->Flag_per_st       = 0;   /* flux is per steradian (in Auto mode only) */
     Vars->Flag_log          = 0;   /* log10 of the flux */
     Vars->Flag_parallel     = 0;   /* set neutron state back after detection (parallel components) */
@@ -157 +156 @@
     Vars->min_x = Vars->max_x  =0;
     Vars->min_y = Vars->max_y  =0;
-    Vars->steradian=0;
 
     Set_Vars_Coord_Type = DEFS->COORD_NONE;
@@ -205 +203 @@
 
     if (strstr(Vars->option, "cm2") || strstr(Vars->option, "cm^2")) Vars->Flag_per_cm2 = 1;
-    if (strstr(Vars->option, "steradian")) Vars->Flag_per_st = 1;
 
     if (strstr(Vars->option, "binary") || strstr(Vars->option, "float"))
@@ -356 +353 @@
             strncat(Set_Vars_Coord_Label, " [n/s", 30);
             if (Vars->Flag_per_cm2) strncat(Set_Vars_Coord_Label, "/cm2", 30);
-            if (Vars->Flag_per_st) {
-              if (Vars->Flag_Auto_Limits)
-                strncat(Set_Vars_Coord_Label, "/sr", 30);
-            }
             if (XY > 1 && Vars->Coord_Number)
               strncat(Set_Vars_Coord_Label, "/bin", 30);
@@ -571 +564 @@
       strncat(Vars->Coord_Label[0], " [n/s", 30);
       if (Vars->Flag_per_cm2) strncat(Vars->Coord_Label[0], "/cm2", 30);
-      if (Vars->Flag_per_st) {
-        if (Vars->Flag_Auto_Limits)
-          strncat(Vars->Coord_Label[0], "/sr", 30);
-        else
-          printf("Monitor_nD: %s: Flux per steradian requires Auto limits mode\n"
-                 "WARNING     use options=\"... auto ...\". Unactivating this option.\n", Vars->compcurname);
-      }
+      
       if (XY > 1 && Vars->Coord_Number)
         strncat(Vars->Coord_Label[0], "/bin", 30);
@@ -827 +814 @@
         Vars->mean_dy += Vars->cp*fabs(Vars->cvy/v);
       }
-      Vars->area =(Vars->max_x-Vars->min_x)
-                       *(Vars->max_y-Vars->min_y)*1E4; /* cm2 */
-      if (Vars->Flag_per_st)
-      Vars->steradian = 2*fabs(2*atan(Vars->mean_dx/Vars->mean_p)
-                                *sin(2*atan(Vars->mean_dy/Vars->mean_p)/2));
         
       for (i = 0; i <= Vars->Coord_Number; i++)
@@ -967 +949 @@
       if (Vars->Flag_per_cm2 && Vars->area      != 0)
         pp /= Vars->area;
-      if (Vars->Flag_per_st  && Vars->steradian != 0)
-        pp /= Vars->steradian;
 
       /* 1D and n1D case : Vars->Flag_Multiple */
@@ -1043 +1023 @@
 
     ratio = 100.0*mcget_run_num()/mcget_ncount();
-    if (Vars->Flag_per_cm2 && Vars->area && Vars->Flag_Verbose)
-      printf("Monitor_nD: %s: detector area is %g [cm2]\n",
-        Vars->compcurname, Vars->area);
-    if (Vars->Flag_per_st && Vars->steradian && Vars->Flag_Verbose)
-      printf("Monitor_nD: %s: beam solid angle is %g [st] (%g x %g [deg2])\n",
-        Vars->compcurname, Vars->steradian,
+    if (Vars->Flag_Verbose || Vars->Flag_per_cm2) {
+      printf("Monitor_nD: %s: active flat detector area is %g [cm^2], total area is %g [cm^2]\n",
+        Vars->compcurname, (Vars->max_x-Vars->min_x)
+                          *(Vars->max_y-Vars->min_y)*1E4, Vars->area);
+      printf("Monitor_nD: %s: beam solid angle is %g [st] (%g x %g [deg^2])\n",
+        Vars->compcurname, 
+        2*fabs(2*atan(Vars->mean_dx/Vars->mean_p)
+         *sin(2*atan(Vars->mean_dy/Vars->mean_p)/2)),
         atan(Vars->mean_dx/Vars->mean_p)*RAD2DEG,
         atan(Vars->mean_dy/Vars->mean_p)*RAD2DEG);
+    }
 
     /* check Buffer flush when end of simulation reached */
@@ -1112 +1095 @@
         if (Vars->Flag_per_cm2 && Vars->area      != 0)
           pp /= Vars->area;
-        if (Vars->Flag_per_st  && Vars->steradian != 0)
-          pp /= Vars->steradian;
 
         /* 1D and n1D case : Vars->Flag_Multiple */

trunk/lib/share/monitor_nd-lib.h

@@ -96 +96 @@
   typedef struct MonitornD_Variables
   {
-    double area, steradian;
+    double area;
     double Sphere_Radius     ;
     double Cylinder_Height   ;
@@ -108 +108 @@
     char   Flag_Exclusive    ;   /* absorb neutrons out of monitor limits */
     char   Flag_per_cm2      ;   /* flux is per cm2 */
-    char   Flag_per_st       ;   /* flux is per steradian */
     char   Flag_log          ;   /* log10 of the flux */
     char   Flag_parallel     ;   /* set neutron state back after detection (parallel components) */