Changeset 3258 for branches

Timestamp:

01/26/12 21:06:40 (4 months ago)

Author:

erkn

Message:

examples: fixed ILL optics focusing and source parameters.

Location:

branches/mcxtrace-1.0/nlib/examples

Files:

• ILL_BRISP.instr (modified) (2 diffs)
• ILL_D2B.instr (modified) (2 diffs)
• ILL_D4.instr (modified) (2 diffs)
• ILL_H10_IN8.instr (modified) (3 diffs)
• ILL_H13_IN20.instr (modified) (3 diffs)
• ILL_H142_IN12.instr (modified) (1 diff)
• ILL_H15_IN6.instr (modified) (1 diff)
• ILL_H22_D1A.instr (modified) (2 diffs)
• ILL_H25_IN22.instr (modified) (1 diff)
• ILL_H8_IN1.instr (modified) (2 diffs)
• Test_Lens.instr (modified) (1 diff)
• templateDIFF.instr (modified) (2 diffs)
• templateTAS.instr (modified) (4 diffs)

branches/mcxtrace-1.0/nlib/examples/ILL_BRISP.instr

@@ -75 +75 @@
 * Al or Nb container, inside an Al shield (phi=10 cm).
 *
-* %Example: coh="V.laz" Detector: Detector_I=1.76995
+* %Example: coh="V.laz" Detector: Detector_I=29.8614
 *
 * %Parameters
@@ -175 +175 @@
 COMPONENT ThermalSource = Source_gen(
     radius = 0.1, focus_xw = 0.06, focus_yh = 0.06, dist=6,
-    lambda0 = lambda, dlambda = lambda*0.01, I1 = 0.5874e+13, T1 = 683.7)
+    lambda0 = lambda, dlambda = lambda*0.01, 
+    T1=683.7,I1=0.5874e+13,T2=257.7,I2=2.5099e+13,T3=16.7 ,I3=1.0343e+12)
   AT (0, 0, 0) RELATIVE Origin
 

branches/mcxtrace-1.0/nlib/examples/ILL_D2B.instr

@@ -152 +152 @@
 }
 
+RV = fabs(RV)*SM;
+
 
 %}
@@ -163 +165 @@
 
 /* source with constant flux. Directly send neutron events to monochromator area */
-COMPONENT Source = Source_gen(dist = 11, focus_xw = 0.05*fabs(sin(DEG2RAD*THETA_M)), focus_yh = 0.3, radius=0.11, 
+COMPONENT Source = Source_gen(dist = 11, focus_xw = fabs(0.05*fabs(sin(DEG2RAD*THETA_M))), focus_yh = 0.3, radius=0.11, 
         lambda0 = lambda, dlambda = lambda*0.01,
         T1 = 683.7, I1 = 0.5874e13, T2 = 257.7, I2 = 2.5094e13, T3 =  16.7, I3 = 0.10343e13)

branches/mcxtrace-1.0/nlib/examples/ILL_D4.instr

@@ -82 +82 @@
     DM, RV, (!RV ? "flat" : "curved"), A1);
 }
+ RV = -fabs(RV);;
 %}
 
@@ -93 +94 @@
 /* Hot source at the ILL */
 COMPONENT Source = Source_gen(
-    xwidth = 0.05, yheight=0.20, dist = L1, focus_xw = 0.18*sin(A1*DEG2RAD), focus_yh = 0.20,
+    xwidth = 0.05, yheight=0.20, dist = L1, focus_xw = fabs(0.18*sin(A1*DEG2RAD)), focus_yh = 0.20,
     lambda0 = lambda, dlambda = lambda*0.03,
     T1=1695,I1=1.74e13,T2=708,I2=3.9e12)

branches/mcxtrace-1.0/nlib/examples/ILL_H10_IN8.instr

@@ -6 +6 @@
 *         Institut Laue Langevin, Grenoble, France
 *
-* Instrument: Template TAS instrument
+* Instrument: ILL_H10_IN8
 *
 * %Identification
@@ -45 +45 @@
 * analyser, with a single type detector.
 *
