Merged in-situ modifications for Release 2.5 candidate 5

r2895 | ffr | 2010-04-29 16:02:15 +1000 (Thu, 29 Apr 2010) | 2 lines
This commit is contained in:
Ferdi Franceschini
2010-04-29 16:02:15 +10:00
committed by Douglas Clowes
parent a2ca46ab67
commit e6e3c3be52
24 changed files with 478 additions and 363 deletions

View File

@@ -52,27 +52,31 @@ detector_distance 10000
detector_base 300
anal_distance 1808
anal_base 20
slit4_distance 5527
slit4_distance 5331.15
slit4_base 20
sample_distance 5129
sample_distance 5045.4
sample_base 50
slit3_distance 4808
slit3_distance 4744.4
slit3_base 20
guide1_distance 2900.4 ;# distance measured to axis of rotation
guide1_base
guide2_distance 3200 ;# distance measured to midpoint of the 2nd compound mirror (i.e. closest to the sample)
guide2_base
slit2_distance 1895
slit2_distance 1909.9
slit2_base 20
chopper4_distance 823
chopper4_distance 808
chopper4_base 20
chopper3_distance 370
chopper4_phase_offset 0.3246
chopper3_distance 359
chopper3_base 20
chopper2_distance 102
chopper3_phase_offset 0.38500
chopper2_distance 103
chopper2_base 20
chopper2_phase_offset -0.02
chopper1_distance 0
chopper1_base 20
slit1_distance -244
chopper1_phase_offset -1.857
slit1_distance -256.1
slit1_base 20
mode NONE
omega -1