Changeset 3249 for branches

Timestamp:

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

Author:

erkn

Message:

examples: fixed most reference values, so that self-test is now sanitized.

Location:

branches/mcxtrace-1.0/nlib/examples

Files:

• HZB_NEAT.instr (modified) (1 diff)
• ILL_BRISP.instr (modified) (1 diff)
• ILL_D2B.instr (modified) (2 diffs)
• ILL_H10_IN8.instr (modified) (2 diffs)
• ILL_H13_IN20.instr (modified) (2 diffs)
• ILL_H15_IN6.instr (modified) (1 diff)
• ILL_H22_D1A.instr (modified) (1 diff)
• ILL_H22_D1B.instr (modified) (1 diff)
• ILL_H25.instr (modified) (1 diff)
• ILL_H25_IN22.instr (modified) (1 diff)
• ILL_H53.instr (modified) (2 diffs)
• ILL_H53_D16.instr (modified) (1 diff)
• ILL_H53_IN14.instr (modified) (1 diff)
• ILL_H8_IN1.instr (modified) (2 diffs)
• ILL_IN6.instr (modified) (3 diffs)
• ISIS_GEM.instr (modified) (2 diffs)
• ISIS_HET.instr (modified) (2 diffs)
• Test_Collimator_Radial.instr (modified) (1 diff)
• Test_Lens.instr (modified) (2 diffs)
• Test_Pol_Mirror.instr (modified) (1 diff)
• linup-4.instr (modified) (1 diff)
• linup-6.instr (modified) (1 diff)
• templateDIFF.instr (modified) (1 diff)
• templateTAS.instr (modified) (1 diff)

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

@@ -39 +39 @@
 * which material can be any powder/liquid/amorphous sample.
 *
-* %Example: lambda=6 coh=V.laz    inc=NULL Detector: D7_SC3_1D_I=3.3e-05
-* %Example: lambda=6 coh=Y2O3.laz inc=NULL Detector: D7_SC3_1D_I=3.3e-05
-* %Example: lambda=6 coh=V.laz    inc=NULL Detector: D7_SC3_1D_I=3.3e-05
+* %Example: lambda=6                       Detector: Detector_I=300493
+* %Example: lambda=6 coh=Y2O3.laz inc=NULL Detector: Detector_I=41144.6
 *
 * %Parameters

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.24911
+* %Example: coh="V.laz" Detector: Detector_I=1.76995
 *
 * %Parameters

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

@@ -43 +43 @@
 * Ge       533 DM=0.863 AA
 *
-* %Example: lambda=1 Detector: BananaPSD_I=2.46226e-09
+* %Example: lambda=1 Detector: D2B_BananaPSD_I=13364.4
 *
 * %Parameters
@@ -116 +116 @@
 if (!L1)    L = L2;
 else        L = 1/(1/L1+1/L2);
-if (RV < 0) RV=2*fabs(L*sin(DEG2RAD*THETA_M));
+if (RV < 0) RV=2*L*sin(DEG2RAD*THETA_M);
 KI = 2*PI/lambda;
 Vi = K2V*fabs(KI);

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

@@ -45 +45 @@
 * analyser, with a single type detector.
 *
-* %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 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
 *
 * %Parameters
@@ -127 +127 @@
 
 DEFINE INSTRUMENT ILL_H10_IN8(
-  KF=5, KI=0, QM=0.5, EN=5, verbose=1,
+  KF=5, KI=0, QM=0.5, EN=0, verbose=1,
   WM=0.233, HM=0.197, RMH=-1, RMV=-1, DM=1.807, NHM=15, NVM=15,
   WA=0.16, HA=0.08, RAH=-1,   RAV=-1, DA=2.087, NHA=15, NVA=15,

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

@@ -43 +43 @@
 * configuration).
 *
-* %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 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
 *
 * %Parameters
@@ -125 +125 @@
 
 DEFINE INSTRUMENT ILL_H13_IN20(
-  KF=3, KI=0, QM=0.5, EN=5, verbose=1,
+  KF=3, KI=0, QM=0.5, EN=0, verbose=1,
   WM=0.20, HM=0.19, RMH=-1, RMV=-1, DM=3.155, NHM=15, NVM=15,
   WA=0.16, HA=0.08, RAH=-1, RAV=-1, DA=3.155, NHA=15, NVA=15,

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

@@ -49 +49 @@
 * improve the statistics.
 *
-* %Example: lambda=4.14 Detector: M_theta_t_all_I=173
+* %Example: lambda=4.14 Detector: M_theta_t_all_I=88.5
 *
 * %Parameters

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

@@ -89 +89 @@
 
   L = L2; /* assume guide exit L1=Inf */
-  if (RV < 0) RV=abs(2*L*sin(DEG2RAD*A1));
+  if (RV < 0) RV=2*L*sin(DEG2RAD*A1);
   KI=2*PI/lambda;
   Vi = K2V*fabs(KI);

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

@@ -104 +104 @@
       NAME_CURRENT_COMP, THETA_M, DM, lambda));
   
