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

Updates from ics1-taipan

Browse Source 
r3476 | dcl | 2012-03-21 12:53:06 +1100 (Wed, 21 Mar 2012) | 1 line
This commit is contained in:
Douglas Clowes
2012-03-21 12:53:06 +11:00
parent c400e75f6d
commit 335400ec58
3 changed files with 92 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
site_ansto/instrument/tas/config/INSTCFCOMMON.TXT
View File

@@ -2,13 +2,14 @@ config/source/source_common.tcl
config/anticollider/anticollider_common.tcl
config/plc/plc_common_1.tcl
config/counter/counter_common_1.tcl
config/environment/temperature/sct_lakeshore_340.tcl
config/environment/temperature/sct_lakeshore_336.tcl
config/hipadaba/hipadaba_configuration_common.tcl
config/hipadaba/common_instrument_dictionary.tcl
config/hipadaba/instdict_specification.tcl
config/hmm/hmm_configuration_common_1.tcl
config/hmm/hmm_object.tcl
config/hmm/anstohm_linked.xml
config/hmm/sct_orhvps_common.tcl
config/scan/scan_common_1.hdd
config/scan/scan_common_1.tcl
config/nexus/nxscripts_common_1.tcl

108
site_ansto/instrument/tas/config/motors/motor_configuration.tcl
View File

