Merged 2.4 branch

r2828 | ffr | 2009-11-25 09:56:49 +1100 (Wed, 25 Nov 2009) | 2 lines
This commit is contained in:
Ferdi Franceschini
2009-11-25 09:56:49 +11:00
committed by Douglas Clowes
parent c58ee9fbcb
commit 2ec6505ef8
71 changed files with 2237 additions and 1528 deletions

View File

@@ -10,8 +10,14 @@
# forbid {0 10} for sphi whenall {schi in {10 15} sx {10 11} }
#-----------monochromator rotation---------------
for mom forbid {0 48}
#----------primary collimator translation--------
for pcx forbid {80 130}
for pcr forbid {3 176} when mom in {45 50}
#----------primary collimator rotation-----------
for pcr forbid {{3 177} {-177 -3}} when mom in {0 89}
for pcr forbid {{3 177} {-177 -3}} when pcx in {{-inf 68} {72 inf}}
#for pcr forbid {-inf inf} when mom in {45 50}
for stth forbid {160 167} when mtth in {87 88}
#for stth forbid {0 15} when mtth in {139.5 140.5}