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

Added configuration file modifications from ics1-platypus

Browse Source
This commit is contained in:
Ferdi Franceschini
2013-04-18 07:00:17 +10:00
parent 1d7681e326
commit 47a1d0aa4e
6 changed files with 31 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
site_ansto/instrument/reflectometer/config/INSTCFCOMMON.TXT
View File

@@ -13,8 +13,12 @@ config/scan/scan_common_1.hdd
config/scan/scan_common_1.tcl config/scan/scan_common_1.tcl
config/nexus/nxscripts_common_1.tcl config/nexus/nxscripts_common_1.tcl
config/commands/commands_common.tcl config/commands/commands_common.tcl
config/commands/hvcommands.tcl
config/commands/pulser.tcl
config/motors/sct_positmotor_common.tcl config/motors/sct_positmotor_common.tcl
config/environment/sct_protek_common.tcl config/environment/sct_protek_common.tcl
config/environment/sct_mvp.tcl
config/environment/sct_syr.tcl
config/environment/temperature/sct_lakeshore_340.tcl config/environment/temperature/sct_lakeshore_340.tcl
config/environment/temperature/sct_lakeshore_336.tcl config/environment/temperature/sct_lakeshore_336.tcl
config/environment/temperature/sct_julabo_lh45.tcl config/environment/temperature/sct_julabo_lh45.tcl

10
site_ansto/instrument/reflectometer/config/beamline/polanal.tcl
View File

