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

Merge branch 'RELEASE-3_1' into RELEASE-3_2

Browse Source 
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
2014-09-26 17:04:19 +10:00
parent fb5addfe64 5bedffc9c3
commit ba72e77d4c
75 changed files with 5146 additions and 540 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
site_ansto/instrument/kookaburra/config/motors/motor_configuration.tcl
View File

@@ -232,7 +232,8 @@ Motor m1chi $motor_driver_type [params \
stepsPerX -$m1chiSetRate\
absEnc 1\
absEncHome $m1chi_Home\
cntsPerX [expr 131072*100.0/68.681] ]
cntsPerX [expr 131072*100.0/68.681]\
nopowersave 1]
m1chi precision 0.001
m1chi speed 0.200
m1chi part crystal
@@ -317,7 +318,7 @@ Motor ss1u $motor_driver_type [params \
axis D\
units mm\
hardlowerlim -33.5\
hardupperlim 37.8\
hardupperlim 35.9\
maxSpeed [expr $maxSpeedSlit/$ss1uSetRate]\
maxAccel [expr 5000.0/$ss1uSetRate/0.5]\
maxDecel [expr 5000.0/$ss1uSetRate/0.5]\
@@ -440,7 +441,8 @@ samz long_name samz
samz softlowerlim 0
samz softupperlim 660
samz home 0
samz positions 33.5 178.5 323.5 468.5 613.5
samz position_names 1 2 3 4 5
############################
# Motor Controller 3
@@ -585,7 +587,8 @@ Motor m2chi $motor_driver_type [params \
stepsPerX -$m2chiSetRate\
absEnc 1\
absEncHome $m2chi_Home\
cntsPerX [expr 131072*100.0/68.681]]
cntsPerX [expr 131072*100.0/68.681]\
nopowersave 1]
m2chi precision 0.001
m2chi speed 0.200
m2chi part crystal
@@ -686,6 +689,12 @@ m2y softupperlim 355
m2y home 0
make_gap_motors ss1vg ss1vg ss1vo ss1vo ss1u ss1d mm gaps
make_gap_motors ss1hg ss1hg ss1ho ss1ho ss1r ss1l mm gaps
make_gap_motors ss2vg ss2vg ss2vo ss2vo ss2u ss2d mm gaps
make_gap_motors ss2hg ss2hg ss2ho ss2ho ss2r ss2l mm gaps
proc motor_set_sobj_attributes {} {
}

4
site_ansto/instrument/kookaburra/config/parameters/parameters.tcl
View File

@@ -8,14 +8,14 @@
# Note EndFacePosY and RotApPosY are surveyed positions
foreach {var lname type priv units klass} {
wavelength wavelength float user Angstrom crystal
dOmega dOmega float user degrees crystal
gDQv gDQv float user none crystal
MainDeadTime MainDeadTime float user s detector
TransDeadTime TransDeadTime float user s detector
TransmissionTube TransmissionTube int user none detector
bkgLevel bkgLevel float user 1 experiment
deg2QConv deg2QConv float user none experiment
dOmega dOmega float user degrees experiment
empLevel empLevel float user none experiment
gDQv gDQv float user none experiment
level level float user none experiment
thickness thickness float user mm sample
defaultMCR defaultMCR float user count/sec monitor