- Removed napi from SICS

- Added error fields to hwardware objects: motor, counter, histmem
- Optimised sinqhttpopt
- Added haddcheck which adds checks to hipadaba nodes. The current implementation
  only checks for selctions agaisnt the values property. Expand when more checks are
  required.


SKIPPED:
	psi/polterwrite.c
	psi/sinqhttpopt.c
	psi/tasinit.c
This commit is contained in:
koennecke
2013-08-14 09:50:22 +00:00
parent 255b83665c
commit 5a06bb9b90
35 changed files with 255 additions and 10598 deletions

View File

@@ -1,3 +1,5 @@
exe batchpath ./
exe syspath ./
@@ -218,15 +220,17 @@ 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 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 {}
singlex peaksearch/min2t 5
singlex peaksearch/step2t 1
singlex peaksearch/max2t 15
@@ -238,6 +242,7 @@ 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
@@ -249,16 +254,20 @@ messref clear
fmess weak 0
fmess weakthreshold 20
fmess fast 0
fmess hkllim -10 -10 10 10 10 10
fmess sttlim 5 180
fmess hkllim { -10 -10 10 10 10 10}
fmess sttlim { 5 180}
fmess table clear
cone target 0 0 0
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
@@ -273,3 +282,8 @@ eva maxretry 3
eva ignorefault 0
eva movecount 10
eva staticoffset 0

View File

@@ -833,3 +833,12 @@ if {$secmot == 1} {
MakeSecSim eva -40 40 .3
}
set zwickroll 1
if {$zwickroll == 1} {
source ../tcl/zwickroll.tcl
# makesctcontroller zwro std pc8977:50370 \r\n 5 \r\n
makesctcontroller zwro std localhost:8080 \r\n 5 \n
zwickroll::makezwickroll zwro
}