-* %Example: QM=1 EN=0 Sqw_coh=V.laz Detector: D7_SC3_1D_I=3.93806e-05
-* %Example: QM=1 EN=0 Sqw_coh=V.laz Detector: He3H_I=1.9e-11
+* %Example: QM=1 EN=0 Sqw_coh=V.laz Detector: D7_SC3_1D_I=1.82621e+09
+* %Example: QM=1 EN=0 Sqw_coh=V.laz -n 1e6 Detector: He3H_I=1069.05
 *
 * %Parameters
@@ -140 +140 @@
 AT (0,0,0) ABSOLUTE
 
-/* a flat constant source */
+/* a flat constant source: tube H10 is twice as brilliant as H12 */
 REMOVABLE COMPONENT Source = Source_gen(
   radius  = 0.10,
   dist = machine_hkl.l1,
-  focus_xw = WM, focus_yh = HM,
+  focus_xw = fabs(WM*sin(machine_real.a1*DEG2RAD)), focus_yh = HM,
+  T1 = 683.7, I1 = 2*0.5874e13, T2 = 257.7, I2 = 2*2.5094e13, T3 =  16.7, I3 = 2*0.10343e13,
   E0 = machine_hkl.ei,
   dE = machine_hkl.ei*0.03)

branches/mcxtrace-1.0/nlib/examples/ILL_H13_IN20.instr

@@ -6 +6 @@
 *         Institut Laue Langevin, Grenoble, France
 *
-* Instrument: Template TAS instrument
+* Instrument: ILL_H13_IN20
 *
 * %Identification
@@ -43 +43 @@
 * configuration).
 *
-* %Example: QM=1 EN=0 Sqw_coh=V.laz Detector: D7_SC3_1D_I=6.0819e-05
-* %Example: QM=1 EN=0 Sqw_coh=V.laz Detector: He3H_I=3.0e-11
+* %Example: QM=1 EN=0 Sqw_coh=V.laz Detector: D7_SC3_1D_I=4.83869e+08
+* %Example: QM=1 EN=0 Sqw_coh=V.laz Detector: He3H_I=267.069
 *
 * %Parameters
@@ -142 +142 @@
   radius  = 0.10,
   dist = machine_hkl.l1,
-  focus_xw = WM, focus_yh = HM,
+  focus_xw = fabs(WM*sin(machine_real.a1*DEG2RAD)), focus_yh = HM,
+  T1 = 683.7, I1 = 0.5874e13, T2 = 257.7, I2 = 2.5094e13, T3 =  16.7, I3 = 0.10343e13,
   E0 = machine_hkl.ei,
   dE = machine_hkl.ei*0.03)

branches/mcxtrace-1.0/nlib/examples/ILL_H142_IN12.instr

@@ -18 +18 @@
 * the IN12 TAS spectrometer (classical configuration).
 *
-* %Example: KI=2.662 QM=1 Sqw_coh=V.laz Detector: Sample_Cradle_I=2.2e+06
-* %Example: KI=2.662 QM=1 Sqw_coh=V.laz Detector: He3H_I=13.5
+* %Example: KI=2.662 QM=1 Sqw_coh=V.laz Detector: D7_SC3_1D_I=8.66922e+06
+* %Example: KI=2.662 QM=1 Sqw_coh=V.laz -n 1e6 Detector: He3H_I=13.5
 *
 * %Parameters

branches/mcxtrace-1.0/nlib/examples/ILL_H15_IN6.instr

@@ -98 +98 @@
 END
 
-
-
-
-
-

branches/mcxtrace-1.0/nlib/examples/ILL_H22_D1A.instr

@@ -42 +42 @@
 * Al environment (e.g. cryostat/furnace shield).
 *
-* This instrument is installed on the H22 guide.
-*
-* %Example: lambda=1.911 Detector: BananaPSD_I=63002
+* This instrument was installed on the H22 guide.
+*
+* %Example: lambda=1.911 Detector: BananaPSD_I=436746
 *
 * %Parameters
@@ -103 +103 @@
     printf("* Sample: %s in %s cylinder container\n", powder, container);
   }
+  
+  RV = -fabs(RV);
 %}
 

branches/mcxtrace-1.0/nlib/examples/ILL_H25_IN22.instr

