linse/sics
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SICS-188 hdb_path is now a comma separated list of paths. NOTE: nodes listed as derived parameter dependencies aren't added to the path.

Browse Source 
sans/config/hmm/detector.tcl
Use dns-name for voltage controller address.

sans/config/motors/motor_configuration.tcl
Set det home position.
SICS-122 Added FastShutter variable and configured det motor with an action object to set the FastShutter variable.
SICS-248 Replaced beamstop motor objects with beamstop action objects.

action.[ch]
The action object factory will eventuall be defined here.
SICS-122 Currently there is just a funcion which sets the FastShutter variable

beamstopaction.c
Added motion control enabled check.
Added "list" subcommand.

Makefile
Compile action.c

motor_dmc2280.c
The status check command now always checks the TI1 and TI0 interrupts.
Added action-object configuration parameter.  Call AO_istatus with TI1
if configured with an action object.

r2674 | ffr | 2008-08-13 14:16:30 +1000 (Wed, 13 Aug 2008) | 26 lines
This commit is contained in:
Ferdi Franceschini
2008-08-13 14:16:30 +10:00
committed by Douglas Clowes
parent 7c7ed6cbf9
commit 8a07f5eaf6
7 changed files with 124 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
site_ansto/instrument/sans/config/motors/motor_configuration.tcl
View File

@@ -1,9 +1,10 @@
# $Revision: 1.22 $
# $Date: 2008-08-07 06:18:17 $
# $Revision: 1.23 $
# $Date: 2008-08-13 04:16:30 $
# Author: Ferdi Franceschini (ffr@ansto.gov.au)
# Last revision by: $Author: ffr $
# START MOTOR CONFIGURATION
::utility::mkVar FastShutter text manager FastShutter false instrument true false
set animal quokka
set sim_mode [SplitReply [motor_simulation]]
@@ -56,7 +57,7 @@ set samx_Home 7414223
set samy_Home 7101486
set samz_Home 9944901
set samthet_Home 22997883
set det_Home 7047593
set det_Home 7055209
set detoff_Home 6932100
set pent_Home 8123563
@@ -370,6 +371,7 @@ Motor det $motor_driver_type [params \
asyncqueue mc1\
host mc1-quokka\
port pmc1-quokka\
aoid MC1\
axis G\
units mm\
hardlowerlim 350\
@@ -385,7 +387,7 @@ det part detector
det long_name detector_y
det softlowerlim 400
det softupperlim 18900
det home 0
det home 350.5
det speed 20
# Detector translation across beam [-50,450] mm
@@ -804,7 +806,7 @@ Motor att $motor_driver_type [params \
cntsPerX [expr -($att_factor*8192.0)]]
att part collimator
att long_name att
setHomeandRange -motor att -home 0 -lowrange -30 -uprange 7230
setHomeandRange -motor att -home 0 -lowrange 0 -uprange 7230
att speed 5
############################
@@ -858,7 +860,17 @@ bsz softlowerlim -240
bsz softupperlim 100
bsz home 0
# beam stop disk 5 (largest)
if {1} {
# largest to smallest
# MakeActionObject obj aQ JG-speed upsw downsw axis
MakeActionObject bs1 mc4 [expr $bs124sign*$bs_steps_per_rev*$bs1gear/360.0] 8 4 C
MakeActionObject bs2 mc4 [expr $bs124sign*$bs_steps_per_rev*$bs2gear/360.0] 8 4 D
MakeActionObject bs3 mc4 [expr $bs35sign*$bs_steps_per_rev*$bs3gear/360.0] 4 8 E
MakeActionObject bs4 mc4 [expr $bs124sign*$bs_steps_per_rev*$bs4gear/360.0] 8 4 F
MakeActionObject bs5 mc4 [expr $bs35sign*$bs_steps_per_rev*$bs5gear/360.0] 4 8 G
} else {
# beam stop disk 5 (smallest)
Motor bs5 $motor_driver_type [params \
asyncqueue mc4\
host mc4-quokka\
@@ -938,7 +950,7 @@ bs2 softlowerlim 0
bs2 softupperlim 90
bs2 home 0
# beam stop disk 1 (smallest)
# beam stop disk 1 (largest)
Motor bs1 $motor_driver_type [params \
asyncqueue mc4\
host mc4-quokka\
@@ -957,6 +969,7 @@ bs1 long_name bs1
bs1 softlowerlim 0
bs1 softupperlim 90
bs1 home 0
}
# Polarizer Rotation
Motor pol $motor_driver_type [params \