- Fixed a few problems with hklscan

- Added transfer of zipped data to conman.c, histogram memory software
  in order to support the TRICS status display.
- Upgraded TRICS data file writing.
- First installment of triple axis spectrometer support: initialization of
  data structures and an implementation of the MAD dr(ive) command.
This commit is contained in:
cvs
2000-11-21 08:16:46 +00:00
parent f9a31d2065
commit e83d3e6946
39 changed files with 5301 additions and 563 deletions

View File

@@ -1,406 +1,311 @@
#Crystallographic Settings
hkl lambda 0.703790
hkl setub -0.124702 0.001618 -0.041357 -0.104448 -0.001326 0.049388 0.000751 0.084094 0.001574
lastscancommand UNKNOWN
lastscancommand setAccess 2
sample_mur 0.000000
sample_mur setAccess 2
email UNKNOWN
email setAccess 2
fax UNKNOWN
fax setAccess 2
phone UNKNOWN
phone setAccess 2
adress UNKNOWN
adress setAccess 2
arx2 4.290000
arx2 setAccess 1
arx1 0.150000
arx1 setAccess 1
mrx2 10.420000
mrx2 setAccess 1
mrx1 0.280000
mrx1 setAccess 1
lpa 0
lpa setAccess 2
dt 0.000000
dt setAccess 2
dqm 0.000000
dqm setAccess 2
qm 0.000000
qm setAccess 2
etaa 0.000000
etaa setAccess 2
etas 0.000000
etas setAccess 2
etam 0.000000
etam setAccess 2
wav 0.000000
wav setAccess 2
den 0.000000
den setAccess 2
dql 0.000000
dql setAccess 2
dqk 0.000000
dqk setAccess 2
dqh 0.000000
dqh setAccess 2
dkf 0.000000
dkf setAccess 2
def 0.000000
def setAccess 2
dki 0.000000
dki setAccess 2
dei 0.000000
dei setAccess 2
dagl 0.000000
dagl setAccess 2
dsgu 0.000000
dsgu setAccess 2
dsgl 0.000000
dsgl setAccess 2
dmgl 0.000000
dmgl setAccess 2
datu 0.000000
datu setAccess 2
datl 0.000000
datl setAccess 2
dstu 0.000000
dstu setAccess 2
dstl 0.000000
dstl setAccess 2
dmtu 0.000000
dmtu setAccess 2
dmtl 0.000000
dmtl setAccess 2
dach 0.000000
dach setAccess 2
dsro 0.000000
dsro setAccess 2
dmcv 0.000000
dmcv setAccess 2
da6 0.000000
da6 setAccess 2
da5 0.000000
da5 setAccess 2
da4 0.000000
da4 setAccess 2
da3 0.000000
da3 setAccess 2
da2 0.000000
da2 setAccess 2
da1 0.000000
da1 setAccess 2
f2 0
f2 setAccess 2
f1 0
f1 setAccess 2
hz 0.000000
hz setAccess 2
hy 0.000000
hy setAccess 2
hx 0.000000
hx setAccess 2
helm 0.000000
helm setAccess 2
if2h 0.000000
if2h setAccess 2
if1h 0.000000
if1h setAccess 2
if2v 0.000000
if2v setAccess 2
if1v 0.000000
if1v setAccess 2
mn 0
mn setAccess 2
ti 0.000000
ti setAccess 2
np 9
np setAccess 2
fx 2
fx setAccess 2
sa -1
sa setAccess 2
ss 1
ss setAccess 2
sm 1
sm setAccess 2
da 3.354000
da setAccess 1
dm 3.354000
dm setAccess 1
en 2.800000
en setAccess 2
ql 0.000000
ql setAccess 2
qk 0.000000
qk setAccess 2
qh 2.000000
qh setAccess 2
kf 1.964944
kf setAccess 2
ef 8.000000
ef setAccess 2
ki 2.283058
ki setAccess 2
ei 10.800000
ei setAccess 2
bz 0.000000
bz setAccess 2
by 1.000000
by setAccess 2
bx 0.000000
bx setAccess 2
az 0.000000
az setAccess 2
ay 0.000000
ay setAccess 2
ax 1.000000
ax setAccess 2
cc 90.000000
cc setAccess 2
bb 90.000000
bb setAccess 2
aa 90.000000
aa setAccess 2
cs 5.000000
cs setAccess 2
bs 5.000000
bs setAccess 2
as 5.000000
as setAccess 2
# Counter counter
counter SetPreset 1000.000000
counter SetMode Timer
# Motor a33
a33 SoftZero 0.000000
a33 SoftLowerLim -10.000000
a33 SoftUpperLim 39.500000
a33 Fixed -1.000000
a33 sign 1.000000
a33 InterruptMode 0.000000
a33 AccessCode 2.000000
# Motor a32
a32 SoftZero 0.000000
a32 SoftLowerLim -10.000000
a32 SoftUpperLim 39.500000
a32 Fixed -1.000000
a32 sign 1.000000
a32 InterruptMode 0.000000
a32 AccessCode 2.000000
# Motor a31
a31 SoftZero 0.000000
a31 SoftLowerLim -10.000000
a31 SoftUpperLim 39.500000
a31 Fixed -1.000000
a31 sign 1.000000
a31 InterruptMode 0.000000
a31 AccessCode 2.000000
# Motor ph
ph SoftZero 0.000000
ph SoftLowerLim 318.000000
ph SoftUpperLim 0.000000
ph Fixed -1.000000
ph sign 1.000000
ph InterruptMode 0.000000
ph AccessCode 2.000000
# Motor chi
chi SoftZero 0.000000
chi SoftLowerLim 270.000000
chi SoftUpperLim 70.000000
chi Fixed -1.000000
chi sign 1.000000
chi InterruptMode 0.000000
chi AccessCode 2.000000
# Motor ch
ch SoftZero 0.000000
ch SoftLowerLim 270.000000
ch SoftUpperLim 70.000000
ch Fixed -1.000000
ch sign 1.000000
ch InterruptMode 0.000000
ch AccessCode 2.000000
# Motor a20
a20 SoftZero 0.000000
a20 SoftLowerLim 318.000000
a20 SoftUpperLim 0.000000
a20 Fixed -1.000000
a20 sign 1.000000
a20 InterruptMode 0.000000
a20 AccessCode 2.000000
# Motor a10
a10 SoftZero 0.000000
a10 SoftLowerLim 270.000000
a10 SoftUpperLim 70.000000
a10 Fixed -1.000000
a10 sign 1.000000
a10 InterruptMode 0.000000
a10 AccessCode 2.000000
# Motor th
th SoftZero 0.000000
th SoftLowerLim -17.000000
th SoftUpperLim 69.000000
th Fixed -1.000000
th sign 1.000000
th InterruptMode 0.000000
th AccessCode 2.000000
# Motor agl
agl SoftZero -0.490000
agl SoftLowerLim -9.510000
agl SoftUpperLim 10.490000
agl Fixed -1.000000
agl sign 1.000000
agl InterruptMode 0.000000
agl AccessCode 2.000000
# Motor sgu
sgu SoftZero 0.000000
sgu SoftLowerLim -16.000000
sgu SoftUpperLim 16.000000
sgu Fixed -1.000000
sgu sign 1.000000
sgu InterruptMode 0.000000
sgu AccessCode 2.000000
# Motor sgl
sgl SoftZero 1.550000
sgl SoftLowerLim -17.549999
sgl SoftUpperLim 14.450000
sgl Fixed -1.000000
sgl sign 1.000000
sgl InterruptMode 0.000000
sgl AccessCode 2.000000
# Motor mgl
mgl SoftZero 1.300000
mgl SoftLowerLim -11.300000
mgl SoftUpperLim 8.700000
mgl Fixed -1.000000
mgl sign 1.000000
mgl InterruptMode 0.000000
mgl AccessCode 2.000000
# Motor atu
atu SoftZero -0.880000
atu SoftLowerLim -16.120001
atu SoftUpperLim 17.879999
atu Fixed -1.000000
atu sign 1.000000
atu InterruptMode 0.000000
atu AccessCode 2.000000
# Motor atl
atl SoftZero 0.000000
atl SoftLowerLim -17.000000
atl SoftUpperLim 17.000000
atl Fixed -1.000000
atl sign 1.000000
atl InterruptMode 0.000000
atl AccessCode 2.000000
# Motor stu
stu SoftZero 0.000000
stu SoftLowerLim -30.000000
stu SoftUpperLim 30.000000
stu Fixed -1.000000
stu sign 1.000000
stu InterruptMode 0.000000
stu AccessCode 2.000000
# Motor stl
stl SoftZero 0.000000
stl SoftLowerLim -30.000000
stl SoftUpperLim 30.000000
stl Fixed -1.000000
stl sign 1.000000
stl InterruptMode 0.000000
stl AccessCode 2.000000
# Motor mtu
mtu SoftZero 2.850000
mtu SoftLowerLim -19.850000
mtu SoftUpperLim 14.150000
mtu Fixed -1.000000
mtu sign 1.000000
mtu InterruptMode 0.000000
mtu AccessCode 2.000000
# Motor mtl
mtl SoftZero 0.000000
mtl SoftLowerLim -17.000000
mtl SoftUpperLim 17.000000
mtl Fixed -1.000000
mtl sign 1.000000
mtl InterruptMode 0.000000
mtl AccessCode 2.000000
# Motor ach
ach SoftZero 0.000000
ach SoftLowerLim -0.500000
ach SoftUpperLim 11.500000
ach Fixed -1.000000
ach sign 1.000000
ach InterruptMode 0.000000
ach AccessCode 2.000000
# Motor sro
sro SoftZero 0.000000
sro SoftLowerLim 0.000000
sro SoftUpperLim 351.000000
sro Fixed -1.000000
sro sign 1.000000
sro InterruptMode 0.000000
sro AccessCode 2.000000
# Motor mcv
mcv SoftZero 0.000000
mcv SoftLowerLim -9.000000
mcv SoftUpperLim 124.000000
mcv Fixed -1.000000
mcv sign 1.000000
mcv InterruptMode 0.000000
mcv AccessCode 2.000000
# Motor a6
a6 SoftZero 0.040000
a6 SoftLowerLim -116.040001
a6 SoftUpperLim 165.960007
a6 Fixed -1.000000
a6 sign 1.000000
a6 InterruptMode 0.000000
a6 AccessCode 2.000000
# Motor a5
a5 SoftZero 176.479996
a5 SoftLowerLim -376.479980
a5 SoftUpperLim 23.520004
a5 Fixed -1.000000
a5 sign 1.000000
a5 InterruptMode 0.000000
a5 AccessCode 2.000000
# Motor a4
a4 SoftZero 0.000000
a4 SoftLowerLim -17.000000
a4 SoftUpperLim 69.000000
a4 SoftZero -0.710000
a4 SoftLowerLim -134.389999
a4 SoftUpperLim 124.110001
a4 Fixed -1.000000
a4 sign 1.000000
a4 InterruptMode 0.000000
a4 AccessCode 2.000000
# Motor om
om SoftZero 0.000000
om SoftLowerLim -9.000000
om SoftUpperLim 33.000000
om Fixed -1.000000
om sign 1.000000
om InterruptMode 0.000000
om AccessCode 2.000000
# Motor a3
a3 SoftZero 0.000000
a3 SoftLowerLim -9.000000
a3 SoftUpperLim 33.000000
a3 SoftZero 11.540000
a3 SoftLowerLim -188.839996
a3 SoftUpperLim 165.760010
a3 Fixed -1.000000
a3 sign 1.000000
a3 InterruptMode 0.000000
a3 AccessCode 2.000000
# Motor a37
a37 SoftZero 0.000000
a37 SoftLowerLim 0.000000
a37 SoftUpperLim 555.000000
a37 Fixed -1.000000
a37 sign 1.000000
a37 InterruptMode 0.000000
a37 AccessCode 2.000000
# Motor a26
a26 SoftZero 0.000000
a26 SoftLowerLim 0.000000
a26 SoftUpperLim 10.000000
a26 Fixed -1.000000
a26 sign 1.000000
a26 InterruptMode 0.000000
a26 AccessCode 2.000000
# Motor a25
a25 SoftZero 0.000000
a25 SoftLowerLim -3.000000
a25 SoftUpperLim 5.500000
a25 Fixed -1.000000
a25 sign 1.000000
a25 InterruptMode 0.000000
a25 AccessCode 2.000000
# Motor a24
a24 SoftZero 0.000000
a24 SoftLowerLim -6.000000
a24 SoftUpperLim 3.000000
a24 Fixed -1.000000
a24 sign 1.000000
a24 InterruptMode 0.000000
a24 AccessCode 2.000000
# Motor a23
a23 SoftZero 0.000000
a23 SoftLowerLim -10.000000
a23 SoftUpperLim 10.000000
a23 Fixed -1.000000
a23 sign 1.000000
a23 InterruptMode 0.000000
a23 AccessCode 2.000000
# Motor a22
a22 SoftZero 0.000000
a22 SoftLowerLim -9.500000
a22 SoftUpperLim 10.000000
a22 Fixed -1.000000
a22 sign 1.000000
a22 InterruptMode 0.000000
a22 AccessCode 2.000000
# Motor b1
b1 SoftZero 0.000000
b1 SoftLowerLim -160.000000
b1 SoftUpperLim 160.000000
b1 Fixed -1.000000
b1 sign 1.000000
b1 InterruptMode 0.000000
b1 AccessCode 2.000000
# Motor a16
a16 SoftZero 0.000000
a16 SoftLowerLim 0.000000
a16 SoftUpperLim 10.000000
a16 Fixed -1.000000
a16 sign 1.000000
a16 InterruptMode 0.000000
a16 AccessCode 2.000000
# Motor a15
a15 SoftZero 0.000000
a15 SoftLowerLim -3.000000
a15 SoftUpperLim 6.000000
a15 Fixed -1.000000
a15 sign 1.000000
a15 InterruptMode 0.000000
a15 AccessCode 2.000000
# Motor a14
a14 SoftZero 0.000000
a14 SoftLowerLim -5.500000
a14 SoftUpperLim 3.000000
a14 Fixed -1.000000
a14 sign 1.000000
a14 InterruptMode 0.000000
a14 AccessCode 2.000000
# Motor a13
a13 SoftZero 0.000000
a13 SoftLowerLim -10.000000
a13 SoftUpperLim 9.500000
a13 Fixed -1.000000
a13 sign 1.000000
a13 InterruptMode 0.000000
a13 AccessCode 2.000000
# Motor a12
a12 SoftZero 0.000000
a12 SoftLowerLim -10.000000
a12 SoftUpperLim 10.000000
a12 Fixed -1.000000
a12 sign 1.000000
a12 InterruptMode 0.000000
a12 AccessCode 2.000000
# Motor a2
a2 SoftZero -0.010000
a2 SoftLowerLim 33.109997
a2 SoftUpperLim 120.010002
a2 Fixed -1.000000
a2 sign 1.000000
a2 InterruptMode 0.000000
a2 AccessCode 2.000000
# Motor a1
a1 SoftZero 0.000000
a1 SoftLowerLim 120.000000
a1 SoftUpperLim 15.000000
a1 SoftZero 0.590000
a1 SoftLowerLim -0.590000
a1 SoftUpperLim 110.410004
a1 Fixed -1.000000
a1 sign 1.000000
a1 InterruptMode 0.000000
a1 AccessCode 2.000000
# Motor cex2
cex2 SoftZero 0.000000
cex2 SoftLowerLim -400.000000
cex2 SoftUpperLim 400.000000
cex2 Fixed -1.000000
cex2 sign 1.000000
cex2 InterruptMode 0.000000
cex2 AccessCode 2.000000
# Motor cex1
cex1 SoftZero 0.000000
cex1 SoftLowerLim -400.000000
cex1 SoftUpperLim 400.000000
cex1 Fixed -1.000000
cex1 sign 1.000000
cex1 InterruptMode 0.000000
cex1 AccessCode 2.000000
# Motor dg3
dg3 SoftZero 0.000000
dg3 SoftLowerLim -10.000000
dg3 SoftUpperLim 39.500000
dg3 Fixed -1.000000
dg3 sign 1.000000
dg3 InterruptMode 0.000000
dg3 AccessCode 2.000000
# Motor dg2
dg2 SoftZero 0.000000
dg2 SoftLowerLim -10.000000
dg2 SoftUpperLim 39.500000
dg2 Fixed -1.000000
dg2 sign 1.000000
dg2 InterruptMode 0.000000
dg2 AccessCode 2.000000
# Motor dg1
dg1 SoftZero 0.000000
dg1 SoftLowerLim -10.000000
dg1 SoftUpperLim 39.500000
dg1 Fixed -1.000000
dg1 sign 1.000000
dg1 InterruptMode 0.000000
dg1 AccessCode 2.000000
# Motor sph
sph SoftZero 0.000000
sph SoftLowerLim 318.000000
sph SoftUpperLim 0.000000
sph Fixed -1.000000
sph sign 1.000000
sph InterruptMode 0.000000
sph AccessCode 2.000000
# Motor sch
sch SoftZero 0.000000
sch SoftLowerLim 270.000000
sch SoftUpperLim 70.000000
sch Fixed -1.000000
sch sign 1.000000
sch InterruptMode 0.000000
sch AccessCode 2.000000
# Motor stt
stt SoftZero 0.000000
stt SoftLowerLim -17.000000
stt SoftUpperLim 69.000000
stt Fixed -1.000000
stt sign 1.000000
stt InterruptMode 0.000000
stt AccessCode 2.000000
# Motor som
som SoftZero 0.000000
som SoftLowerLim -9.000000
som SoftUpperLim 33.000000
som Fixed -1.000000
som sign 1.000000
som InterruptMode 0.000000
som AccessCode 2.000000
# Motor mexz
mexz SoftZero 0.000000
mexz SoftLowerLim 0.000000
mexz SoftUpperLim 555.000000
mexz Fixed -1.000000
mexz sign 1.000000
mexz InterruptMode 0.000000
mexz AccessCode 2.000000
# Motor mcvl
mcvl SoftZero 0.000000
mcvl SoftLowerLim 0.000000
mcvl SoftUpperLim 10.000000
mcvl Fixed -1.000000
mcvl sign 1.000000
mcvl InterruptMode 0.000000
mcvl AccessCode 2.000000
# Motor mgpl
mgpl SoftZero 0.000000
mgpl SoftLowerLim -3.000000
mgpl SoftUpperLim 5.500000
mgpl Fixed -1.000000
mgpl sign 1.000000
mgpl InterruptMode 0.000000
mgpl AccessCode 2.000000
# Motor mgvl
mgvl SoftZero 0.000000
mgvl SoftLowerLim -6.000000
mgvl SoftUpperLim 3.000000
mgvl Fixed -1.000000
mgvl sign 1.000000
mgvl InterruptMode 0.000000
mgvl AccessCode 2.000000
# Motor mtpl
mtpl SoftZero 0.000000
mtpl SoftLowerLim -10.000000
mtpl SoftUpperLim 10.000000
mtpl Fixed -1.000000
mtpl sign 1.000000
mtpl InterruptMode 0.000000
mtpl AccessCode 2.000000
# Motor mtvl
mtvl SoftZero 0.000000
mtvl SoftLowerLim -9.500000
mtvl SoftUpperLim 10.000000
mtvl Fixed -1.000000
mtvl sign 1.000000
mtvl InterruptMode 0.000000
mtvl AccessCode 2.000000
# Motor moml
moml SoftZero 0.000000
moml SoftLowerLim -160.000000
moml SoftUpperLim 160.000000
moml Fixed -1.000000
moml sign 1.000000
moml InterruptMode 0.000000
moml AccessCode 2.000000
# Motor mcvu
mcvu SoftZero 0.000000
mcvu SoftLowerLim 0.000000
mcvu SoftUpperLim 10.000000
mcvu Fixed -1.000000
mcvu sign 1.000000
mcvu InterruptMode 0.000000
mcvu AccessCode 2.000000
# Motor mgpu
mgpu SoftZero 0.000000
mgpu SoftLowerLim -3.000000
mgpu SoftUpperLim 6.000000
mgpu Fixed -1.000000
mgpu sign 1.000000
mgpu InterruptMode 0.000000
mgpu AccessCode 2.000000
# Motor mgvu
mgvu SoftZero 0.000000
mgvu SoftLowerLim -5.500000
mgvu SoftUpperLim 3.000000
mgvu Fixed -1.000000
mgvu sign 1.000000
mgvu InterruptMode 0.000000
mgvu AccessCode 2.000000
# Motor mtpu
mtpu SoftZero 0.000000
mtpu SoftLowerLim -10.000000
mtpu SoftUpperLim 9.500000
mtpu Fixed -1.000000
mtpu sign 1.000000
mtpu InterruptMode 0.000000
mtpu AccessCode 2.000000
# Motor mtvu
mtvu SoftZero 0.000000
mtvu SoftLowerLim -10.000000
mtvu SoftUpperLim 10.000000
mtvu Fixed -1.000000
mtvu sign 1.000000
mtvu InterruptMode 0.000000
mtvu AccessCode 2.000000
# Motor momu
momu SoftZero 0.000000
momu SoftLowerLim 120.000000
momu SoftUpperLim 15.000000
momu Fixed -1.000000
momu sign 1.000000
momu InterruptMode 0.000000
momu AccessCode 2.000000
lambda 0.000000
lambda setAccess 1
monochromator UNKNOWN
monochromator setAccess 2
distance 0.000000
distance setAccess 2
user Daniel_the_Clementine
user setAccess 2
sample DanielOxid
sample setAccess 2
title TopsiTupsiTapsi
title setAccess 2