- Fixed sicsprompt bug. Sicsprompt caused a core dump
- Removed generation of incommenurate reflections for 0,0,0 in fourmess.c - Implemented a Poch command for heartbeats - Fixed 64 bit dimension issues in nxdict - Fixed different calling conventions for NXReportError deep stack in nxdict - Stopped ei motor driving when not necessary - Added yet another monitor for POLDI - Added a protocoll driver for the JVL motor RS-485 binary protocoll - Fixed some reporting issues SKIPPED: psi/jvlprot.c psi/make_gen psi/polterwrite.c psi/psi.c psi/spss7.c
This commit is contained in:
@ -1,3 +1,4 @@
|
||||
|
||||
exe batchpath ./
|
||||
exe syspath ./
|
||||
|
||||
@ -218,15 +219,20 @@ 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 +244,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,13 +256,32 @@ 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
|
||||
|
||||
|
||||
nano targetposition -50
|
||||
nano sign 1
|
||||
nano softzero 0
|
||||
nano softlowerlim -10000
|
||||
nano softupperlim 10000
|
||||
nano fixed -1
|
||||
nano interruptmode 0
|
||||
nano precision 0.01
|
||||
nano accesscode 2
|
||||
nano failafter 3
|
||||
nano maxretry 3
|
||||
nano ignorefault 0
|
||||
nano movecount 10
|
||||
|
||||
|
@ -797,3 +797,21 @@ source ../sim/poldi_sics/zug.tcl
|
||||
|
||||
#MakeSPSS7 s7 203 251 129.129.195.55:2005
|
||||
#MakeSPSS7 s7 203 251 localhost:8090
|
||||
|
||||
set jvl 0
|
||||
|
||||
if {$jvl == 1} {
|
||||
source ../sim/boa_sics/jvl.tcl
|
||||
makesctcontroller jvlsct jvl localhost:8080
|
||||
jvlsct debug -1
|
||||
jvl::make ja 2 jvlsct -10000 10000 120
|
||||
}
|
||||
|
||||
set nanotec 1
|
||||
|
||||
if {$nanotec == 1} {
|
||||
source ../sim/boa_sics/nanotec.tcl
|
||||
makesctcontroller nanosct std localhost:8080 \r 1 \r
|
||||
nanosct debug -1
|
||||
nanotec::make nano 1 nanosct -100000 100000 120
|
||||
}
|
||||
|
Reference in New Issue
Block a user