From f338cf5b4e82d1fced5f8bdb4324b3c317437e2e Mon Sep 17 00:00:00 2001 From: Ferdi Franceschini Date: Mon, 2 Apr 2007 18:20:20 +1000 Subject: [PATCH] Map motor types to hipadaba paths in the motor_hpath tuple list. r1787 | ffr | 2007-04-02 18:20:20 +1000 (Mon, 02 Apr 2007) | 2 lines --- .../hipd/config/hipadaba/hpaths.tcl | 47 ++++++---------- .../hrpd/config/hipadaba/hpaths.tcl | 56 +++++++------------ 2 files changed, 35 insertions(+), 68 deletions(-) diff --git a/site_ansto/instrument/hipd/config/hipadaba/hpaths.tcl b/site_ansto/instrument/hipd/config/hipadaba/hpaths.tcl index 372e088a..5db02aac 100644 --- a/site_ansto/instrument/hipd/config/hipadaba/hpaths.tcl +++ b/site_ansto/instrument/hipd/config/hipadaba/hpaths.tcl @@ -1,42 +1,27 @@ -set hpaths [list \ -experiment sample monochromator slits \ -slits/1 slits/1/horizontal slits/1/vertical slits/2 slits/2/horizontal slits/2/vertical detector detector/monitor detector/histmem ] +set hpaths [list experiment detector detector/monitor detector/histmem ] # Maps devices (eg motors) to hipadaba paths. # obj name path set motor_hpath [list \ -ss1u [SplitReply [ss1u long_name]] slits/1/vertical\ -ss1d [SplitReply [ ss1d long_name]] slits/1/vertical\ -ss1l [SplitReply [ ss1l long_name]] slits/1/horizontal\ -ss1r [SplitReply [ ss1r long_name]] slits/1/horizontal\ -ss2u [SplitReply [ ss2u long_name]] slits/2/vertical\ -ss2d [SplitReply [ ss2d long_name]] slits/2/vertical\ -ss2l [SplitReply [ ss2l long_name]] slits/2/horizontal\ -ss2r [SplitReply [ ss2r long_name]] slits/2/horizontal\ -som [SplitReply [ som long_name]] sample \ -schi [SplitReply [ schi long_name]] sample \ -sphi [SplitReply [ sphi long_name]] sample \ -sx [SplitReply [ sx long_name]] sample \ -sy [SplitReply [ sy long_name]] sample \ -stth [SplitReply [ stth long_name]] sample \ -mchi [SplitReply [ mchi long_name]] monochromator \ -mom [SplitReply [ mom long_name]] monochromator \ -mphi [SplitReply [ mphi long_name]] monochromator \ -mtth [SplitReply [ mtth long_name]] monochromator \ -mx [SplitReply [ mx long_name]] monochromator \ -my [SplitReply [ my long_name]] monochromator ] +sample sample \ +collimator collimator \ +crystal monochromator \ +monochromator monochromator \ +aperture slits ] # 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] +ss1vg ss1vg slits/first top\ +ss1vo ss1vo slits/first top\ +ss1hg ss1hg slits/first right\ +ss1ho ss1ho slits/first right\ +ss2vg ss2vg slits/second top\ +ss2vo ss2vo slits/second top\ +ss2hg ss2hg slits/second right\ +ss2ho ss2ho slits/second right\ +sth sth sample [SplitReply [stth long_name]]\ +mth mth monochromator [SplitReply [mtth long_name]]] array set counter_hpath [ list \ hm /detector/histmem \ diff --git a/site_ansto/instrument/hrpd/config/hipadaba/hpaths.tcl b/site_ansto/instrument/hrpd/config/hipadaba/hpaths.tcl index 42291104..c8af7500 100644 --- a/site_ansto/instrument/hrpd/config/hipadaba/hpaths.tcl +++ b/site_ansto/instrument/hrpd/config/hipadaba/hpaths.tcl @@ -1,46 +1,28 @@ -set hpaths [list \ -experiment sample monochromator slits \ -slits/1 slits/2 detector detector/monitor detector/histmem ] -# Maps devices (eg motors) to hipadaba paths. -# obj name path +set hpaths [list experiment detector detector/monitor detector/histmem ] + +#A "motor part" may have a group path which can be appended to the +#following paths. +# motor_hpath(type) -> hipadaba path set motor_hpath [list \ -ss1u [SplitReply [ss1u long_name]] /slits/1 \ -ss1d [SplitReply [ ss1d long_name]] /slits/1 \ -ss1l [SplitReply [ ss1l long_name]] /slits/1 \ -ss1r [SplitReply [ ss1r long_name]] /slits/1 \ -ss2u [SplitReply [ ss2u long_name]] /slits/2 \ -ss2d [SplitReply [ ss2d long_name]] /slits/2 \ -ss2l [SplitReply [ ss2l long_name]] /slits/2 \ -ss2r [SplitReply [ ss2r long_name]] /slits/2 \ -som [SplitReply [ som long_name]] /sample \ -schi [SplitReply [ schi long_name]] /sample \ -sphi [SplitReply [ sphi long_name]] /sample \ -sx [SplitReply [ sx long_name]] /sample \ -sy [SplitReply [ sy long_name]] /sample \ -stth [SplitReply [ stth long_name]] /sample \ -pcx [SplitReply [ pcx long_name]] /monochromator \ -pcr [SplitReply [ pcr long_name]] /monochromator \ -mom [SplitReply [ mom long_name]] /monochromator \ -mchi [SplitReply [ mchi long_name]] /monochromator \ -mphi [SplitReply [ mphi long_name]] /monochromator \ -mx [SplitReply [ mx long_name]] /monochromator \ -my [SplitReply [ my long_name]] /monochromator \ -mtth [SplitReply [ mtth long_name]] /monochromator ] +sample sample \ +collimator collimator \ +crystal monochromator \ +aperture slits ] # Configurable virtual motors # obj name path master_obj set cvirtmotor_hpath [list \ -ss1vg ss1vg /slits/1 top\ -ss1vo ss1vo /slits/1 top\ -ss1hg ss1hg /slits/1 right\ -ss1ho ss1ho /slits/1 right\ -ss2vg ss2vg /slits/2 ss2u\ -ss2vo ss2vo /slits/2 ss2u\ -ss2hg ss2hg /slits/2 ss2r\ -ss2ho ss2ho /slits/2 ss2r\ -sth sth /sample detector_rotate\ -mth mth /monochromator mtth] +ss1vg ss1vg slits/first top\ +ss1vo ss1vo slits/first top\ +ss1hg ss1hg slits/first right\ +ss1ho ss1ho slits/first right\ +ss2vg ss2vg slits/second top\ +ss2vo ss2vo slits/second top\ +ss2hg ss2hg slits/second right\ +ss2ho ss2ho slits/second right\ +sth sth sample [SplitReply [stth long_name]]\ +mth mth monochromator [SplitReply [mtth long_name]]] array set counter_hpath [ list \ hm hm /detector/histmem \