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

Merged in-situ modifications for Release 2.5 candidate 5

Browse Source 
r2895 | ffr | 2010-04-29 16:02:15 +1000 (Thu, 29 Apr 2010) | 2 lines
This commit is contained in:
Ferdi Franceschini
2010-04-29 16:02:15 +10:00
committed by Douglas Clowes
parent a2ca46ab67
commit e6e3c3be52
24 changed files with 478 additions and 363 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
site_ansto/instrument/hipd/config/hmm/hmm_configuration.tcl
View File

@@ -129,8 +129,8 @@ proc ::histogram_memory::isc_initialize {} {
::histogram_memory::init_OAT_TABLE res "std_968x128"
::histogram_memory::upload_config Filler_defaults
::nexus::data alias ::histogram_memory::vertical_axis ::histogram_memory::y_pixel_offset
::nexus::data alias ::histogram_memory::horizontal_axis ::histogram_memory::x_pixel_angular_offset
set ::histogram_memory::histmem_axes(HOR) /instrument/detector/x_pixel_angular_offset
set ::histogram_memory::histmem_axes(VER) /instrument/detector/y_pixel_offset
} message ] {
if {$::errorCode=="NONE"} {return $message}
return -code error $message

4
site_ansto/instrument/hipd/config/motors/euler_configuration.tcl
View File

@@ -10,7 +10,7 @@ Motor eom $motor_driver_type [params \
axis A\
units degrees\
hardlowerlim -45\
hardupperlim 60\
hardupperlim 80\
maxSpeed 1\
maxAccel 1\
maxDecel 1\
@@ -18,7 +18,7 @@ Motor eom $motor_driver_type [params \
absEnc 1\
absEncHome $eom_Home\
cntsPerX -8192]
setHomeandRange -motor eom -home 0 -lowrange 35 -uprange 55
setHomeandRange -motor eom -home 0 -lowrange 35 -uprange 80
eom speed 1
eom movecount $move_count
eom precision 0.01

32
site_ansto/instrument/hipd/config/motors/motor_configuration.tcl
View File

@@ -406,8 +406,8 @@ ss1r softlowerlim $ss1r_LoRange
ss1r softupperlim $ss1r_HiRange
ss1r home 0
ss1r movecount $move_count
ss1r part slits.first
ss1r long_name right
ss1r part slits
ss1r long_name first_right
# Slit 1, left
Motor ss1l $motor_driver_type [params \
@@ -425,8 +425,8 @@ ss1l softlowerlim $ss1l_LoRange
ss1l softupperlim $ss1l_HiRange
ss1l home 0
ss1l movecount $move_count
ss1l part slits.first
ss1l long_name left
ss1l part slits
ss1l long_name first_left
# Slit 1, up
Motor ss1u $motor_driver_type [params \
@@ -444,8 +444,8 @@ ss1u softlowerlim $ss1u_LoRange
ss1u softupperlim $ss1u_HiRange
ss1u home 0
ss1u movecount $move_count
ss1u part slits.first
ss1u long_name top
ss1u part slits
ss1u long_name first_top
# Slit 1, down
Motor ss1d $motor_driver_type [params \
@@ -463,8 +463,8 @@ ss1d softlowerlim $ss1d_LoRange
ss1d softupperlim $ss1d_HiRange
ss1d home 0
ss1d movecount $move_count
ss1d part slits.first
ss1d long_name bottom
ss1d part slits
ss1d long_name first_bottom
############################
# Motor Controller 4
@@ -495,8 +495,8 @@ ss2r softlowerlim $ss2r_LoRange
ss2r softupperlim $ss2r_HiRange
ss2r home 0
ss2r movecount $move_count
ss2r part slits.second
ss2r long_name right
ss2r part slits
ss2r long_name second_right
# Slit 2, left
Motor ss2l $motor_driver_type [params \
@@ -514,8 +514,8 @@ ss2l softlowerlim $ss2l_LoRange
ss2l softupperlim $ss2l_HiRange
ss2l home 0
ss2l movecount $move_count
ss2l part slits.second
ss2l long_name left
ss2l part slits
ss2l long_name second_left
# Slit 2, up
Motor ss2u $motor_driver_type [params \
@@ -533,8 +533,8 @@ ss2u softlowerlim $ss2u_LoRange
ss2u softupperlim $ss2u_HiRange
ss2u home 0
ss2u movecount $move_count
ss2u part slits.second
ss2u long_name top
ss2u part slits
ss2u long_name second_top
# Slit 2, down
Motor ss2d $motor_driver_type [params \
@@ -552,8 +552,8 @@ ss2d softlowerlim $ss2d_LoRange
ss2d softupperlim $ss2d_HiRange
ss2d home 0
ss2d movecount $move_count
ss2d part slits.second
ss2d long_name bottom
ss2d part slits
ss2d long_name second_bottom
}
proc mthGet {} { return [expr [SplitReply [mtth]]/2.0]}

14
site_ansto/instrument/hipd/wombat_configuration.tcl
View File

@@ -1,3 +1,4 @@
# Author: Ferdi Franceschini (ffr@ansto.gov.au)
# Required by server_config.tcl
@@ -30,6 +31,8 @@ fileeval $cfPath(hmm)/hmm_configuration.tcl
fileeval $cfPath(nexus)/nxscripts.tcl
fileeval $cfPath(scan)/scan.tcl
fileeval $cfPath(commands)/commands.tcl
fileeval $cfPath(commands)/pulser.tcl
fileeval $cfPath(commands)/hvcommands.tcl
fileeval $cfPath(anticollider)/anticollider.tcl
fileeval $cfPath(hmm)/hmm_rapid.tcl
source gumxml.tcl
@@ -41,14 +44,17 @@ source gumxml.tcl
# ::environment::temperature::add_ls340 tc2 2
# New Lakeshore series driver for models 340 and 336 - (tcl-code, version 20090824) - beta status
# driverName shortName IP-address portOnMoxa temperatureTolerance LakeshoreModel
# driverName shortName IP-address portOnMoxa temperatureTolerance1 Tolerance2 LakeshoreModel
# ffr 2009-11-11: NOTE I've added a line terminator argument to the ls3xx setup.
# You need to set the line termintator to either "\r\n" for CRLF or "\r" for CR
# add_ls3xx tc1 137.157.201.85 7777 "\r\n" 0.5 336
# add_ls3xx tc2 137.157.201.85 4002 "\r\n" 0.5 340
# name IP-address port term LakeshoreModel tol1 tol2
add_ls3xx tc1 137.157.201.85 7777 "\r\n" 336 5 5
# add_ls3xx tc1 137.157.201.86 4001 "\r\" 400 340
# add_ls3xx tc2 137.157.201.86 4002 "\r" 5 5 340
#::environment::temperature::add_west400
#::environment::temperature::add_west400 137.157.201.88
server_init
###########################################
# WARNING: Do not add any code below server_init, if you do SICS may fail to initialise properly.