Merge branch 'RELEASE-3_1' into RELEASE-3_2
Conflicts: sics/site_ansto/instrument/bilby/config/chopper/sct_astrium_chopper.tcl sics/site_ansto/instrument/bilby/config/motors/shutters_sct.tcl sics/site_ansto/instrument/bilby/config/motors/tank_sct.tcl sics/site_ansto/instrument/bilby/util/sics_config.ini sics/site_ansto/instrument/config/environment/hiden_xcs_sct.tcl sics/site_ansto/instrument/config/environment/huber_pilot_sct.tcl sics/site_ansto/instrument/config/environment/isotech_ps_sct.tcl sics/site_ansto/instrument/config/environment/keithley_m2700_sct.tcl sics/site_ansto/instrument/config/environment/magneticField/oxford12tlv_sct.tcl sics/site_ansto/instrument/config/environment/magneticField/tsi_smc_sct.tcl sics/site_ansto/instrument/config/environment/nhq_200_sct.tcl sics/site_ansto/instrument/config/environment/omron_hldc_sct.tcl sics/site_ansto/instrument/config/environment/protekmm_sct.tcl sics/site_ansto/instrument/config/environment/temperature/eurotherm_m2000_sct.tcl sics/site_ansto/instrument/config/environment/temperature/julabo_lh45_gen_sct.tcl sics/site_ansto/instrument/config/environment/temperature/lakeshore_218_sct.tcl sics/site_ansto/instrument/config/environment/temperature/ls336_sct.tcl sics/site_ansto/instrument/config/environment/temperature/ls340_sct.tcl sics/site_ansto/instrument/config/environment/temperature/mercury_base_sct.tcl sics/site_ansto/instrument/config/environment/temperature/mercury_level_sct.tcl sics/site_ansto/instrument/config/environment/temperature/mercury_pres_sct.tcl sics/site_ansto/instrument/config/environment/temperature/mercury_scpi_sct.tcl sics/site_ansto/instrument/config/environment/temperature/mercury_temp_sct.tcl sics/site_ansto/instrument/config/environment/temperature/mercury_valve_sct.tcl sics/site_ansto/instrument/config/environment/temperature/nprvasm2_sct.tcl sics/site_ansto/instrument/config/environment/temperature/pfeiffer_hg_sct.tcl sics/site_ansto/instrument/config/environment/temperature/watlow_mpm_sct.tcl sics/site_ansto/instrument/config/environment/temperature/watlow_mrm_sct.tcl sics/site_ansto/instrument/config/environment/temperature/watlow_mst4_sct.tcl sics/site_ansto/instrument/config/environment/temperature/west_6100.sct sics/site_ansto/instrument/config/source/reactor_status_sct.tcl sics/site_ansto/instrument/hrpd/echidna_configuration.tcl sics/site_ansto/instrument/sans/quokka_configuration.tcl sics/site_ansto/instrument/tas/config/motors/motor_configuration.tcl sics/site_ansto/instrument/util/gen_sct.py sics/site_ansto/instrument/util/motor_utility.tcl
This commit is contained in:
Douglas Clowes
@@ -4,9 +4,6 @@
|
||||
# FastShutter is currently set on Quokka only
|
||||
#::utility::mkVar FastShutter text manager FastShutter false instrument true false
|
||||
|
||||
# SET TO 1 TO USE THE TILT STAGE ie sample phi and chi
|
||||
set use_tiltstage 0
|
||||
|
||||
set animal taipan
|
||||
set sim_mode [SplitReply [motor_simulation]]
|
||||
|
||||
@@ -93,6 +90,42 @@ 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"
|
||||
set tilt_motor_driver_type $motor_driver_type
|
||||
}
|
||||
1 {
|
||||
set magmot s1
|
||||
set magmot_aq "mc2"
|
||||
set magmot_axis "A"
|
||||
set use_normal_config "false"
|
||||
set tilt_motor_driver_type asim
|
||||
fileeval $cfPath(motors)/magnet_configuration.tcl
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
# Dummy translation motor, useful for testing scans
|
||||
|
||||
Motor dummy_motor asim [params \
|
||||
@@ -138,36 +171,6 @@ dummy_s1 softupperlim 180
|
||||
dummy_s1 precision 0.02
|
||||
dummy_s1 home 0
|
||||
|
||||
if { [ info exists ::config_dict ] && [ dict get $::config_dict s1_sample_insert enabled ] } {
|
||||
set samp_stage_name "s1ss"
|
||||
set tilt_motor_driver_type asim
|
||||
|
||||
Motor s1 $motor_driver_type [params \
|
||||
asyncqueue mc2\
|
||||
host mc2-taipan\
|
||||
port pmc2-taipan\
|
||||
axis A\
|
||||
units degrees\
|
||||
hardlowerlim -1440\
|
||||
hardupperlim 1440\
|
||||
maxSpeed 1\
|
||||
maxAccel 1\
|
||||
maxDecel 1\
|
||||
stepsPerX [expr 67.0 * 25000 / 360]\
|
||||
absEnc 1\
|
||||
absEncHome 31275743\
|
||||
cntsPerX [expr 67.0 * 8192 / 360]]
|
||||
s1 part sample
|
||||
s1 long_name s1
|
||||
s1 softlowerlim -180
|
||||
s1 softupperlim 180
|
||||
s1 home 0
|
||||
} else {
|
||||
set samp_stage_name "s1"
|
||||
set tilt_motor_driver_type $motor_driver_type
|
||||
}
|
||||
|
||||
#if $use_tiltstage {
|
||||
# mc1: Monochromator crystal selection rotation/Tilt
|
||||
Motor mtilt $motor_driver_type [params \
|
||||
asyncqueue mc1\
|
||||
@@ -182,16 +185,14 @@ Motor mtilt $motor_driver_type [params \
|
||||
maxDecel 1\
|
||||
stepsPerX 25000\
|
||||
absEnc 1\
|
||||
absEncHome 79650\
|
||||
absEncHome 27115\
|
||||
cntsPerX 4096]
|
||||
mtilt part crystal
|
||||
mtilt long_name mtilt
|
||||
mtilt softlowerlim -5
|
||||
mtilt softupperlim 5
|
||||
mtilt home 0
|
||||
#}
|
||||
|
||||
set atest mtilt
|
||||
|
||||
# mc1: Monochromator Linear (Translate)
|
||||
Motor mtrans $motor_driver_type [params \
|
||||
@@ -207,7 +208,7 @@ Motor mtrans $motor_driver_type [params \
|
||||
maxDecel 1\
|
||||
stepsPerX 25000\
|
||||
absEnc 1\
|
||||
absEncHome 469388\
|
||||
absEncHome 859242\
|
||||
cntsPerX 4096]
|
||||
mtrans part crystal
|
||||
mtrans long_name mtrans
|
||||
@@ -229,7 +230,7 @@ Motor m2 $motor_driver_type [params \
|
||||
port pmc1-taipan\
|
||||
axis F\
|
||||
units degrees\
|
||||
precision 0.01\
|
||||
precision 0.001\
|
||||
hardlowerlim 17\
|
||||
hardupperlim 80\
|
||||
maxSpeed 0.414\
|
||||
@@ -246,9 +247,9 @@ m2 softupperlim 80
|
||||
m2 home 20
|
||||
m2 motOnDelay 0
|
||||
m2 motOffDelay 0
|
||||
m2 backlash_offset -0.1
|
||||
m2 backlash_offset -0.5
|
||||
m2 creep_offset 0.1
|
||||
m2 creep_precision 0.005
|
||||
m2 creep_precision 0.0
|
||||
m2 speed 0.4
|
||||
m2 accel 0.04
|
||||
m2 decel 0.04
|
||||
@@ -384,27 +385,29 @@ stl home 0.0
|
||||
stl backlash_offset -0.2
|
||||
|
||||
# mc2: Sample Rotate
|
||||
Motor $samp_stage_name $motor_driver_type [params \
|
||||
asyncqueue mc2\
|
||||
host mc2-taipan\
|
||||
port pmc2-taipan\
|
||||
axis E\
|
||||
units degrees\
|
||||
hardlowerlim -194\
|
||||
hardupperlim 134\
|
||||
maxSpeed 4\
|
||||
maxAccel 2\
|
||||
maxDecel 2\
|
||||
stepsPerX 12495\
|
||||
absEnc 1\
|
||||
absEncHome 10695068\
|
||||
cntsPerX 4096]
|
||||
$samp_stage_name part sample
|
||||
$samp_stage_name long_name $samp_stage_name
|
||||
$samp_stage_name softlowerlim -170
|
||||
$samp_stage_name softupperlim 120
|
||||
$samp_stage_name home 35.997
|
||||
$samp_stage_name backlash_offset -0.2
|
||||
if {$use_normal_config == "true"} {
|
||||
Motor s1 $motor_driver_type [params \
|
||||
asyncqueue mc2\
|
||||
host mc2-taipan\
|
||||
port pmc2-taipan\
|
||||
axis E\
|
||||
units degrees\
|
||||
hardlowerlim -194\
|
||||
hardupperlim 134\
|
||||
maxSpeed 4\
|
||||
maxAccel 2\
|
||||
maxDecel 2\
|
||||
stepsPerX 12495\
|
||||
absEnc 1\
|
||||
absEncHome 10695068\
|
||||
cntsPerX 4096]
|
||||
s1 part sample
|
||||
s1 long_name s1
|
||||
s1 softlowerlim -170
|
||||
s1 softupperlim 120
|
||||
s1 home 35.997
|
||||
s1 backlash_offset -0.2
|
||||
}
|
||||
|
||||
# mc2: Analyser Detector Rotate -- Sample Scattering Angle
|
||||
# absEncHome 20728908\ at -50
|
||||
|
||||
Reference in New Issue
Block a user