Changeset 3064 for branches

Timestamp:

05/04/11 00:19:39 (13 months ago)

Author:

farhi

Message:

optics/FC: fixed error when computing automatic phase
monitors/Mon_nD: fixed bugs reported by Lambert with disk hape
example/TAS: Source stuff is not removable, for e.g. IN22 (%include)

Location:

branches/mcstas-1.x/lib

Files:

• examples/templateTAS.instr (modified) (8 diffs)
• monitors/Monitor_nD.comp (modified) (1 diff)
• optics/FermiChopper.comp (modified) (4 diffs)
• share/monitor_nd-lib.c (modified) (1 diff)

branches/mcstas-1.x/lib/examples/templateTAS.instr

@@ -2 +2 @@
 *
 * McStas, neutron ray-tracing package
-*         Copyright (C) 1997-2008, All rights reserved
+*         Copyright (C) 1997-2010, All rights reserved
 *         Risoe National Laboratory, Roskilde, Denmark
 *         Institut Laue Langevin, Grenoble, France
@@ -12 +12 @@
 * Date: 2006
 * Origin: <a href="http://www.ill.fr">ILL (France)</a>
-* Release: McStas 1.12
+* Release: McStas 1.12b
 * Version: $Revision: 1.6 $
 * %INSTRUMENT_SITE: Templates
@@ -441 +441 @@
 
 /* geometry tests w/r to collimator lengths */
-if (machine_hkl.l1 <= 5.34)
-  exit(fprintf(stderr, "%s: ERROR: L1 too short. Min=5.34\n", NAME_CURRENT_COMP));
+if (machine_hkl.l1 <= 1)
+  exit(fprintf(stderr, "%s: ERROR: L1 too short. Min=1\n", NAME_CURRENT_COMP));
 
 if (machine_hkl.l2 <= 0.35)
@@ -463 +463 @@
 double L;
 L = 1/(1/L1+1/L2);
-if (RMV < 0) machine_real.rmv = 2*L*sin(DEG2RAD*machine_real.a1);
-if (RMH < 0) machine_real.rmh = 2*L/sin(DEG2RAD*machine_real.a1);
+if (RMV < 0) machine_real.rmv = fabs(2*L*sin(DEG2RAD*machine_real.a1));
+if (RMH < 0) machine_real.rmh = fabs(2*L/sin(DEG2RAD*machine_real.a1));
 L = 1/(1/L3+1/L4);
-if (RAV < 0) machine_real.rav = 2*L*sin(DEG2RAD*machine_real.a5);
-if (RAH < 0) machine_real.rah = 2*L/sin(DEG2RAD*machine_real.a5);
+if (RAV < 0) machine_real.rav = fabs(2*L*sin(DEG2RAD*machine_real.a5));
+if (RAH < 0) machine_real.rah = fabs(2*L/sin(DEG2RAD*machine_real.a5));
 
 if (verbose) {
@@ -481 +481 @@
     machine_hkl.da, machine_real.rah, machine_real.rav,
     (!machine_real.rah && !machine_real.rav ? "flat" : "curved"));
+
 }
 %}
@@ -488 +489 @@
 /* Source description */
 
+INSTRUMENT COMPONENT Origin=Progress_bar()
+AT (0,0,0) ABSOLUTE
+
 /* a flat constant source */