@@ -9,14 +9,14 @@ fileeval $cfPath(beamline)/sct_RFGen.tcl
::scobj::rfgen::mkRFGen { ::scobj::rfgen::mkRFGen {
name "polarizer_flipper" name "polarizer_flipper"
address 1 address 1
opCurr 50 opCurr 51
opFreq 193 opFreq 230
K1 0 K1 0
K2 1 K2 1
K3 1 K3 1
IP 137.157.202.149 IP 137.157.202.149
PORT 4001 PORT 4001
tuning 1 tuning 0
interval 2 interval 2
currtol 1 currtol 1
compCurr 1 compCurr 1
@@ -27,14 +27,14 @@ fileeval $cfPath(beamline)/sct_RFGen.tcl
::scobj::rfgen::mkRFGen { ::scobj::rfgen::mkRFGen {
name "analyzer_flipper" name "analyzer_flipper"
address 9 address 9
opCurr 45 opCurr 46
opFreq 198 opFreq 198
K1 0 K1 0
K2 0 K2 0
K3 0 K3 0
IP 137.157.202.149 IP 137.157.202.149
PORT 4002 PORT 4002
tuning 1 tuning 0
interval 2 interval 2
currtol 1 currtol 1
compCurr 1 compCurr 1

3
site_ansto/instrument/reflectometer/config/commands/commands.tcl
View File

@@ -73,6 +73,7 @@ proc ::exp_mode::omega_2theta { arg1 arg2 {s1vg 0} {s2vg 0} {s3vg 0} {s4vg 0}} {
if {![string is double $arg1] || ![string is double $arg2]} { if {![string is double $arg1] || ![string is double $arg2]} {
return -code error "omega and two theta should be a proper number" return -code error "omega and two theta should be a proper number"
} }
statemon start om2th
if {[catch { if {[catch {
::exp_mode::set_omega $arg1 ::exp_mode::set_omega $arg1
::exp_mode::set_two_theta $arg2 ::exp_mode::set_two_theta $arg2
@@ -85,7 +86,7 @@ proc ::exp_mode::omega_2theta { arg1 arg2 {s1vg 0} {s2vg 0} {s3vg 0} {s4vg 0}} {
return -code error "ERROR: all the slit openings need to be numbers" return -code error "ERROR: all the slit openings need to be numbers"
} }
drive ss1u [expr 0.5 * $s1vg] ss1d [expr -0.5 * $s1vg] ss2u [expr 0.5 * $s2vg] ss2d [expr -0.5 * $s2vg] ss3u [expr 0.5 * $s3vg] ss3d [expr -0.5 * $s3vg] ss4u [expr 0.5 * $s4vg] ss4d [expr -0.5*$s4vg] drive ss1u [expr 0.5 * $s1vg] ss1d [expr -0.5 * $s1vg] ss2u [expr 0.5 * $s2vg] ss2d [expr -0.5 * $s2vg] ss3u [expr 0.5 * $s3vg] ss3d [expr -0.5 * $s3vg] ss4u [expr 0.5 * $s4vg] ss4d [expr -0.5*$s4vg]
statemon stop om2th
return -code ok return -code ok
} }
} }

26
site_ansto/instrument/reflectometer/config/motors/motor_configuration.tcl
View File

@@ -47,7 +47,7 @@ set sphi_home 7450470
set sx_home 8574000 set sx_home 8574000
set sy_home 7500000 set sy_home 7500000
set sz_home 8927484 set sz_home 8927484
set dy_home 8860668 set dy_home 8862120
set dz_home 7788617 set dz_home 7788617
#Measured or computed step rate for sz (Sample Raise) #Measured or computed step rate for sz (Sample Raise)
@@ -384,8 +384,8 @@ Motor dy $motor_driver_type [params \
cntsPerX [expr -8192/10.0]] cntsPerX [expr -8192/10.0]]
dy part detector dy part detector
dy long_name longitudinal_translation dy long_name longitudinal_translation
dy softlowerlim 2436 dy softlowerlim 0
dy softupperlim 3530 dy softupperlim 1093
dy speed 2 dy speed 2
dy home 0 dy home 0
dy precision 0.1 dy precision 0.1
@@ -881,26 +881,26 @@ Motor analz $motor_driver_type [params \
axis F\ axis F\
units mm\ units mm\
hardlowerlim 0\ hardlowerlim 0\
hardupperlim 1215\ hardupperlim 1607\
maxSpeed 1.5\ maxSpeed 1.5\
maxAccel 0.5\ maxAccel 0.5\
maxDecel 0.5\ maxDecel 0.5\
stepsPerX [expr 25000/0.25]\ stepsPerX [expr 55 * 25000.0/5.0]\
absEnc 1\ absEnc 1\
absEncHome 7983619\ absEncHome 5842645.0\
cntsPerX [expr 8192./25.] ] cntsPerX -[expr 8192.0/5.0] ]
analz part polarizer analz part polarizer
analz long_name z_translation analz long_name z_translation
analz softlowerlim 0 analz softlowerlim 0
analz softupperlim 1227 analz softupperlim 1607
analz home 591.699 analz home 0
analz backlash_offset -0.5 analz backlash_offset -0.5
analz precision 0.004 analz precision 0.004
analz speed 1 analz speed 1
## Polarization Analyzer Rotation ## Polarization Analyzer Rotation
set analtilt_lowerlim -12 set analtilt_lowerlim -16
set analtilt_upperlim 12 set analtilt_upperlim 16
Motor analtilt $motor_driver_type [params \ Motor analtilt $motor_driver_type [params \
asyncqueue mc2\ asyncqueue mc2\
axis D\ axis D\
@@ -916,8 +916,8 @@ Motor analtilt $motor_driver_type [params \
cntsPerX -8192] cntsPerX -8192]
analtilt part polarizer analtilt part polarizer
analtilt long_name rotation analtilt long_name rotation
analtilt softlowerlim $analtilt_lowerlim analtilt softlowerlim -15.8
analtilt softupperlim $analtilt_upperlim analtilt softupperlim 14.4
analtilt backlash_offset 0.5 analtilt backlash_offset 0.5
analtilt precision 0.01 analtilt precision 0.01
analtilt home 0 analtilt home 0

2
site_ansto/instrument/reflectometer/config/plc/plc.tcl
View File

@@ -1,6 +1,6 @@
set sim_mode [SplitReply [plc_simulation]] set sim_mode [SplitReply [plc_simulation]]
if {$sim_mode == "false"} { if {$sim_mode == "false"} {
MakeAsyncQueue plc_chan SafetyPLC 137.157.204.79 30001 MakeAsyncQueue plc_chan SafetyPLC 137.157.211.22 31001
MakeSafetyPLC plc plc_chan 0 MakeSafetyPLC plc plc_chan 0
} }

11
site_ansto/instrument/reflectometer/platypus_configuration.tcl
View File

@@ -25,6 +25,9 @@ fileeval $cfPath(motors)/positmotor_configuration.tcl
fileeval $cfPath(parameters)/parameters.tcl fileeval $cfPath(parameters)/parameters.tcl
fileeval $cfPath(plc)/plc.tcl fileeval $cfPath(plc)/plc.tcl
fileeval $cfPath(counter)/counter.tcl fileeval $cfPath(counter)/counter.tcl
fileeval $cfPath(environment)/sct_syr.tcl
fileeval $cfPath(environment)/sct_mvp.tcl
fileeval $cfPath(environment)/sct_protek_common.tcl
fileeval $cfPath(environment)/magneticField/sct_bruker_BEC1.tcl fileeval $cfPath(environment)/magneticField/sct_bruker_BEC1.tcl
fileeval $cfPath(environment)/temperature/sct_lakeshore_336.tcl fileeval $cfPath(environment)/temperature/sct_lakeshore_336.tcl
fileeval $cfPath(environment)/temperature/sct_lakeshore_340.tcl fileeval $cfPath(environment)/temperature/sct_lakeshore_340.tcl
@@ -37,16 +40,14 @@ fileeval $cfPath(chopper)/chopper.tcl
fileeval $cfPath(commands)/commands.tcl fileeval $cfPath(commands)/commands.tcl
fileeval $cfPath(anticollider)/anticollider.tcl fileeval $cfPath(anticollider)/anticollider.tcl
fileeval $cfPath(beamline)/polanal.tcl fileeval $cfPath(beamline)/polanal.tcl
fileeval $cfPath(commands)/pulser.tcl
fileeval $cfPath(commands)/hvcommands.tcl
source gumxml.tcl source gumxml.tcl
::utility::mkVar ::anticollider::protect_detector text manager protect_detector false detector true false ::utility::mkVar ::anticollider::protect_detector text manager protect_detector false detector true false
::anticollider::protect_detector "true" ::anticollider::protect_detector "true"
# Driver for Bruker BEC1 power supply (1-Tesla Magnet)
# driver short-name IP-address MoxaPort Tolerance(Amps)
#add_bruker_BEC1 ma1 137.157.202.152 4444 0.1
#add_sct_ls340 tc1 137.157.202.150 4001 "\r" 5.0 5.0
server_init server_init
########################################### ###########################################
# WARNING: Do not add any code below server_init, if you do SICS may fail to initialise properly. # WARNING: Do not add any code below server_init, if you do SICS may fail to initialise properly.