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

Move stuff up from collimator to instrument and add virtual motors for slits and attentuator

Browse Source
This commit is contained in:
Douglas Clowes
2014-02-20 14:57:46 +11:00
parent c036a05035
commit 3d8fd84f70
4 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
site_ansto/instrument/bilby/config/motors/hdb_info.csv
View File

@ -14,7 +14,7 @@ ap7_part,collimator
ap7_units,degrees ap7_units,degrees
ap8_part,collimator ap8_part,collimator
ap8_units,degrees ap8_units,degrees
att_part,collimator att_part,instrument
att_units,mm att_units,mm
bs1_part,detector bs1_part,detector
bs1_units,degrees bs1_units,degrees
@ -58,7 +58,7 @@ sap_part,sample
sap_units,mm sap_units,mm
schi_part,sample schi_part,sample
schi_units,degrees schi_units,degrees
sdh_part,collimator sdh_part,instrument
sdh_units,mm sdh_units,mm
som_part,sample som_part,sample
som_units,degrees som_units,degrees
@ -84,5 +84,5 @@ sx_part,sample
sx_units,mm sx_units,mm
sy_part,sample sy_part,sample
sy_units,mm sy_units,mm
vs_part,velocity_selector vs_part,instrument
vs_units,mm vs_units,mm

1 ap1_part collimator
14 ap7_units degrees
15 ap8_part collimator
16 ap8_units degrees
17 att_part collimator instrument
18 att_units mm
19 bs1_part detector
20 bs1_units degrees
58 sap_units mm
59 schi_part sample
60 schi_units degrees
61 sdh_part collimator instrument
62 sdh_units mm
63 som_part sample
64 som_units degrees
84 sx_units mm
85 sy_part sample
86 sy_units mm
87 vs_part velocity_selector instrument
88 vs_units mm

7
site_ansto/instrument/bilby/config/motors/motor_configuration.tcl
View File

@ -13,3 +13,10 @@ for {set n 1} {$n <= 8} {incr n} {
make_coll_motor_1 c$n c$n col$n count make_coll_motor_1 c$n c$n col$n count
make_coll_motor_1 a$n a$n ap$n count make_coll_motor_1 a$n a$n ap$n count
} }
# Make a position-motor for the attenuator
make_coll_motor_1 att_pos att_pos att count
# make gap/offset motors for the slits
make_gap_motors ss1hg gap ss1ho offset ss1r ss1l mm first/horizontal
make_gap_motors ss1vg gap ss1vo offset ss1u ss1d mm first/vertical

4
site_ansto/instrument/bilby/config/motors/sct_shutters.tcl
View File

@ -150,7 +150,7 @@ proc ::scobj::shutters::mk_sct_shutters { sct_controller name } {
MakeSICSObj ${name} SCT_OBJECT MakeSICSObj ${name} SCT_OBJECT
sicslist setatt ${name} klass collimator sicslist setatt ${name} klass instrument
sicslist setatt ${name} long_name ${name} sicslist setatt ${name} long_name ${name}
set scobj_hpath /sics/${name} set scobj_hpath /sics/${name}
@ -212,7 +212,7 @@ proc ::scobj::shutters::mk_sct_shutters { sct_controller name } {
${sct_controller} write ${scobj_hpath}/rough_100 ${sct_controller} write ${scobj_hpath}/rough_100
${sct_controller} write ${scobj_hpath}/rough_40 ${sct_controller} write ${scobj_hpath}/rough_40
} }
hsetprop ${scobj_hpath} klass collimator hsetprop ${scobj_hpath} klass instrument
# hook code starts # hook code starts
# hook code ends # hook code ends
} catch_message ] } catch_message ]

2
site_ansto/instrument/bilby/config/motors/shutters.sct
View File

@ -5,7 +5,7 @@
driver shutters = { driver shutters = {
usecreatenode = false usecreatenode = false
vendor = galil; device = mc4; protocol = dmc2280; vendor = galil; device = mc4; protocol = dmc2280;
class = collimator class = instrument
simulation_group = motor_simulation simulation_group = motor_simulation
# #
# Unnamed group has variables at device level # Unnamed group has variables at device level