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

add motors

Browse Source 
r3055 | jgn | 2011-02-15 11:49:27 +1100 (Tue, 15 Feb 2011) | 2 lines
This commit is contained in:
Jing Chen
2011-02-15 11:49:27 +11:00
committed by Douglas Clowes
parent d894dfca56
commit fb86744209
5 changed files with 627 additions and 742 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
site_ansto/instrument/lyrebird/config/anticollider/acscript.txt
View File

@@ -1,3 +1,3 @@
# Forbid detector motion when the detector voltage is on
forbid {-inf inf} for det when dhv1 in {800 inf}
forbid {-inf inf} for detoff when dhv1 in {800 inf}
#forbid {-inf inf} for det when dhv1 in {800 inf}
#forbid {-inf inf} for detoff when dhv1 in {800 inf}

1340
site_ansto/instrument/lyrebird/config/motors/motor_configuration.tcl
View File

File diff suppressed because it is too large Load Diff

12
site_ansto/instrument/lyrebird/config/motors/positmotor_configuration.tcl
View File

@@ -1,13 +1,20 @@
# Author: Jing Chen (jgn@ansto.gov.au)
source $cfPath(motors)/sct_positmotor_common.tcl
set port1 [portnum pmc1-lyrebird]
set port2 [portnum pmc2-lyrebird]
set port3 [portnum pmc3-lyrebird]
set port4 [portnum pmc4-lyrebird]
set port5 [portnum pmc5-lyrebird]
set port6 [portnum pmc6-lyrebird]
makesctcontroller sct_mc1 std mc1-lyrebird:$port1
makesctcontroller sct_mc2 std mc2-lyrebird:$port2
makesctcontroller sct_mc3 std mc3-lyrebird:$port3
makesctcontroller sct_mc4 std mc4-lyrebird:$port4
makesctcontroller sct_mc5 std mc5-lyrebird:$port5
makesctcontroller sct_mc6 std mc6-lyrebird:$port6
# label pos
#index position
@@ -34,7 +41,7 @@ set 20sample_table {
20 -464.3
}
mkPosit sct_mc1 sampleNum float samx sample $20sample_table
#mkPosit sct_mc1 sampleNum float samx sample $20sample_table
#diameter position
set auto_ap_table {
@@ -49,5 +56,6 @@ set auto_ap_table {
25.0 -215
30.0 -250
}
mkPosit sct_mc3 diameter float apx sample $auto_ap_table
#mkPosit sct_mc3 diameter float apx sample $auto_ap_table

7
site_ansto/instrument/lyrebird/lyrebird_configuration.tcl
View File

@@ -14,11 +14,12 @@ source server_config.tcl
########################################
# INSTRUMENT SPECIFIC CONFIGURATION
fileeval $cfPath(motors)/motor_configuration.tcl
fileeval $cfPath(source)/source.tcl
source $cfPath(hipadaba)/hipadaba_configuration.tcl
fileeval $cfPath(motors)/motor_configuration.tcl
fileeval $cfPath(motors)/sct_flightTube.tcl
fileeval $cfPath(motors)/positmotor_configuration.tcl
#fileeval $cfPath(velsel)/velsel.tcl
#fileeval $cfPath(parameters)/parameters.tcl

6
site_ansto/instrument/tas/config/commands/commands.tcl
View File

@@ -94,7 +94,8 @@ proc selbs {bs {bx "UNDEF"} {bz "UNDEF"}} {
}
}
set detoff_val [SplitReply [detoff]]
# comment out -- Jing
#set detoff_val [SplitReply [detoff]]
if {$bx == "UNDEF" || $bz == "UNDEF"} {
statemon start selbs
@@ -115,7 +116,8 @@ proc selbs {bs {bx "UNDEF"} {bz "UNDEF"}} {
error "beam coordinates must be floats"
}
}
set bsx_target [expr {$bx-$Xbsf+$detoff_val}]
# comment out -- Jing
#set bsx_target [expr {$bx-$Xbsf+$detoff_val}]
set bsz_target [expr {$bz-$Zbsf}]
statemon start selbs