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

Merge changes made in-situ.

Browse Source 
r2842 | ffr | 2009-12-10 14:57:53 +1100 (Thu, 10 Dec 2009) | 2 lines
This commit is contained in:
Ferdi Franceschini
2009-12-10 14:57:53 +11:00
committed by Douglas Clowes
parent f494ece7e7
commit b6ed01fc13
8 changed files with 96 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
site_ansto/instrument/hrpd/config/anticollider/acscript.txt
View File

@@ -11,7 +11,7 @@
#-----------monochromator rotation---------------
for mom forbid {0 48}
for mom forbid {0 43}
#----------primary collimator translation--------
for pcx forbid {80 130}
#----------primary collimator rotation-----------

23
site_ansto/instrument/hrpd/config/motors/motor_configuration.tcl
View File

@@ -1,5 +1,5 @@
# $Revision: 1.36 $
# $Date: 2009-11-24 22:56:47 $
# $Revision: 1.37 $
# $Date: 2009-12-10 03:57:53 $
# Author: Ferdi Franceschini (ffr@ansto.gov.au)
# Last revision by: $Author: ffr $
@@ -32,16 +32,19 @@ if {$sim_mode == "true"} {
}
#Measured absolute encoder reading at home position
set mphi_Home 11839906
set mchi_Home 8417936
#set mphi_Home 11839906
set mphi_Home 7800343
set mchi_Home 8255816
set my_Home 7781389
set mx_Home 7580366
#set mx_Home 7580366
set mx_Home 6654296
#set mom_Home 13442930
set mom_Home 13447313
set mtth_Home 11534660
set pcx_Home 8345600
set pcr_Home 5440000
set scr_Home 31734679
#set scr_Home 31734679
set scr_Home 31742770
set sphi_Home 7924507
set schi_Home 7542917
set sy_Home 7626584
@@ -163,7 +166,7 @@ Motor mchi $motor_driver_type [params \
axis B\
units degrees\
hardlowerlim -2\
hardupperlim 92\
hardupperlim 2\
maxSpeed 1\
maxAccel 1\
maxDecel 1\
@@ -172,7 +175,7 @@ Motor mchi $motor_driver_type [params \
absEncHome $mchi_Home\
cntsPerX 8192]
mchi softlowerlim -2
mchi softupperlim 92
mchi softupperlim 2
mchi speed 1
mchi movecount $move_count
mchi precision 0.01
@@ -226,7 +229,7 @@ Motor mom $motor_driver_type [params \
asyncqueue mc1\
axis E\
units degrees\
hardlowerlim -1\
hardlowerlim 43\
hardupperlim 140\
maxSpeed 1\
maxAccel 1\
@@ -290,7 +293,7 @@ Motor pcx $motor_driver_type [params \
asyncqueue mc1\
axis G\
units mm\
hardlowerlim 0\
hardlowerlim -3\
hardupperlim 154.2\
maxSpeed 10\
maxAccel 1\

8
site_ansto/instrument/hrpd/echidna_configuration.tcl
View File

@@ -1,5 +1,5 @@
# $Revision: 1.37 $
# $Date: 2009-11-24 22:56:47 $
# $Revision: 1.38 $
# $Date: 2009-12-10 03:57:53 $
# Author: Ferdi Franceschini (ffr@ansto.gov.au)
# Last revision by: $Author: ffr $
@@ -46,8 +46,8 @@ source gumxml.tcl
# ::environment::temperature::add_ls340t tc1 1
# ::environment::temperature::add_ls340t tc2 2
# ::environment::temperature::add_west400
::robot::add_robby
# ::environment::temperature::add_west400 137.157.201.14
::robot::add_robby
server_init
###########################################
# WARNING: Do not add any code below server_init, if you do SICS may fail to initialise properly.