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

Merged changes made in-situ

Browse Source 
r2768 | ffr | 2009-03-31 17:25:20 +1100 (Tue, 31 Mar 2009) | 2 lines
This commit is contained in:
Ferdi Franceschini
2009-03-31 17:25:20 +11:00
committed by Douglas Clowes
parent d2f57e4615
commit 8e5b7842e3
17 changed files with 471 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,7 +11,8 @@
for pcx forbid {80 130}
for pcr forbid {-inf inf} when mom in {45 50}
for pcr forbid {3 176} when mom in {45 50}
#for pcr forbid {-inf inf} when mom in {45 50}
for stth forbid {160 167} when mtth in {87 88}
#for stth forbid {0 15} when mtth in {139.5 140.5}
for mtth forbid {87 100} when stth in {166 167}

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

@@ -1,5 +1,5 @@
# $Revision: 1.34 $
# $Date: 2009-03-30 23:16:53 $
# $Revision: 1.35 $
# $Date: 2009-03-31 06:25:19 $
# Author: Ferdi Franceschini (ffr@ansto.gov.au)
# Last revision by: $Author: ffr $
@@ -169,7 +169,9 @@ Motor mchi $motor_driver_type [params \
absEnc 1\
absEncHome $mchi_Home\
cntsPerX 8192]
setHomeandRange -motor mchi -home 90 -lowrange 2 -uprange 2
mchi 90.1
mchi softlowerlim 88
mchi softupperlim 92
mchi speed 1
mchi movecount $move_count
mchi precision 0.01
@@ -245,7 +247,7 @@ Motor mtth $motor_driver_type [params \
axis F\
units degrees\
hardlowerlim 87\
hardupperlim 140.2\
hardupperlim 155\
maxSpeed 0.2\
maxAccel 0.2\
maxDecel 0.2\
@@ -257,7 +259,8 @@ Motor mtth $motor_driver_type [params \
absEncHome $mtth_Home\
cntsPerX -93207]
mtth softlowerlim 87
mtth softupperlim 140.2
#mtth softupperlim 140.2
mtth softupperlim 155
mtth home 90
mtth speed 0.2
mtth movecount $move_count
@@ -440,8 +443,8 @@ Motor stth $motor_driver_type [params \
axis F\
units degrees\
hardlowerlim -156.75\
hardupperlim 7.25\
maxSpeed 0.5\
hardupperlim 5.25\
maxSpeed 1.0\
maxAccel 0.1\
maxDecel 0.1\
stepsPerX 125000\
@@ -449,7 +452,7 @@ Motor stth $motor_driver_type [params \
absEncHome $stth_Home\
cntsPerX -93207]
stth softlowerlim -156.75
stth softupperlim 7.25
stth softupperlim 5.25
stth home 0
stth speed 0.5
stth movecount $move_count
@@ -699,6 +702,14 @@ Motor msd ASIM [params\
msd part sample
msd long_name mono_sample_mm
Motor sc ASIM [params\
units mm\
hardlowerlim 0\
hardupperlim 1\
]
sc part sample
sc long_name secondary_collimator
proc mthGet {} { return [expr [SplitReply [mtth]]/2.0]}
proc mthSet {val} { return "mtth=[SplitReply [mtth]]"}
publish mthSet user

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

@@ -1,5 +1,5 @@
# $Revision: 1.35 $
# $Date: 2008-10-27 04:55:44 $
# $Revision: 1.36 $
# $Date: 2009-03-31 06:25:19 $
# Author: Ferdi Franceschini (ffr@ansto.gov.au)
# Last revision by: $Author: ffr $
@@ -28,16 +28,19 @@ fileeval $cfPath(plc)/plc.tcl
fileeval $cfPath(counter)/counter.tcl
#TODO Provide method for choosing environment controller
fileeval $cfPath(environment)/temperature/lakeshore340.tcl
fileeval $cfPath(environment)/temperature/west400.tcl
fileeval $cfPath(hmm)/hmm_configuration.tcl
fileeval $cfPath(nexus)/nxscripts.tcl
fileeval $cfPath(scan)/scan.tcl
fileeval $cfPath(commands)/commands.tcl
fileeval $cfPath(anticollider)/anticollider.tcl
fileeval $cfPath(environment)/robby_configuration.tcl
source gumxml.tcl
# ::environment::temperature::add_ls340 tc1 1
# ::environment::temperature::add_ls340 tc2 2
# ::environment::temperature::add_west400
# ::environment::temperature::add_ls340 tc1 1
# ::environment::temperature::add_ls340 tc2 2
::environment::temperature::add_west400
# ::robot::add_robby
server_init
###########################################
# WARNING: Do not add any code below server_init, if you do SICS may fail to initialise properly.