-if (RV < 0) RV=2*L2*fabs(sin(DEG2RAD*THETA_M));   
+if (RV < 0) RV=2*L2*sin(DEG2RAD*THETA_M);
 KI = 2*PI/lambda;   
 Vi = K2V*fabs(KI);

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

@@ -21 +21 @@
 * The H25 supermirror curved thermal guide at the ILL feeding S18, D23 and IN22
 *
-* %Example: m=2 Detector: GuideOut_Phic_I=3.46e+09
+* %Example: m=2 Detector: GuideOut_Phic_I=8.7861e+09
 *
 * %Parameters

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

@@ -22 +22 @@
 * installed at the end of the H25 supermirror thermal guide.
 *
-* %Example: KI=3.84 QM=1 Sqw_coh=V.laz Detector: Sample_Cradle_I=3.5483e+07
-* %Example: KI=3.84 QM=1 Sqw_coh=V.laz Detector: He3H_I=58
+* %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
 *
 * %Parameters

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

@@ -17 +17 @@
 * The H53 curved cold guide at the ILL feeding IN14, IN16, D16, ADAM, CRYO-EDM
 *
-* %Example: m=1.2 dlambda=8.5 Detector: GuideOut_Phic_I=1.47529e+10
+* %Example: m=1.2 dlambda=8.5 Detector: H53_P5_Out_Phic_I=1.8081e+10
 *
 * %Parameters
@@ -421 +421 @@
 AT (0,0,L_H53_P5+gGap) RELATIVE PREVIOUS
 
+COMPONENT H53_P5_Out_Phic = Monitor_nD(options="capture per cm2", xwidth=0.06, yheight=0.12)
+AT (0,0,0.005) RELATIVE PREVIOUS
+
 /* D16 position. Gap .200 */
 

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

@@ -86 +86 @@
       NAME_CURRENT_COMP, THETA_M, DM, lambda));
 
-if (RV < 0) RV=2*L2*fabs(sin(DEG2RAD*THETA_M));
+if (RV < 0) RV=2*L2*sin(DEG2RAD*THETA_M);
 KI=2*PI/lambda;
 Vi = K2V*fabs(KI);

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

@@ -36 +36 @@
 * with a single type detector.
 *
-* %Example: KI=1.55 QM=1 Detector: Sample_Cradle_I=9.85568e+07
+* %Example: KI=1.55 QM=1 Sqw_coh=V.laz Detector: Sample_Cradle_I=3.53099e+07
 *
 * %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=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=3.39e-05
+* %Example: QM=1 Sqw_coh=V.laz Detector: He3H_I=4.02e-11
 *
 * %Parameters
