- fixed a little bug with hkl: phi limits were not properly tested

- updated powder file writing to properly work with mean and stddev
This commit is contained in:
cvs
2000-05-10 11:45:33 +00:00
parent 1329c3beb4
commit 7b631db965
17 changed files with 183 additions and 286 deletions

View File

@@ -23,7 +23,7 @@ th InterruptMode 0.000000
th AccessCode 2.000000
#Crystallographic Settings
hkl lambda 1.178100
hkl setub 0.217614 0.141834 -0.048542 0.151125 -0.057954 0.087584 0.070284 -0.314535 -0.038027
hkl setub -0.154751 -0.003824 -0.019538 0.049741 -0.005912 -0.061157 0.003550 -0.083854 0.005203
det1dist 300.
det1dist setAccess 1
det1zeroy 128.
@@ -60,8 +60,8 @@ ch InterruptMode 0.000000
ch AccessCode 2.000000
# Motor ph
ph SoftZero 0.000000
ph SoftLowerLim 0.000000
ph SoftUpperLim 360.000000
ph SoftLowerLim -200.000000
ph SoftUpperLim 100.000000
ph Fixed -1.000000
ph sign 1.000000
ph InterruptMode 0.000000
@@ -84,8 +84,8 @@ muca InterruptMode 0.000000
muca AccessCode 2.000000
# Motor phi
phi SoftZero 0.000000
phi SoftLowerLim 0.000000
phi SoftUpperLim 360.000000
phi SoftLowerLim -200.000000
phi SoftUpperLim 100.000000
phi Fixed -1.000000
phi sign 1.000000
phi InterruptMode 0.000000
@@ -117,7 +117,7 @@ twotheta AccessCode 2.000000
lastscancommand sscan ch 180 190 10 2
lastscancommand setAccess 2
banana CountMode timer
banana preset 2.000000
banana preset 180.000000
sample_mur 0.000000
sample_mur setAccess 2
email Uwe.Nurps@nurps.nurpstown.de
@@ -243,6 +243,38 @@ d1r Fixed -1.000000
d1r sign 1.000000
d1r InterruptMode 0.000000
d1r AccessCode 2.000000
# Motor monochi
monochi SoftZero 0.000000
monochi SoftLowerLim -30.000000
monochi SoftUpperLim 30.000000
monochi Fixed -1.000000
monochi sign 1.000000
monochi InterruptMode 0.000000
monochi AccessCode 2.000000
# Motor monophi
monophi SoftZero 0.000000
monophi SoftLowerLim -30.000000
monophi SoftUpperLim 30.000000
monophi Fixed -1.000000
monophi sign 1.000000
monophi InterruptMode 0.000000
monophi AccessCode 2.000000
# Motor monoy
monoy SoftZero 0.000000
monoy SoftLowerLim -30.000000
monoy SoftUpperLim 30.000000
monoy Fixed -1.000000
monoy sign 1.000000
monoy InterruptMode 0.000000
monoy AccessCode 2.000000
# Motor monox
monox SoftZero 0.000000
monox SoftLowerLim -30.000000
monox SoftUpperLim 30.000000
monox Fixed -1.000000
monox sign 1.000000
monox InterruptMode 0.000000
monox AccessCode 2.000000
# Motor tasse
tasse SoftZero 10.000000
tasse SoftLowerLim -140.000000
@@ -365,9 +397,9 @@ a1 InterruptMode 0.000000
a1 AccessCode 2.000000
user Joseph Stalin
user setAccess 2
sample Wuergehals = doof, bloed und dumm
sample EB:12mm
sample setAccess 2
title Nasse Fische in Dosen
title setAccess 2
starttime 2000-03-31 11:40:31
starttime 2000-04-14 14:34:41
starttime setAccess 2