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/hipd/wombat_configuration.tcl sics/site_ansto/instrument/pelican/pelican_configuration.tcl
This commit is contained in:
Douglas Clowes
@@ -15,6 +15,13 @@ config/scan/scan_common_1.hdd
|
||||
config/scan/scan_common_1.tcl
|
||||
config/nexus/nxscripts_common_1.tcl
|
||||
config/environment/
|
||||
config/environment/he3
|
||||
config/environment/magneticField
|
||||
config/environment/pressure
|
||||
config/environment/temperature
|
||||
config/commands/commands_common.tcl
|
||||
config/commands/pulser.tcl
|
||||
config/commands/hvcommands.tcl
|
||||
config/motors/sct_positmotor_common.tcl
|
||||
config/motors/sct_jogmotor_common.tcl
|
||||
config/motors/magnet_configuration.tcl
|
||||
|
||||
@@ -67,6 +67,40 @@ set gv1_Shut 33221600
|
||||
# hnotify messages to a reasonable level
|
||||
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"
|
||||
}
|
||||
1 {
|
||||
set magmot "mscor"
|
||||
set magmot_aq "mc2"
|
||||
set magmot_axis "F"
|
||||
set use_normal_config "false"
|
||||
fileeval $cfPath(motors)/magnet_configuration.tcl
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
############################
|
||||
# Motor Controller 1
|
||||
# Motor Controller 1
|
||||
@@ -381,29 +415,31 @@ gom softlowerlim -15
|
||||
gom softupperlim 15
|
||||
gom home 0
|
||||
|
||||
if {$use_normal_config == "true"} {
|
||||
# mc2: Sample rotation correction - 10 deg rotation
|
||||
set scorStepRate [expr { 25000.0 * 100.0 / 360.0 }]
|
||||
set scorStepRate [expr { 25000.0 * 100.0 / 360.0 }]
|
||||
|
||||
Motor scor $motor_driver_type [params \
|
||||
asyncqueue mc2\
|
||||
host mc2-pelican\
|
||||
port pmc2-pelican\
|
||||
axis F\
|
||||
units degrees\
|
||||
hardlowerlim 0\
|
||||
hardupperlim 360\
|
||||
maxSpeed [expr 25000.0/$scorStepRate]\
|
||||
maxAccel [expr 25000.0/$scorStepRate]\
|
||||
maxDecel [expr 25000.0/$scorStepRate]\
|
||||
stepsPerX $scorStepRate\
|
||||
absEnc 1\
|
||||
absEncHome $scor_Home\
|
||||
cntsPerX -[expr { 8192.0 * 100.0 / 360.0 }]]
|
||||
scor part sample
|
||||
scor long_name scor
|
||||
scor softlowerlim 0
|
||||
scor softupperlim 360
|
||||
scor home 180
|
||||
Motor scor $motor_driver_type [params \
|
||||
asyncqueue mc2\
|
||||
host mc2-pelican\
|
||||
port pmc2-pelican\
|
||||
axis F\
|
||||
units degrees\
|
||||
hardlowerlim 0\
|
||||
hardupperlim 360\
|
||||
maxSpeed [expr 25000.0/$scorStepRate]\
|
||||
maxAccel [expr 25000.0/$scorStepRate]\
|
||||
maxDecel [expr 25000.0/$scorStepRate]\
|
||||
stepsPerX $scorStepRate\
|
||||
absEnc 1\
|
||||
absEncHome $scor_Home\
|
||||
cntsPerX -[expr { 8192.0 * 100.0 / 360.0 }]]
|
||||
scor part sample
|
||||
scor long_name scor
|
||||
scor softlowerlim 0
|
||||
scor softupperlim 360
|
||||
scor home 180
|
||||
}
|
||||
|
||||
############################
|
||||
# Motor Controller 3
|
||||
|
||||
@@ -28,14 +28,43 @@ fileeval $cfPath(motors)/positmotor_configuration.tcl
|
||||
fileeval $cfPath(plc)/plc.tcl
|
||||
fileeval $cfPath(counter)/counter.tcl
|
||||
#fileeval $cfPath(beamline)/sct_power.tcl
|
||||
fileeval $cfPath(environment)/agilent_33220A_sct.tcl
|
||||
fileeval $cfPath(environment)/hiden_xcs_sct.tcl
|
||||
fileeval $cfPath(environment)/huber_pilot_sct.tcl
|
||||
fileeval $cfPath(environment)/isotech_ps_sct.tcl
|
||||
fileeval $cfPath(environment)/temperature/sct_eurotherm_2000.tcl
|
||||
fileeval $cfPath(environment)/temperature/eurotherm_m2000_sct.tcl
|
||||
fileeval $cfPath(environment)/sct_keithley_2700.tcl
|
||||
fileeval $cfPath(environment)/keithley_m2700_sct.tcl
|
||||
fileeval $cfPath(environment)/temperature/lakeshore_218_sct.tcl
|
||||
fileeval $cfPath(environment)/temperature/sct_lakeshore_336.tcl
|
||||
fileeval $cfPath(environment)/temperature/ls336_sct.tcl
|
||||
fileeval $cfPath(environment)/temperature/sct_lakeshore_340.tcl
|
||||
fileeval $cfPath(environment)/temperature/ls340_sct.tcl
|
||||
fileeval $cfPath(environment)/temperature/sct_lakeshore_370.tcl
|
||||
fileeval $cfPath(environment)/temperature/lakeshore_m370_sct.tcl
|
||||
fileeval $cfPath(environment)/temperature/mercury_base_sct.tcl
|
||||
fileeval $cfPath(environment)/temperature/mercury_level_sct.tcl
|
||||
fileeval $cfPath(environment)/temperature/mercury_pres_sct.tcl
|
||||
fileeval $cfPath(environment)/temperature/mercury_scpi_sct.tcl
|
||||
fileeval $cfPath(environment)/temperature/mercury_temp_sct.tcl
|
||||
fileeval $cfPath(environment)/temperature/mercury_valve_sct.tcl
|
||||
fileeval $cfPath(environment)/sct_protek_common.tcl
|
||||
fileeval $cfPath(environment)/protekmm_sct.tcl
|
||||
fileeval $cfPath(environment)/temperature/julabo_lh45_gen_sct.tcl
|
||||
fileeval $cfPath(environment)/temperature/sct_qlink.tcl
|
||||
fileeval $cfPath(environment)/temperature/west400.tcl
|
||||
fileeval $cfPath(environment)/temperature/west4100_sct.tcl
|
||||
fileeval $cfPath(environment)/magneticField/sct_oxford_labview.tcl
|
||||
fileeval $cfPath(environment)/he3/sct_he3.tcl
|
||||
fileeval $cfPath(environment)/magneticField/sct_green_magnet.tcl
|
||||
fileeval $cfPath(hmm)/hmm_configuration.tcl
|
||||
fileeval $cfPath(hmm)/sct_hv.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(commands)/monodrive.tcl
|
||||
fileeval $cfPath(anticollider)/anticollider.tcl
|
||||
fileeval $cfPath(chopper)/sct_fermichopper.tcl
|
||||
@@ -62,12 +91,16 @@ proc mkrunargs {args} {
|
||||
|
||||
proc run {args} {
|
||||
set runargs [eval "mkrunargs $args"]
|
||||
eval "sicsrun $runargs"
|
||||
anstocapture sicsrun {*}$runargs
|
||||
#NOTE The return prevents seeing the message twice. See SICS-764 and SICS-765
|
||||
return;
|
||||
}
|
||||
|
||||
proc drive {args} {
|
||||
set runargs [eval "mkrunargs $args"]
|
||||
eval "sicsdrive $runargs"
|
||||
anstocapture sicsdrive {*}$runargs
|
||||
#NOTE The return prevents seeing the message twice. See SICS-764 and SICS-765
|
||||
return;
|
||||
}
|
||||
|
||||
publish run user
|
||||
|
||||
287
site_ansto/instrument/pelican/util/sics_config.ini
Normal file
287
site_ansto/instrument/pelican/util/sics_config.ini
Normal file
@@ -0,0 +1,287 @@
|
||||
[12tmagnet_setup]
|
||||
cascade = B1:12tmagnet_oxford,sample_stage:12tmagnet_sample_insert,T1:mercury_scpi_01
|
||||
enabled = False
|
||||
[CF3]
|
||||
cascade = T1:ls340_pelican,sample_stage:normal_sample_stage
|
||||
enabled = False
|
||||
[CF8]
|
||||
cascade = T1:ls336_01,T2:ls340_11,sample_stage:normal_sample_stage
|
||||
enabled = False
|
||||
[Default]
|
||||
cascade = sample_stage:normal_sample_stage
|
||||
enabled = True
|
||||
[OC1]
|
||||
cascade = T1:OC1_ls340,sample_stage:normal_sample_stage
|
||||
enabled = False
|
||||
[B1]
|
||||
datype = B
|
||||
enabled = False
|
||||
id = 1
|
||||
implementation = none
|
||||
name = magnet1
|
||||
optype = magnetic_field
|
||||
[Function_Generator]
|
||||
datype = V
|
||||
enabled = False
|
||||
id = 1
|
||||
implementation = none
|
||||
name = pulser
|
||||
optype = function_generator
|
||||
[I1]
|
||||
datype = I
|
||||
enabled = False
|
||||
id = 1
|
||||
implementation = none
|
||||
name = curr1
|
||||
optype = multimeter
|
||||
[I2]
|
||||
datype = I
|
||||
enabled = False
|
||||
id = 2
|
||||
implementation = none
|
||||
name = curr2
|
||||
optype = multimeter
|
||||
[T1]
|
||||
datype = T
|
||||
enabled = False
|
||||
id = 1
|
||||
implementation = none
|
||||
name = tc1
|
||||
optype = temperature
|
||||
[T2]
|
||||
datype = T
|
||||
enabled = False
|
||||
id = 2
|
||||
implementation = none
|
||||
name = tc2
|
||||
optype = temperature
|
||||
[T3]
|
||||
datype = T
|
||||
enabled = False
|
||||
id = 3
|
||||
implementation = none
|
||||
name = tc3
|
||||
optype = temperature
|
||||
[T4]
|
||||
datype = T
|
||||
enabled = False
|
||||
id = 4
|
||||
implementation = none
|
||||
name = tc4
|
||||
optype = temperature
|
||||
[V1]
|
||||
datype = V
|
||||
enabled = False
|
||||
id = 1
|
||||
implementation = none
|
||||
name = volts1
|
||||
optype = multimeter
|
||||
[V2]
|
||||
datype = V
|
||||
enabled = False
|
||||
id = 2
|
||||
implementation = none
|
||||
name = volts2
|
||||
optype = multimeter
|
||||
[sample_stage]
|
||||
enabled = Always
|
||||
implementation = normal_sample_stage
|
||||
name = sample_stage
|
||||
optype = motion_axis
|
||||
[12tmagnet_oxford]
|
||||
desc = "12 Tesla Oxford Magnet"
|
||||
driver = "oxford_labview"
|
||||
imptype = magnetic_field
|
||||
ip = 10.157.205.3
|
||||
port = 55001
|
||||
|
||||
[12tmagnet_sample_insert]
|
||||
desc = "scor will be redefined as the magnet sample insert rotation."
|
||||
imptype = motion_axis
|
||||
|
||||
[OC1_ls340]
|
||||
asyncqueue = sct
|
||||
desc = "Lakeshore 340 temperature controller"
|
||||
driver = "ls340"
|
||||
imptype = temperature
|
||||
ip = 10.157.205.41
|
||||
port = 4001
|
||||
terminator = \r\n
|
||||
tol1 = 1.0
|
||||
tol2 = 1.0
|
||||
|
||||
[agilent_33220A]
|
||||
asyncqueue = sct
|
||||
desc = "Function Generator"
|
||||
driver = agilent_33220A
|
||||
imptype = function_generator
|
||||
ip = 10.157.205.16
|
||||
port = 5025
|
||||
|
||||
[ls336_01]
|
||||
asyncqueue = sct
|
||||
desc = "Lakeshore 336 temperature controller"
|
||||
driver = "ls336"
|
||||
imptype = temperature
|
||||
ip = 10.157.205.28
|
||||
port = 7777
|
||||
terminator = \r\n
|
||||
tol1 = 1.0
|
||||
tol2 = 1.0
|
||||
|
||||
[ls336_02]
|
||||
asyncqueue = sct
|
||||
desc = "Lakeshore 336 temperature controller"
|
||||
driver = "ls336"
|
||||
imptype = temperature
|
||||
ip = 10.157.205.29
|
||||
port = 7777
|
||||
terminator = \r\n
|
||||
tol1 = 1.0
|
||||
tol2 = 1.0
|
||||
|
||||
[ls336_04]
|
||||
asyncqueue = sct
|
||||
desc = "Lakeshore 336 temperature controller"
|
||||
driver = "ls336"
|
||||
imptype = temperature
|
||||
ip = 10.157.205.30
|
||||
port = 7777
|
||||
terminator = \r\n
|
||||
tol1 = 1.0
|
||||
tol2 = 1.0
|
||||
|
||||
[ls336_05]
|
||||
asyncqueue = sct
|
||||
desc = "Lakeshore 336 temperature controller"
|
||||
driver = "ls336"
|
||||
imptype = temperature
|
||||
ip = 137.157.201.21
|
||||
port = 7777
|
||||
terminator = \r\n
|
||||
tol1 = 1.0
|
||||
tol2 = 1.0
|
||||
|
||||
[ls336_06]
|
||||
asyncqueue = sct
|
||||
desc = "Lakeshore 336 temperature controller"
|
||||
driver = "ls336"
|
||||
imptype = temperature
|
||||
ip = 137.157.201.21
|
||||
port = 7777
|
||||
terminator = \r\n
|
||||
tol1 = 1.0
|
||||
tol2 = 1.0
|
||||
|
||||
[ls336_11]
|
||||
desc = "Lakeshore 336 temperature controller"
|
||||
driver = "ls336"
|
||||
imptype = temperature
|
||||
ip = 10.157.205.27
|
||||
port = 7777
|
||||
terminator = \r\n
|
||||
tol1 = 1.0
|
||||
tol2 = 1.0
|
||||
|
||||
[ls336_12]
|
||||
asyncqueue = sct
|
||||
desc = "Lakeshore 336 temperature controller"
|
||||
driver = "ls336"
|
||||
imptype = temperature
|
||||
ip = 10.157.205.31
|
||||
port = 7777
|
||||
terminator = \r\n
|
||||
tol1 = 1.0
|
||||
tol2 = 1.0
|
||||
|
||||
[ls340_01]
|
||||
asyncqueue = sct
|
||||
desc = "Lakeshore 340 temperature controller"
|
||||
driver = "ls340"
|
||||
imptype = temperature
|
||||
ip = 137.157.201.86
|
||||
port = 4001
|
||||
terminator = \r\n
|
||||
tol1 = 1.0
|
||||
tol2 = 1.0
|
||||
|
||||
[ls340_02]
|
||||
asyncqueue = sct
|
||||
desc = "Lakeshore 340 temperature controller"
|
||||
driver = "ls340"
|
||||
imptype = temperature
|
||||
ip = 137.157.201.86
|
||||
port = 4002
|
||||
terminator = \r\n
|
||||
tol1 = 1.0
|
||||
tol2 = 1.0
|
||||
|
||||
[ls340_11]
|
||||
desc = "Lakeshore 340 temperature controller"
|
||||
driver = "ls340"
|
||||
imptype = temperature
|
||||
ip = 137.157.201.86
|
||||
port = 4001
|
||||
terminator = \r\n
|
||||
tol1 = 1.0
|
||||
tol2 = 1.0
|
||||
|
||||
[ls340_pelican]
|
||||
desc = "Lakeshore 340 temperature controller"
|
||||
driver = "ls340"
|
||||
imptype = temperature
|
||||
ip = 137.157.202.214
|
||||
port = 4001
|
||||
terminator = \r\n
|
||||
tol1 = 1.0
|
||||
tol2 = 1.0
|
||||
|
||||
[mercury_scpi_01]
|
||||
desc = "Oxford Mercury temperature controller with three temperature loops."
|
||||
driver = "mercury_base"
|
||||
imptype = temperature
|
||||
ip = 10.157.205.5
|
||||
permlink = LT
|
||||
port = 7020
|
||||
terminator = \r\n
|
||||
tol = 1.0
|
||||
valve_tol = 2
|
||||
|
||||
[mercury_scpi_02]
|
||||
desc = "Oxford Mercury temperature controller with four temperature loops and needle valve control"
|
||||
driver = "mercury_scpi"
|
||||
imptype = temperature
|
||||
ip = 10.157.205.47
|
||||
permlink = LT
|
||||
port = 7020
|
||||
terminator = \r\n
|
||||
tol = 1.0
|
||||
valve_tol = 2
|
||||
|
||||
[normal_sample_stage]
|
||||
desc = "This is the default sample stage configuration"
|
||||
imptype = motion_axis
|
||||
|
||||
[protek_01]
|
||||
asyncqueue = sct
|
||||
desc = "Protek Multimeter"
|
||||
driver = "protekmm"
|
||||
imptype = multimeter
|
||||
ip = 10.157.205.36
|
||||
port = 4001
|
||||
|
||||
[protek_02]
|
||||
asyncqueue = sct
|
||||
desc = "Protek Multimeter"
|
||||
driver = "protekmm"
|
||||
imptype = multimeter
|
||||
ip = 10.157.205.37
|
||||
port = 4001
|
||||
|
||||
[west4100]
|
||||
desc = "Blue furnace temperature controller"
|
||||
dev_id = 1
|
||||
driver = "west4100"
|
||||
imptype = temperature
|
||||
ip = 10.157.205.19
|
||||
|
||||
Reference in New Issue
Block a user