@@ -23 +23 @@
 *
 * %Example: KI=3.84 QM=1 Sqw_coh=V.laz Detector: Sample_Cradle_I=1.3915e+08
-* %Example: KI=3.84 QM=1 Sqw_coh=V.laz Detector: He3H_I=656.863
+* %Example: KI=3.84 QM=1 Sqw_coh=V.laz -n 1e6 Detector: He3H_I=550
 *
 * %Parameters

branches/mcxtrace-1.0/nlib/examples/ILL_H8_IN1.instr

@@ -47 +47 @@
 * with a single type detector.
 *
-* %Example: QM=1 Sqw_coh=V.laz Detector: D7_SC3_1D_I=3.39e-05
-* %Example: QM=1 Sqw_coh=V.laz Detector: He3H_I=4.02e-11
+* %Example: QM=1 Sqw_coh=V.laz Detector: D7_SC3_1D_I=1.06671e+09
+* %Example: QM=1 Sqw_coh=V.laz Detector: He3H_I=1397.33
 *
 * %Parameters
@@ -146 +146 @@
   radius  = 0.10,
   dist = machine_hkl.l1,
-  focus_xw = WM, focus_yh = HM,
+  focus_xw = fabs(WM*sin(machine_real.a1*DEG2RAD)), focus_yh = HM,
   E0 = machine_hkl.ei,
-  dE = machine_hkl.ei*0.03)
+  dE = machine_hkl.ei*0.03,
+  T1=1695,I1=1.74e13,T2=708,I2=3.9e12)
 AT (0,0,0) ABSOLUTE
 

branches/mcxtrace-1.0/nlib/examples/Test_Lens.instr

@@ -19 +19 @@
 * non diverging beam (ideal case). A set of PSD monitors is positioned
 * around the focusing point to show the beam spot.
-*
-* %Example: lambda=10 Detector: PSD_mon_41_I=4.2e-19
 *
 * %Parameters

branches/mcxtrace-1.0/nlib/examples/templateDIFF.instr

@@ -88 +88 @@
 if (L1<1.1) L = L2;
 else        L = 1/(1/L1+1/L2);
-if (RV < 0) RV=2*L*sin(DEG2RAD*THETA_M);
+if (RV < 0) RV=fabs(2*L*sin(DEG2RAD*THETA_M));
 KI=2*PI/lambda;
 Vi = K2V*fabs(KI);
@@ -105 +105 @@
     DM, RV, (!RV ? "flat" : "curved"), THETA_M*2);
 }
+
+RV = fabs(RV)*SM;
+
 %}
 

branches/mcxtrace-1.0/nlib/examples/templateTAS.instr

@@ -58 +58 @@
 *     L1=2.33 
 *
-* %Example: QM=1 Sqw_coh=V.laz Detector: D7_SC3_1D_I=5.07236e-05
-* %Example: QM=1 Sqw_coh=V.laz Detector: He3H_I=5.00081e-11
+* %Example: QM=1 Sqw_coh=V.laz Detector: D7_SC3_1D_I=2.55907e+08
+* %Example: QM=1 Sqw_coh=V.laz Detector: He3H_I=249.736
 *
 * %Parameters
@@ -518 +518 @@
 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) {
@@ -545 +545 @@
       printf("Powder %s\n", Sqw_coh);
 }
+
+machine_real.rmv = fabs(machine_real.rmv)*machine_hkl.sm;
+machine_real.rmh = fabs(machine_real.rmh)*machine_hkl.sm;
+machine_real.rav = fabs(machine_real.rav)*machine_hkl.sa;
+machine_real.rah = fabs(machine_real.rah)*machine_hkl.sa;
+
 %}
 /* end of INITIALIZE */
@@ -558 +564 @@
   radius  = 0.10,
   dist = machine_hkl.l1,
-  focus_xw = WM, focus_yh = HM,
+  focus_xw = fabs(WM*sin(machine_real.a1*DEG2RAD)), focus_yh = HM,
+  T1 = 683.7, I1 = 0.5874e13, T2 = 257.7, I2 = 2.5094e13, T3 =  16.7, I3 = 0.10343e13,
   E0 = machine_hkl.ei,
   dE = machine_hkl.ei*0.03)