Changeset 3206

Timestamp:

11/17/11 10:05:42 (6 months ago)

Author:

farhi

Message:

nlib/optics: set R=1 when reflectivity is >1 in monochromators and Guide_anyshape.
Fix minor stuff in mcplot.py and typos.

Location:

trunk

Files:

• nlib/contrib/Monochromator_2foc.comp (modified) (3 diffs)
• nlib/optics/Guide_anyshape.comp (modified) (1 diff)
• nlib/optics/Monochromator_curved.comp (modified) (3 diffs)
• nlib/optics/Monochromator_flat.comp (modified) (1 diff)
• nlib/optics/Monochromator_pol.comp (modified) (1 diff)
• src/mcplot.py (modified) (1 diff)

trunk/nlib/contrib/Monochromator_2foc.comp

@@ -133 +133 @@
   if (reflect != NULL)
   {
-    if (verbose) fprintf(stdout, "Monochromator_2foc : %s : Reflectivity data (k, R)\n", NAME_CURRENT_COMP);
+    if (verbose) fprintf(stdout, "Monochromator_2foc: %s : Reflectivity data (k, R)\n", NAME_CURRENT_COMP);
     Table_Read(&rTable, reflect, 1); /* read 1st block data from file into rTable */
     Table_Rebin(&rTable);         /* rebin as evenly, increasing array */
@@ -214 +214 @@
         if (my_r0 >= 1)
         {
-          if (verbose) fprintf(stdout, "Warning: Monochromator_2foc : lowered reflectivity from %f to 0.99 (k=%f)\n", my_r0, k);
+          if (verbose) fprintf(stdout, "Warning: Monochromator_2foc: %s: lowered reflectivity from %f to 0.99 (k=%f)\n", 
+            NAME_CURRENT_COMP, my_r0, k);
           my_r0=0.99;
         }
         if (my_r0 < 0)
         {
-          if (verbose) fprintf(stdout, "Warning: Monochromator_2foc : raised reflectivity from %f to 0 (k=%f)\n", my_r0, k);
+          if (verbose) fprintf(stdout, "Warning: Monochromator_2foc: %s: raised reflectivity from %f to 0 (k=%f)\n", 
+          NAME_CURRENT_COMP, my_r0, k);
           my_r0=0;
         }
@@ -226 +228 @@
         z = z1;
         t = t1;
-
-        p *= fabs(my_r0)*exp(-tmp3*tmp3*4*log(2)); /* Use mosaics */
+        
+        /* reflectivity */
+        t1 = fabs(my_r0)*exp(-tmp3*tmp3*4*log(2));
+        if (t1 <= 0) ABSORB;
+        if (t1 > 1)  t1 = 1;
+        p *= t1; /* Use mosaics */
+        
         tmp1 = 2*theta;
         cs = cos(tmp1);

trunk/nlib/optics/Guide_anyshape.comp

@@ -150 +150 @@
 
     if (R <= 0) ABSORB;
+    if (R > 1) {
+      fprintf(stderr,"Guide_anyshape: %s: Warning: Reflectivity R=%g > 1 lowered to R=1.\n", NAME_CURRENT_COMP, R);
+      R=1;
+    }
 
     /* now handle either probability when transmit or reflect */

trunk/nlib/optics/Monochromator_curved.comp

@@ -182 +182 @@
   if (reflect != NULL && r0 && strlen(reflect) && strcmp(reflect,"NULL") && strcmp(reflect,"0"))
   {
-    if (verbose) fprintf(stdout, "Monochromator_curved : %s : Reflectivity data (k, R) from %s\n", NAME_CURRENT_COMP, reflect);
+    if (verbose) fprintf(stdout, "Monochromator_curved: %s: Reflectivity data (k, R) from %s\n", NAME_CURRENT_COMP, reflect);
     Table_Read(&rTable, reflect, 1); /* read 1st block data from file into rTable */
     Table_Rebin(&rTable);         /* rebin as evenly, increasing array */
@@ -191 +191 @@
   if (transmit != NULL && strlen(transmit) && strcmp(transmit,"NULL") && strcmp(transmit,"0"))
   {
-    if (verbose) fprintf(stdout, "Monochromator_curved : %s : Transmission data (k, T) from %s\n", NAME_CURRENT_COMP, transmit);
+    if (verbose) fprintf(stdout, "Monochromator_curved: %s: Transmission data (k, T) from %s\n", NAME_CURRENT_COMP, transmit);
     Table_Read(&tTable, transmit, 1); /* read 1st block data from file into rTable */
     Table_Rebin(&tTable);         /* rebin as evenly, increasing array */
@@ -384 +384 @@
             vy = K2V*(kiy+q_y);
             vz = K2V*(kiz+q_z);
-            p *= p_reflect/(total*GAUSS(phi,0,mos_sample));
+            p_reflect /= total*GAUSS(phi,0,mos_sample);
+            if (p_reflect <= 0) ABSORB;
+            if (p_reflect > 1)  p_reflect = 1;
+            p *= p_reflect;
 
             SCATTER;

trunk/nlib/optics/Monochromator_flat.comp

@@ -243 +243 @@
           vy = K2V*(kiy+q_y);
           vz = K2V*(kiz+q_z);
-          p *= p_reflect/(total*GAUSS(phi,0,mos_sample));
+          p_reflect /= total*GAUSS(phi,0,mos_sample);
+          if (p_reflect <= 0) ABSORB;
+          if (p_reflect > 1)  p_reflect = 1;
+          p *= p_reflect;
           SCATTER;
         } /* End MC choice to reflect or transmit neutron */

trunk/nlib/optics/Monochromator_pol.comp

@@ -156 +156 @@
     // calculate deltalambda squared and sigmaLambda squared
     dlambda2 = (lambda-lambdaBragg)*(lambda-lambdaBragg);
-    // The sigmaLambda is propagated by differentiating thge bragg 
+    // The sigmaLambda is propagated by differentiating the Bragg 
     // condition: lambda = 2*d*sinTheta
     sigmaLambda2 = 2.0*2.0 * sinTheta*sinTheta * d_rms*d_rms+

trunk/src/mcplot.py

@@ -412 +412 @@
         # No filename given, assume mcstas.sim in current dir
         this_File = "mcstas.sim"
+
+    # FIX: make the path to this_File absolute to always get a non-empty dirname.
+    this_File = os.path.abspath(this_File)
     
     if os.path.isdir(this_File)==1:
         # dirname given, assume mcstas.sim in that dir.
         this_File = os.path.join(this_File,'mcstas.sim')
- 
+
     if os.path.dirname(this_File) != '':
         pwd = os.getcwd()