@@ -72,8 +72,10 @@ set slitStepRate [expr (250.0*161.0)/2.0]
set ss1h_Gap 52.7
set ss1v_Gap 126.0
#pa=ss2
set ss2h_Gap 53.5
set ss2v_Gap 207.0
#set ss2h_Gap 53.5
set ss2h_Gap 60
#set ss2v_Gap 207.0
set ss2v_Gap 208.0
set ss1l_Home [expr $ss1h_Gap/2*$slitStepRate]
set ss1r_Home [expr $ss1h_Gap/2*$slitStepRate]
@@ -85,6 +87,16 @@ set ss2r_Home [expr $ss2h_Gap/2*$slitStepRate]
set ss2t_Home [expr $ss2v_Gap/2*$slitStepRate]
set ss2b_Home [expr $ss2v_Gap/2*$slitStepRate]
# From Spice ps
set ss1l_Home [expr 28.7 * $slitStepRate]
set ss1r_Home [expr 24.2 * $slitStepRate]
set ss1t_Home [expr 54 * $slitStepRate]
set ss1b_Home [expr 72 * $slitStepRate]
# From Spice pa
set ss2l_Home [expr 24.7 * $slitStepRate]
set ss2r_Home [expr 29.5 * $slitStepRate]
set ss2t_Home [expr 102.5 * $slitStepRate]
set ss2b_Home [expr 104 * $slitStepRate]
# set movecount high to reduce the frequency of
# hnotify messages to a reasonable level
@@ -365,20 +377,25 @@ Motor ahfocus $motor_driver_type [params \
port pmc2-taipan\
axis G\
units degrees\
hardlowerlim -360\
hardupperlim 360\
maxSpeed 360\
maxAccel 180\
maxDecel 180\
stepsPerX 69.444\
precision 0.05\
hardlowerlim 0\
hardupperlim 300\
maxSpeed 10\
maxAccel 10\
maxDecel 10\
stepsPerX [expr 25000.0 / 360.0]\
absEnc 1\
absEncHome 7879140\
cntsPerX 8192]
absEncHome 100\
bias_bits 13\
bias_bias 2570\
cntsPerX [expr 8192.0/360.0]]
ahfocus part crystal
ahfocus long_name ahfocus
ahfocus softlowerlim -360
ahfocus softupperlim 360
ahfocus home 58.887
ahfocus softlowerlim 0
ahfocus softupperlim 300
ahfocus home 0
ahfocus Blockage_Thresh 2
ahfocus Blockage_Check_Interval 2
# mc2: Analyser Vertical Focus
# Jing: not fixed so far
@@ -388,20 +405,25 @@ Motor avfocus $motor_driver_type [params \
port pmc2-taipan\
axis H\
units degrees\
hardlowerlim -200\
hardupperlim 0\
maxSpeed 1.2422\
maxAccel 0.6211\
maxDecel 0.6211\
stepsPerX 20125\
precision 0.05\
hardlowerlim 0\
hardupperlim 300\
maxSpeed 10\
maxAccel 10\
maxDecel 10\
stepsPerX [expr 25000.0 / 360.0]\
absEnc 1\
absEncHome $samthet_Home\
cntsPerX 8192]
absEncHome 100\
bias_bits 13\
bias_bias 5693\
cntsPerX [expr 8192.0 / 360.0]]
avfocus part crystal
avfocus long_name avfocus
avfocus softlowerlim -200
avfocus softupperlim 0
avfocus softlowerlim 0
avfocus softupperlim 300
avfocus home 0
avfocus Blockage_Thresh 2
avfocus Blockage_Check_Interval 2
# mc3: Monochromator Vertical Focus
Motor mvfocus $motor_driver_type [params \
@@ -411,19 +433,23 @@ Motor mvfocus $motor_driver_type [params \
axis A\
units degrees\
hardlowerlim 0\
hardupperlim 240\
hardupperlim 300\
maxSpeed 3.6\
maxAccel 1.728\
maxDecel 1.728\
stepsPerX 3472.2222\
stepsPerX [expr 25000.0 * 50.0 / 360.0]\
absEnc 1\
absEncHome 75695\
cntsPerX 4096]
bias_bits 12\
bias_bias 2366\
absEncHome 100\
cntsPerX [expr 4096.0 / 360.0]]
mvfocus part crystal
mvfocus long_name mvfocus
mvfocus softlowerlim 0
mvfocus softupperlim 240
mvfocus home 113.994
mvfocus softupperlim 300
mvfocus home 0.0
mvfocus Blockage_Thresh 2
mvfocus Blockage_Check_Interval 2
# mc3: Monochromator Horizontal Focus
Motor mhfocus $motor_driver_type [params \
@@ -432,20 +458,24 @@ Motor mhfocus $motor_driver_type [params \
port pmc3-taipan\
axis B\
units degrees\
hardlowerlim -180\
hardupperlim 275\
hardlowerlim 0\
hardupperlim 300\
maxSpeed 3.6\
maxAccel 1.728\
maxDecel 1.728\
stepsPerX 3472.2222\
stepsPerX [expr 25000.0 * 50.0 / 360.0]\
absEnc 1\
absEncHome 5983434\
cntsPerX 4096]
bias_bits 12\
bias_bias 714\
absEncHome 4000\
cntsPerX [expr -4096.0 / 360.0]]
mhfocus part crystal
mhfocus long_name mhfocus
mhfocus softlowerlim 0
mhfocus softupperlim 240
mhfocus home -29.990
mhfocus softupperlim 300
mhfocus home 0
mhfocus Blockage_Thresh 2
mhfocus Blockage_Check_Interval 2
# mc3: Monochromator Rotate
Motor m1 $motor_driver_type [params \
@@ -793,6 +823,12 @@ pa_bottom home 0.0000
proc motor_set_sobj_attributes {} {
}
# Make virtual gap and offset motors for slits
make_gap_motors ss1vg gap ss1vo offset pa_top pa_bottom mm slits
make_gap_motors ss1hg gap ss1ho offset pa_left pa_right mm slits
make_gap_motors ss2vg gap ss2vo offset ps_top ps_bottom mm slits
make_gap_motors ss2hg gap ss2ho offset ps_left ps_right mm slits
# END MOTOR CONFIGURATION

25
site_ansto/instrument/tas/taipan_configuration.tcl
View File

@@ -18,7 +18,7 @@ source server_config.tcl
fileeval $cfPath(source)/source.tcl
source $cfPath(hipadaba)/hipadaba_configuration.tcl
fileeval $cfPath(motors)/motor_configuration.tcl
fileeval $cfPath(motors)/spin_galil.tcl
#fileeval $cfPath(motors)/spin_galil.tcl
fileeval $cfPath(motors)/positmotor_configuration.tcl
fileeval $cfPath(plc)/plc.tcl
fileeval $cfPath(optics)/optics.tcl
@@ -28,28 +28,39 @@ fileeval $cfPath(nexus)/nxscripts.tcl
fileeval $cfPath(scan)/scan.tcl
fileeval $cfPath(commands)/commands.tcl
fileeval $cfPath(anticollider)/anticollider.tcl
fileeval $cfPath(tasmad)/taspub_sics/tasscript.tcl
#fileeval $cfPath(tasmad)/taspub_sics/tasp.tcl
fileeval $cfPath(tasmad)/taspub_sics/tasscript.tcl
fileeval $cfPath(environment)/temperature/sct_lakeshore_340.tcl
source gumxml.tcl
::utility::mkVar ::anticollider::protect_detector text manager protect_detector false detector true false
::anticollider::protect_detector "true"
# init for the tasUB
MakeTasUB tasub m1 m2 mvfocus mhfocus s1 s2 sgu sgl a1 a2 avfocus ahfocus
#make mcv mch acv ach into mvfocus mhfocus avfocus ahfocus when it works
puts "doing tasub"
MakeTasUB tasub m1 m2 mcv mch s1 s2 sgu sgl a1 a2 acv ach
tasub mono dd 3.35416
tasub ana dd 3.35416
tasub updatetargets
puts "done tasub"
MakeDiffScan
server_init
###########################################
# WARNING: Do not add any code below server_init, if you do SICS may fail to initialise properly.
# fix all motors
foreach m [sicslist type motor] {
if {0} {
foreach m [sicslist type motor] {
if {$m == "motor" || $m == "dummy_motor"} {
# skipit
# skipit
} else {
clientput fix $m position
$m fixed 1
clientput fix $m position
$m fixed 1
}
}
}
# You can add extra-configuration code in ../extraconfig.tcl