From 3e5a3d120184f2c29ebe1774126786cb28eef296 Mon Sep 17 00:00:00 2001 From: Ferdi Franceschini Date: Fri, 13 Apr 2007 16:37:02 +1000 Subject: [PATCH] motor_hpath now maps part identifiers to hipadaba nodes r1855 | ffr | 2007-04-13 16:37:02 +1000 (Fri, 13 Apr 2007) | 2 lines --- .../reflectometer/config/hipadaba/hpaths.tcl | 72 +++++++------------ 1 file changed, 24 insertions(+), 48 deletions(-) diff --git a/site_ansto/instrument/reflectometer/config/hipadaba/hpaths.tcl b/site_ansto/instrument/reflectometer/config/hipadaba/hpaths.tcl index fb89e005..336ae4c8 100644 --- a/site_ansto/instrument/reflectometer/config/hipadaba/hpaths.tcl +++ b/site_ansto/instrument/reflectometer/config/hipadaba/hpaths.tcl @@ -1,57 +1,33 @@ -set hpaths [list \ -experiment sample detector slits collimator \ -slits/1 slits/1/horizontal slits/1/vertical \ -slits/2 slits/2/horizontal slits/2/vertical \ -slits/3 slits/3/horizontal slits/3/vertical \ -slits/4 slits/4/horizontal slits/4/vertical] +set hpaths [list experiment ] # Maps devices (eg motors) to hipadaba paths. # obj name path set motor_hpath [list \ -ss1u top /slits/1/vertical \ -ss1d bottom /slits/1/vertical \ -ss1l left /slits/1/horizontal \ -ss1r right /slits/1/horizontal \ -ss2u top /slits/2/vertical \ -ss2d bottom /slits/2/vertical \ -ss2l left /slits/2/horizontal \ -ss2r right /slits/2/horizontal \ -ss3u top /slits/3/vertical \ -ss3d bottom /slits/3/vertical \ -ss3l left /slits/3/horizontal \ -ss3r right /slits/3/horizontal \ -ss4u top /slits/4/vertical \ -ss4d bottom /slits/4/vertical \ -ss4l left /slits/4/horizontal \ -ss4r right /slits/4/horizontal \ -st3vt st3vt /slits/3/vertical \ -st4vt st4vt /slits/4/vertical \ -sz translate_z /sample \ -sx translate_x /sample \ -sth sth /sample \ -sphi sphi /sample \ -bz shade /detector \ -dz detector /detector \ -c1ht translation /collimator \ -m1ro rotation /collimator] +aperture aperture \ +attenuator attenuator \ +collimator collimator \ +detector detector \ +polarizer polarizer \ +sample sample ] + # Configurable virtual motors # obj name path master_obj set cvirtmotor_hpath [list \ -ss1hg gap /slits/1/horizontal left\ -ss1ho offset /slits/1/horizontal left\ -ss1vg gap /slits/1/vertical top\ -ss1vo offset /slits/1/vertical top\ -ss2hg gap /slits/2/horizontal left\ -ss2ho offset /slits/2/horizontal left\ -ss2vg gap /slits/2/vertical top\ -ss2vo offset /slits/2/vertical top\ -ss3hg gap /slits/3/horizontal left\ -ss3ho offset /slits/3/horizontal left\ -ss3vg gap /slits/3/vertical top\ -ss3vo offset /slits/3/vertical top\ -ss4hg gap /slits/4/horizontal left\ -ss4ho offset /slits/4/horizontal left\ -ss4vg gap /slits/4/vertical top\ -ss4vo offset /slits/4/vertical top] +ss1hg gap /slits/one/horizontal left\ +ss1ho offset /slits/one/horizontal left\ +ss1vg gap /slits/one/vertical top\ +ss1vo offset /slits/one/vertical top\ +ss2hg gap /slits/two/horizontal left\ +ss2ho offset /slits/two/horizontal left\ +ss2vg gap /slits/two/vertical top\ +ss2vo offset /slits/two/vertical top\ +ss3hg gap /slits/three/horizontal left\ +ss3ho offset /slits/three/horizontal left\ +ss3vg gap /slits/three/vertical top\ +ss3vo offset /slits/three/vertical top\ +ss4hg gap /slits/four/horizontal left\ +ss4ho offset /slits/four/horizontal left\ +ss4vg gap /slits/four/vertical top\ +ss4vo offset /slits/four/vertical top]