
- In support of HMsec, allow the count command in countsec to run without a preset parameter. If this is missing the old, stored preset is used. - Removed a check which causes initialisation of the HM from a batch file fail for POLDI - fixed @nl@ encoding of \n problem with certain kinds of batch files generated by GTSE - Fixed a bug with summing on hitsmemsec. nxdataset now uses 64 bit int for dimensions. - Fixed motorsec to remove itself properly from a parent when linked. Please note that there is still the limitation that a second generation motor can only be linked once in a Hipadaba tree - Extended subsampling a HM for second generation HM - Added a hscriptnotify. This calls a script on the update of a node - POLDI has been rebuilt, chnages to data file writing - For testing, sinqhttopt now understands a special command, byteswapoff, which switches off byte swapping. Required when the HM ius run on an Intel box. SKIPPED: psi/polterwrite.c psi/sinqhttpopt.c
280 lines
6.1 KiB
Tcl
280 lines
6.1 KiB
Tcl
|
|
|
|
exe batchpath ./
|
|
exe syspath ./
|
|
|
|
#--- BEGIN (commands producing errors on last restore)
|
|
#--- END (commands producing errors on last restore)
|
|
|
|
lotte bloerzx
|
|
lotte setAccess 2
|
|
# Motor brumm
|
|
brumm sign 1.000000
|
|
brumm SoftZero 0.000000
|
|
brumm SoftLowerLim -180.000000
|
|
brumm SoftUpperLim 180.000000
|
|
brumm Fixed -1.000000
|
|
brumm InterruptMode 0.000000
|
|
brumm precision 0.010000
|
|
brumm ignorefault 0.000000
|
|
brumm AccessCode 2.000000
|
|
brumm failafter 3.000000
|
|
brumm maxretry 3.000000
|
|
brumm movecount 10.000000
|
|
# Motor miau
|
|
miau sign 1.000000
|
|
miau SoftZero 0.000000
|
|
miau SoftLowerLim -180.000000
|
|
miau SoftUpperLim 180.000000
|
|
miau Fixed -1.000000
|
|
miau InterruptMode 0.000000
|
|
miau precision 0.010000
|
|
miau ignorefault 0.000000
|
|
miau AccessCode 2.000000
|
|
miau failafter 3.000000
|
|
miau maxretry 3.000000
|
|
miau movecount 10.000000
|
|
# Counter aba
|
|
aba SetPreset 1000.000000
|
|
aba SetMode Timer
|
|
# Counter hugo
|
|
hugo SetPreset 1000.000000
|
|
hugo SetMode Timer
|
|
# Counter lieselotte
|
|
lieselotte SetPreset 1000.000000
|
|
lieselotte SetMode Timer
|
|
# Counter multi
|
|
multi SetPreset 0.000000
|
|
multi SetMode Timer
|
|
# Motor a1
|
|
a1 sign 1.000000
|
|
a1 SoftZero 0.000000
|
|
a1 SoftLowerLim -2.000000
|
|
a1 SoftUpperLim 180.000000
|
|
a1 Fixed -1.000000
|
|
a1 InterruptMode 0.000000
|
|
a1 precision 0.010000
|
|
a1 ignorefault 0.000000
|
|
a1 AccessCode 2.000000
|
|
a1 failafter 3.000000
|
|
a1 maxretry 3.000000
|
|
a1 movecount 10.000000
|
|
# Motor a2
|
|
a2 sign 1.000000
|
|
a2 SoftZero 0.000000
|
|
a2 SoftLowerLim 30.000000
|
|
a2 SoftUpperLim 150.000000
|
|
a2 Fixed -1.000000
|
|
a2 InterruptMode 0.000000
|
|
a2 precision 0.010000
|
|
a2 ignorefault 0.000000
|
|
a2 AccessCode 2.000000
|
|
a2 failafter 3.000000
|
|
a2 maxretry 3.000000
|
|
a2 movecount 10.000000
|
|
# Motor a3
|
|
a3 sign 1.000000
|
|
a3 SoftZero 0.000000
|
|
a3 SoftLowerLim -360.000000
|
|
a3 SoftUpperLim 360.000000
|
|
a3 Fixed -1.000000
|
|
a3 InterruptMode 0.000000
|
|
a3 precision 0.010000
|
|
a3 ignorefault 0.000000
|
|
a3 AccessCode 2.000000
|
|
a3 failafter 3.000000
|
|
a3 maxretry 3.000000
|
|
a3 movecount 10.000000
|
|
# Motor a4
|
|
a4 sign 1.000000
|
|
a4 SoftZero 0.000000
|
|
a4 SoftLowerLim -180.000000
|
|
a4 SoftUpperLim 180.000000
|
|
a4 Fixed -1.000000
|
|
a4 InterruptMode 0.000000
|
|
a4 precision 0.010000
|
|
a4 ignorefault 0.000000
|
|
a4 AccessCode 2.000000
|
|
a4 failafter 3.000000
|
|
a4 maxretry 3.000000
|
|
a4 movecount 10.000000
|
|
# Motor a5
|
|
a5 sign 1.000000
|
|
a5 SoftZero 0.000000
|
|
a5 SoftLowerLim -180.000000
|
|
a5 SoftUpperLim 180.000000
|
|
a5 Fixed -1.000000
|
|
a5 InterruptMode 0.000000
|
|
a5 precision 0.010000
|
|
a5 ignorefault 0.000000
|
|
a5 AccessCode 2.000000
|
|
a5 failafter 3.000000
|
|
a5 maxretry 3.000000
|
|
a5 movecount 10.000000
|
|
# Motor a6
|
|
a6 sign 1.000000
|
|
a6 SoftZero 0.000000
|
|
a6 SoftLowerLim -180.000000
|
|
a6 SoftUpperLim 180.000000
|
|
a6 Fixed -1.000000
|
|
a6 InterruptMode 0.000000
|
|
a6 precision 0.010000
|
|
a6 ignorefault 0.000000
|
|
a6 AccessCode 2.000000
|
|
a6 failafter 3.000000
|
|
a6 maxretry 3.000000
|
|
a6 movecount 10.000000
|
|
# Motor sgu
|
|
sgu sign 1.000000
|
|
sgu SoftZero 0.000000
|
|
sgu SoftLowerLim -20.000000
|
|
sgu SoftUpperLim 20.000000
|
|
sgu Fixed -1.000000
|
|
sgu InterruptMode 0.000000
|
|
sgu precision 0.010000
|
|
sgu ignorefault 0.000000
|
|
sgu AccessCode 2.000000
|
|
sgu failafter 3.000000
|
|
sgu maxretry 3.000000
|
|
sgu movecount 10.000000
|
|
# Motor sgl
|
|
sgl sign 1.000000
|
|
sgl SoftZero 0.000000
|
|
sgl SoftLowerLim -20.000000
|
|
sgl SoftUpperLim 20.000000
|
|
sgl Fixed -1.000000
|
|
sgl InterruptMode 0.000000
|
|
sgl precision 0.010000
|
|
sgl ignorefault 0.000000
|
|
sgl AccessCode 2.000000
|
|
sgl failafter 3.000000
|
|
sgl maxretry 3.000000
|
|
sgl movecount 10.000000
|
|
# Motor chi
|
|
chi sign 1.000000
|
|
chi SoftZero 0.000000
|
|
chi SoftLowerLim 0.000000
|
|
chi SoftUpperLim 360.000000
|
|
chi Fixed -1.000000
|
|
chi InterruptMode 0.000000
|
|
chi precision 0.010000
|
|
chi ignorefault 0.000000
|
|
chi AccessCode 2.000000
|
|
chi failafter 3.000000
|
|
chi maxretry 3.000000
|
|
chi movecount 10.000000
|
|
# Motor phi
|
|
phi sign 1.000000
|
|
phi SoftZero 0.000000
|
|
phi SoftLowerLim 0.000000
|
|
phi SoftUpperLim 360.000000
|
|
phi Fixed -1.000000
|
|
phi InterruptMode 0.000000
|
|
phi precision 0.010000
|
|
phi ignorefault 0.000000
|
|
phi AccessCode 2.000000
|
|
phi failafter 3.000000
|
|
phi maxretry 3.000000
|
|
phi movecount 10.000000
|
|
# Counter scancter
|
|
scancter SetPreset 0.000000
|
|
scancter SetMode Timer
|
|
# Counter counter
|
|
counter SetPreset 0.000000
|
|
counter SetMode Timer
|
|
hm CountMode timer
|
|
hm preset 10.000000
|
|
tof CountMode timer
|
|
tof preset 10.000000
|
|
tof genbin 10.000000 12.000000 100
|
|
tof init
|
|
#---- tasUB module tasub
|
|
tasub mono dd 3.350000
|
|
tasub mono hb1 1.000000
|
|
tasub mono hb2 1.000000
|
|
tasub mono vb1 1.000000
|
|
tasub mono vb2 1.000000
|
|
tasub mono ss 1
|
|
tasub ana dd 3.350000
|
|
tasub ana hb1 1.000000
|
|
tasub ana hb2 1.000000
|
|
tasub ana vb1 1.000000
|
|
tasub ana vb2 1.000000
|
|
tasub ana ss 1
|
|
tasub cell 1.000000 1.000000 1.000000 90.000000 90.000000 90.000000
|
|
tasub clear
|
|
tasub outofplane 1
|
|
tasub const ki
|
|
tasub ss 1
|
|
tasub setub 1.000000 0.000000 0.000000 0.000000 1.000000 0.000000 0.000000 0.000000 1.000000
|
|
tasub setnormal 0.000000 0.000000 1.000000
|
|
tasub settarget 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000
|
|
tasub r1 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00
|
|
tasub r2 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00
|
|
tasub update
|
|
#----- MultiMotor sa
|
|
sa recovernampos noeff a3 24 a4 48
|
|
|
|
|
|
ref anglesheader stt,om,chi,phi
|
|
ref clear
|
|
singlex cell { 0 0 0 0 0 0}
|
|
singlex oldub { 0 0 0 0 0 0 0 0 0}
|
|
singlex ub { 0 0 0 0 0 0 0 0 0}
|
|
singlex planenormal { 0 0 0}
|
|
singlex mode bi
|
|
singlex spacegroup P
|
|
singlex peaksearch {}
|
|
singlex peaksearch/min2t 5
|
|
singlex peaksearch/step2t 1
|
|
singlex peaksearch/max2t 15
|
|
singlex peaksearch/stepchi 2
|
|
singlex peaksearch/stepphi 0.5
|
|
singlex peaksearch/stepom 0.5
|
|
singlex peaksearch/stepnu 0.5
|
|
singlex peaksearch/phimin 0
|
|
singlex peaksearch/phimax 180
|
|
singlex peaksearch/chimin 90
|
|
singlex peaksearch/chimax 180
|
|
|
|
#HKL Settings
|
|
hkl scantolerance 2.500000
|
|
ubcalcint difftheta 0.300000
|
|
ubcalcint maxindex 5
|
|
ubcalcint maxlist 10
|
|
fmesstable clear
|
|
messref anglesheader stt,om,chi,phi
|
|
messref clear
|
|
fmess weak 0
|
|
fmess weakthreshold 20
|
|
fmess fast 0
|
|
fmess hkllim { -10 -10 10 10 10 10}
|
|
fmess sttlim { 5 180}
|
|
|
|
fmess table clear
|
|
cone target { 0 0 0}
|
|
cone qscale 1
|
|
cone center unknown
|
|
|
|
simidx sttlim 0.2
|
|
simidx anglim 0.5
|
|
|
|
simi preset 0
|
|
simi mode monitor
|
|
|
|
eva targetposition 0
|
|
eva sign 1
|
|
eva softzero 0
|
|
eva softlowerlim -40
|
|
eva softupperlim 40
|
|
eva fixed -1
|
|
eva interruptmode 0
|
|
eva precision 0.01
|
|
eva accesscode 2
|
|
eva failafter 3
|
|
eva maxretry 3
|
|
eva ignorefault 0
|
|
eva movecount 10
|
|
eva staticoffset 0
|
|
|