@@ -129 +129 @@
 
 DEFINE INSTRUMENT ILL_H8_IN1(
-  KF=10, KI=0, QM=0.5, EN=50, verbose=1,
+  KF=10, KI=0, QM=0.5, EN=0, verbose=1,
   WM=0.18, HM=0.20, RMH=-1,   RMV=-1, DM=1.278, NHM=15, NVM=15,
   WA=0.16, HA=0.12, RAH=-1,   RAV=-1, DA=1.278, NHA=15, NVA=15,

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

@@ -48 +48 @@
 * improve the statistics. The H15 guide is not described in this model.
 *
-* %Example: lambda=4.14 Detector: M_theta_t_all_I=315.5
+* %Example: lambda=4.14 Detector: M_theta_t_all_I=152.846
 *
 * %Parameters
@@ -363 +363 @@
 
 /* Suppressor Chopper position. */
-COMPONENT Suppressor = FermiChopper(radius=0.07, nu=-Frequency/iRATIO,
+COMPONENT Suppressor = FermiChopper(radius=0.07, nu=Frequency/iRATIO,
    yheight=0.098, xwidth=0.052, nslit=1, R0=0, phase=0,
    length=0.012, eff=1, verbose=1)
@@ -379 +379 @@
 AT (0,0,LME-LCE) RELATIVE mono_out
 
-COMPONENT FermiM = FermiChopper(phase=-iPHASE, radius=0.04, nu=-Frequency,
+COMPONENT FermiM = FermiChopper(phase=iPHASE, radius=0.04, nu=Frequency,
    yheight=0.064, xwidth=0.044, nslit=200.0, R0=.99,
    Qc=(mFC < 1 && mFC ? mFC*0.02176 : 0.02176), alpha=2.33, m=mFC, length=0.012, eff=1.0, verbose=1)

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

@@ -25 +25 @@
 * disordered materials and crystalline powders.
 *
-* %Example: sample="Y2O3.laz" Detector: monzns_I=0.894995
+* %Example: sample="Y2O3.laz" Detector: monzns_I=18.2817
 *
 * %Link
@@ -51 +51 @@
 COMPONENT Source = ISIS_moderator(
     Face = "gem", Emin = emin, Emax = emax, target_index=1, focus_xw = 0.008,
-    focus_yh = 0.04, xwidth = 0.09, yheight = 0.084, CAngle = 0,
+    focus_yh = 0.04, xwidth = 0.09, yheight = 0.084, CAngle = 0,dist=0,
     SAC = 1)
 AT (0, 0, 0) ABSOLUTE
 
 SPLIT COMPONENT Sample = PowderN(
-    yheight=0.04, radius=8e-3/2,
+    yheight=0.04, radius=8e-3/2,p_interact=1,
     reflections = sample,d_phi=atan(.20/dist)*RAD2DEG)
 AT (0, 0, 17.00) RELATIVE Source

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

@@ -25 +25 @@
 * Fermi Chopper.
 *
-* %Example: Emin=443 Detector: cyl_I=0.714158
+* %Example: Emin=443 Detector: cyl_I=0.75
 *
 * %Parameters
@@ -85 +85 @@
 
 COMPONENT FC = FermiChopper(
-  radius=0.05, nu=-nu_chop, yheight=c_h,
+  radius=0.05, nu=nu_chop, yheight=c_h,
   w=chan_w, nslit=nslits, curvature=1.0/roc, verbose=1, zero_time=2)
 AT (0,0,10) RELATIVE ts1_mod

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

@@ -20 +20 @@
 * blade thickness between slits, which decreases slightly intensity.
 *
-* %Example: Collimator=1 Detector: BananaTheta_I=2.91e-08
-* %Example: Collimator=2 Detector: BananaTheta_I=2.68e-08
-* %Example: Collimator=3 Detector: BananaTheta_I=2.97e-08
+* %Example: Collimator=1 Detector: BananaTheta_I=1.52649e-08
+* %Example: Collimator=2 Detector: BananaTheta_I=1.41509e-08
+* %Example: Collimator=3 Detector: BananaTheta_I=1.581e-08
 *
 * %Parameters

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

@@ -20 +20 @@
 * around the focusing point to show the beam spot.
 *
-* %Example: lambda=10 Detector: PSD_mon_39_I=1.9071e-18
+* %Example: lambda=10 Detector: PSD_mon_41_I=4.2e-19
 *
 * %Parameters
@@ -35 +35 @@
 TRACE
 
-COMPONENT base=Arm() at (0,0,0) ABSOLUTE
+COMPONENT base=Progress_bar() at (0,0,0) ABSOLUTE
 
 COMPONENT source1 = Source_div(

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

@@ -73 +73 @@
 
 COMPONENT mirror =
-Pol_mirror(zwidth = 0.40, yheight = 0.40, option=mirrorOption,
+Pol_mirror(zwidth = 0.40, yheight = 0.40, p_reflect=mirrorOption,
            rUpPar={1.0, 0.0219, 6.07, 2.0, 0.003},
            rDownPar={0.1, 0.0219, 6.07, 2.0, 0.003})

branches/mcxtrace-1.0/nlib/examples/linup-4.instr

@@ -27 +27 @@
 * sample is a vanadium cylinder and there is no analyzer.
 *
-* %Example: PHM=-37.077 Detector: sng_I=5.36516e-10
+* %Example: PHM=-37.077 Detector: sng_I=1.95173e-09
 *
 

branches/mcxtrace-1.0/nlib/examples/linup-6.instr

@@ -25 +25 @@
 * The sample is a vanadium and the analyzer is a single plate.
 *
-* %Example: PHM=-37.077 Detector: sng_I=2.97461e-10
+* %Example: PHM=-37.077 Detector: sng_I=1.11099e-09
 *
 * %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*fabs(L*sin(DEG2RAD*THETA_M));
+if (RV < 0) RV=2*L*sin(DEG2RAD*THETA_M);
 KI=2*PI/lambda;
 Vi = K2V*fabs(KI);

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

@@ -518 +518 @@
 double L;
 L = 1/(1/L1+1/L2);
-if (RMV < 0) machine_real.rmv = 2*L*sin(DEG2RAD*fabs(machine_real.a1));
-if (RMH < 0) machine_real.rmh = 2*L/sin(DEG2RAD*fabs(machine_real.a1));
+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);
 L = 1/(1/L3+1/L4);
-if (RAV < 0) machine_real.rav = 2*L*sin(DEG2RAD*fabs(machine_real.a5));
-if (RAH < 0) machine_real.rah = 2*L/sin(DEG2RAD*fabs(machine_real.a5));
-
-machine_real.rmv = fabs(machine_real.rmv)*machine_hkl.sm;
-machine_real.rav = fabs(machine_real.rav)*machine_hkl.sa;
-machine_real.rmh = fabs(machine_real.rmh)*machine_hkl.sm;
-machine_real.rah = fabs(machine_real.rah)*machine_hkl.sa;
+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 (verbose) {