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

Merge branch 'RELEASE-3_1' into RELEASE-3_2

Browse Source 
Conflicts:
	sics/site_ansto/instrument/bilby/config/chopper/sct_astrium_chopper.tcl
	sics/site_ansto/instrument/hipd/wombat_configuration.tcl
	sics/site_ansto/instrument/pelican/pelican_configuration.tcl
This commit is contained in:
Douglas Clowes
2014-08-06 13:53:18 +10:00
parent 05dc1958ff 639e4dc3c8
commit 507ddafb2a
80 changed files with 2274 additions and 819 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
site_ansto/instrument/pelican/config/INSTCFCOMMON.TXT
View File

@@ -15,6 +15,13 @@ config/scan/scan_common_1.hdd
config/scan/scan_common_1.tcl
config/nexus/nxscripts_common_1.tcl
config/environment/
config/environment/he3
config/environment/magneticField
config/environment/pressure
config/environment/temperature
config/commands/commands_common.tcl
config/commands/pulser.tcl
config/commands/hvcommands.tcl
config/motors/sct_positmotor_common.tcl
config/motors/sct_jogmotor_common.tcl
config/motors/magnet_configuration.tcl

78
site_ansto/instrument/pelican/config/motors/motor_configuration.tcl
View File

@@ -67,6 +67,40 @@ set gv1_Shut 33221600
# hnotify messages to a reasonable level
set move_count 100
# CHOOSE HERE for sample stage configuration
##########################################
# Set axis_config as follows to use different axis configurations
# 0: normal stage configuration
# 1: Oxford magnet sample stick
set axis_config 0
if { [ info exists ::config_dict ] } {
if { [ dict exists $::config_dict sample_stage implementation ] } {
set implementation [ dict get $::config_dict sample_stage implementation ]
if {$implementation == "normal_sample_stage"} {
set axis_config 0
} elseif {$implementation == "12tmagnet_sample_insert"} {
set axis_config 1
} else {
set axis_config 0
}
}
}
switch $axis_config {
0 {
set use_normal_config "true"
}
1 {
set magmot "mscor"
set magmot_aq "mc2"
set magmot_axis "F"
set use_normal_config "false"
fileeval $cfPath(motors)/magnet_configuration.tcl
}
}
############################
# Motor Controller 1
# Motor Controller 1
@@ -381,29 +415,31 @@ gom softlowerlim -15
gom softupperlim 15
gom home 0
if {$use_normal_config == "true"} {
# mc2: Sample rotation correction - 10 deg rotation
set scorStepRate [expr { 25000.0 * 100.0 / 360.0 }]
set scorStepRate [expr { 25000.0 * 100.0 / 360.0 }]
Motor scor $motor_driver_type [params \
asyncqueue mc2\
host mc2-pelican\
port pmc2-pelican\
axis F\
units degrees\
hardlowerlim 0\
hardupperlim 360\
maxSpeed [expr 25000.0/$scorStepRate]\
maxAccel [expr 25000.0/$scorStepRate]\
maxDecel [expr 25000.0/$scorStepRate]\
stepsPerX $scorStepRate\
absEnc 1\
absEncHome $scor_Home\
cntsPerX -[expr { 8192.0 * 100.0 / 360.0 }]]
scor part sample
scor long_name scor
scor softlowerlim 0
scor softupperlim 360
scor home 180
Motor scor $motor_driver_type [params \
asyncqueue mc2\
host mc2-pelican\
port pmc2-pelican\
axis F\
units degrees\
hardlowerlim 0\
hardupperlim 360\
maxSpeed [expr 25000.0/$scorStepRate]\
maxAccel [expr 25000.0/$scorStepRate]\
maxDecel [expr 25000.0/$scorStepRate]\
stepsPerX $scorStepRate\
absEnc 1\
absEncHome $scor_Home\
cntsPerX -[expr { 8192.0 * 100.0 / 360.0 }]]
scor part sample
scor long_name scor
scor softlowerlim 0
scor softupperlim 360
scor home 180
}
############################
# Motor Controller 3