-COMPONENT Source = Source_gen(
+INSTRUMENT COMPONENT Source = Source_gen(
   radius  = 0.10,
   dist = machine_hkl.l1,
@@ -497 +501 @@
 AT (0,0,0) ABSOLUTE
 
-COMPONENT SC1 = Collimator_linear(
+INSTRUMENT COMPONENT SC1 = Collimator_linear(
   xmin =-0.08/2, ymin =-0.11/2,
   xmax = 0.08/2, ymax = 0.11/2,
-  len = 5.34,
+  len = machine_hkl.l1 > 6.34 ? 5.34 : machine_hkl.l1/2,
   divergence=ALF1,
   divergenceV=BET1)
-AT (0, 0, (machine_hkl.l1-5.34)/2) RELATIVE Source
+WHEN (ALF1 && BET1)
+AT (0, 0, (machine_hkl.l1-5.34)/2) ABSOLUTE
+
+INSTRUMENT COMPONENT Guide_out=Arm()
+AT (0, 0, machine_hkl.l1) ABSOLUTE
 
 COMPONENT Mono_Cradle = Arm()
-  AT (0, 0, machine_hkl.l1) RELATIVE Source
-  ROTATED (0, machine_real.a1, 0) RELATIVE Source
-
+  AT (0, 0, 0) RELATIVE PREVIOUS
+  
 SPLIT COMPONENT PG1Xtal = Monochromator_curved(
   width  = 0.10,
@@ -514 +521 @@
   NH=1, NV=9,
   RV=machine_real.rmv, RH=machine_real.rmh,
-  mosaich = machine_hkl.etam, mosaicv = machine_hkl.etam,
-  r0 = 0.7, DM=machine_hkl.dm)
+  DM=machine_hkl.dm, mosaich = machine_hkl.etam, mosaicv = machine_hkl.etam,
+  r0 = (fabs(machine_hkl.dm-3.355) < 0.2 ? 1: 0.7), 
+  reflect=(fabs(machine_hkl.dm-3.355) < 0.2 ? "HOPG.rfl" : ""))
 AT (0, 0, 0) RELATIVE Mono_Cradle
+ROTATED (0, machine_real.a1, 0) RELATIVE Mono_Cradle
 
 /*                                on mono, pointing towards sample */

branches/mcstas-1.x/lib/monitors/Monitor_nD.comp

@@ -121 +121 @@
 *                                variable with limits to define arc.
 *                                (diameter is xwidth, height is yheight).
-*     disk                      Disk flat xy monitor. radius is xwidth.
+*     disk                      Disk flat xy monitor. diameter is xwidth.
 *     sphere                    To get a spherical monitor (e.g. a 4PI)
 *                                (diameter is xwidth).

branches/mcstas-1.x/lib/optics/FermiChopper.comp

@@ -394 +394 @@
       mean_t     = FCVars.sum_t/FCVars.sum_N;
       mean_phase = fmod(mean_t*nu*2*PI, 2*PI);
+      /* now we shift the phase so that the neutron pulse is centered on the slit pack */
+      mean_phase+=radius/vxp1*2*PI*nu;
       FCVars.ph0 = -mean_phase;
     }
@@ -644 +646 @@
     /* base opening time */
     double div, mean_phase;
-    div        = atan(w/length);
+    div        = atan2(w,length)/PI*180;
     mean_phase = fmod(mean_t*nu*360, 360);
+    mean_phase+=radius/mean_v*360*nu;
     if (mean_phase > 180) mean_phase -= 360;
 
@@ -656 +659 @@
            "              Mean energy       omega = %g [meV]\n"
            "              Mean arrival time t     = %g [s]\n"
-           "              Mean phase              = %g [deg] (negate to optimize transmission)\n"
+           "              Mean phase              = %g [deg] (%s)\n"
+           "              Slit pack divergence    = %g [deg] (full width)\n"
            "              Opening time      dt    = %g [s]\n"
            "              Intensity reaching FC   = %g [n/s]\n"
@@ -662 +666 @@
            , NAME_CURRENT_COMP,
            mean_v, mean_L, mean_w, mean_t, mean_phase,
+           (zero_time > 1 ? "set automatically" : "use phase=-(this value) to optimize"),
+           2*div,
            (nu ? div/PI/nu : 1),
            FCVars.sum_N,

branches/mcstas-1.x/lib/share/monitor_nd-lib.c

@@ -790 +790 @@
     if ((abs(mc_mn_Vars->Flag_Shape) == mc_mn_DEFS->SHAPE_DISK) || (abs(mc_mn_Vars->Flag_Shape) == mc_mn_DEFS->SHAPE_SPHERE))
     {
-      mc_mn_Vars->area = PI*mc_mn_Vars->Sphere_Radius*mc_mn_Vars->Sphere_Radius; /* disk shapes */
+      mc_mn_Vars->area = PI*mc_mn_Vars->Sphere_Radius*mc_mn_Vars->Sphere_Radius*1E4 /* disk shapes */
     }
     if (mc_mn_Vars->area == 0) mc_mn_Vars->Coord_Number = 0;