Merged changes made in-situ

r2768 | ffr | 2009-03-31 17:25:20 +1100 (Tue, 31 Mar 2009) | 2 lines
This commit is contained in:
Ferdi Franceschini
2009-03-31 17:25:20 +11:00
committed by Douglas Clowes
parent d2f57e4615
commit 8e5b7842e3
17 changed files with 471 additions and 229 deletions

View File

@@ -53,9 +53,9 @@ sample_distance 5129
sample_base 50
slit3_distance 4808
slit3_base 20
guide1_distance 2979
guide1_distance 2900.4 ;# distance measured to axis of rotation
guide1_base
guide2_distance 3279
guide2_distance 3200 ;# distance measured to midpoint of the 2nd compound mirror (i.e. closest to the sample)
guide2_base
slit2_distance 1895
slit2_base 20