common_instrument_dictionary.tcl

instrument/slits is now an NXaperture and collects all 'slits' objects.

instdict_specification.tcl
Added 'slits' to sobj_klass_list

motor_configuration.tcl files
Reverted 18/09/08

r2701 | ffr | 2008-09-24 08:44:01 +1000 (Wed, 24 Sep 2008) | 9 lines

site_ansto/instrument/config/hipadaba/common_instrument_dictionary.tcl

@@ -166,9 +166,9 @@ set instrument_dictionary [subst {
   }
   instrument/slits {
     privilege spy
-    sobj {@any aperture}
+    sobj {@any slits}
     datatype @none
-    property {data true control true nxsave false klass NXfilter type part}
+    property {data true control true nxsave false klass NXaperture type part}
   }
   sample {
     privilege spy

site_ansto/instrument/config/hipadaba/instdict_specification.tcl

@@ -11,7 +11,7 @@ set boolean {true false}
 #}
 
 # SICS OBJECTS MUST PROVIDE THE FOLLOWING INFORMATION
-set sobj_klass_list {@none aperture attenuator collimator command crystal data detector disk_chopper entry environment experiment graphics instrument monitor monochromator parameter derived_parameter plc sample scan sensor source user}
+set sobj_klass_list {@none aperture attenuator collimator command crystal data detector disk_chopper entry environment experiment graphics instrument slits monitor monochromator parameter derived_parameter plc sample scan sensor source user}
 set sobj_sicstype_list {chopperadapter environment_controller sicsvariable macro motor configurablevirtualmotor singlecounter histmem nxscript sicsdata scanobject}
 # Different kinds of things are added to the hdb in different ways.
 # command: This is something a client can run with hset /a/b/c start, it may have parameters and feedback.

site_ansto/instrument/hipd/config/motors/motor_configuration.tcl

@@ -468,8 +468,8 @@ ss1r softlowerlim $ss1r_LoRange
 ss1r softupperlim $ss1r_HiRange
 ss1r home 0
 ss1r movecount $move_count
-ss1r part aperture
+ss1r part slits.first
-ss1r long_name first_right
+ss1r long_name right
 
 # Slit 1, left
 Motor ss1l $motor_driver_type [params \
@@ -487,8 +487,8 @@ ss1l softlowerlim $ss1l_LoRange
 ss1l softupperlim $ss1l_HiRange
 ss1l home 0
 ss1l movecount $move_count
-ss1l part aperture
+ss1l part slits.first
-ss1l long_name first_left
+ss1l long_name left
 
 # Slit 1, up
 Motor ss1u $motor_driver_type [params \
@@ -506,8 +506,8 @@ ss1u softlowerlim $ss1u_LoRange
 ss1u softupperlim $ss1u_HiRange
 ss1u home 0
 ss1u movecount $move_count
-ss1u part aperture
+ss1u part slits.first
-ss1u long_name first_top
+ss1u long_name top
 
 # Slit 1, down
 Motor ss1d $motor_driver_type [params \
@@ -525,8 +525,8 @@ ss1d softlowerlim $ss1d_LoRange
 ss1d softupperlim $ss1d_HiRange
 ss1d home 0
 ss1d movecount $move_count
-ss1d part aperture
+ss1d part slits.first
-ss1d long_name first_bottom
+ss1d long_name bottom
 
 ############################
 # Motor Controller 4
@@ -551,8 +551,8 @@ ss2r softlowerlim $ss2r_LoRange
 ss2r softupperlim $ss2r_HiRange
 ss2r home 0
 ss2r movecount $move_count
-ss2r part aperture
+ss2r part slits.second
-ss2r long_name second_right
+ss2r long_name right
 
 # Slit 2, left
 Motor ss2l $motor_driver_type [params \
@@ -570,8 +570,8 @@ ss2l softlowerlim $ss2l_LoRange
 ss2l softupperlim $ss2l_HiRange
 ss2l home 0
 ss2l movecount $move_count
-ss2l part aperture
+ss2l part slits.second
-ss2l long_name second_left
+ss2l long_name left
 
 # Slit 2, up
 Motor ss2u $motor_driver_type [params \
@@ -589,8 +589,8 @@ ss2u softlowerlim $ss2u_LoRange
 ss2u softupperlim $ss2u_HiRange
 ss2u home 0
 ss2u movecount $move_count
-ss2u part aperture
+ss2u part slits.second
-ss2u long_name second_top
+ss2u long_name top
 
 # Slit 2, down
 Motor ss2d $motor_driver_type [params \
@@ -608,8 +608,8 @@ ss2d softlowerlim $ss2d_LoRange
 ss2d softupperlim $ss2d_HiRange
 ss2d home 0
 ss2d movecount $move_count
-ss2d part aperture
+ss2d part slits.second
-ss2d long_name second_bottom
+ss2d long_name bottom
 
 proc mthGet {} { return [expr [SplitReply [mtth]]/2.0]}
 proc mthSet {val} { return "mtth=[SplitReply [mtth]]"}

site_ansto/instrument/hrpd/config/motors/motor_configuration.tcl

@@ -1,5 +1,5 @@
-# $Revision: 1.30 $
+# $Revision: 1.31 $
-# $Date: 2008-09-22 05:58:31 $
+# $Date: 2008-09-23 22:44:01 $
 # Author: Ferdi Franceschini (ffr@ansto.gov.au)
 # Last revision by: $Author: ffr $
 source $cfPath(anticollider)/anticollider.tcl
@@ -513,8 +513,8 @@ ss1r softlowerlim $ss1r_LoRange
 ss1r softupperlim $ss1r_HiRange
 ss1r home 0
 ss1r movecount $move_count
-ss1r part aperture
+ss1r part slits.first
-ss1r long_name first_right
+ss1r long_name right
 
 # Slit 1, left
 Motor ss1l $motor_driver_type [params \
@@ -532,8 +532,8 @@ ss1l softlowerlim $ss1l_LoRange
 ss1l softupperlim $ss1l_HiRange
 ss1l home 0
 ss1l movecount $move_count
-ss1l part aperture
+ss1l part slits.first
-ss1l long_name first_left
+ss1l long_name left
 
 # Slit 1, up
 Motor ss1u $motor_driver_type [params \
@@ -551,8 +551,8 @@ ss1u softlowerlim $ss1u_LoRange
 ss1u softupperlim $ss1u_HiRange
 ss1u home 0
 ss1u movecount $move_count
-ss1u part aperture
+ss1u part slits.first
-ss1u long_name first_top
+ss1u long_name top
 
 # Slit 1, down
 Motor ss1d $motor_driver_type [params \
@@ -570,8 +570,8 @@ ss1d softlowerlim $ss1d_LoRange
 ss1d softupperlim $ss1d_HiRange
 ss1d home 0
 ss1d movecount $move_count
-ss1d part aperture
+ss1d part slits.first
-ss1d long_name first_bottom
+ss1d long_name bottom
 
 ############################
 # Motor Controller 4
@@ -624,8 +624,8 @@ ss2r softlowerlim $ss2r_LoRange
 ss2r softupperlim $ss2r_HiRange
 ss2r home 0
 ss2r movecount $move_count
-ss2r part aperture
+ss2r part slits.second
-ss2r long_name second_right
+ss2r long_name right
 
 # Slit 2, left
 Motor ss2l $motor_driver_type [params \
@@ -643,8 +643,8 @@ ss2l softlowerlim $ss2l_LoRange
 ss2l softupperlim $ss2l_HiRange
 ss2l home 0
 ss2l movecount $move_count
-ss2l part aperture
+ss2l part slits.second
-ss2l long_name second_left
+ss2l long_name left
 
 # Slit 2, up
 Motor ss2u $motor_driver_type [params \
@@ -662,8 +662,8 @@ ss2u softlowerlim $ss2u_LoRange
 ss2u softupperlim $ss2u_HiRange
 ss2u home 0
 ss2u movecount $move_count
-ss2u part aperture
+ss2u part slits.second
-ss2u long_name second_top
+ss2u long_name top
 
 # Slit 2, down
 Motor ss2d $motor_driver_type [params \
@@ -681,8 +681,8 @@ ss2d softlowerlim $ss2d_LoRange
 ss2d softupperlim $ss2d_HiRange
 ss2d home 0
 ss2d movecount $move_count
-ss2d part aperture
+ss2d part slits.second
-ss2d long_name second_bottom
+ss2d long_name bottom
 
 # Virtual and Simulated Motors
 # ----------------------------

site_ansto/instrument/reflectometer/config/motors/motor_configuration.tcl

@@ -179,14 +179,14 @@ set ss4l_HiRange 14.0
 set ss4u_HiRange 27.0
 set ss4d_HiRange 8.0
 }
-set slit1VGroup first_vertical
+set slit1VGroup first/vertical
-set slit1HGroup first_horizontal
+set slit1HGroup first/horizontal
-set slit2VGroup second_vertical
+set slit2VGroup second/vertical
-set slit2HGroup second_horizontal
+set slit2HGroup second/horizontal
-set slit3VGroup third_vertical
+set slit3VGroup third/vertical
-set slit3HGroup third_horizontal
+set slit3HGroup third/horizontal
-set slit4VGroup fourth_vertical
+set slit4VGroup fourth/vertical
-set slit4HGroup fourth_horizontal
+set slit4HGroup fourth/horizontal
 
 # set movecount high to reduce the frequency of
 # hnotify messages to a reasonable level
@@ -307,8 +307,8 @@ Motor st3vt $motor_driver_type [params \
   absEnc 1\
   absEncHome $st3vt_home\
   cntsPerX -8192]
-st3vt part aperture
+st3vt part slits.$slit3VGroup
-st3vt long_name ${slit3VGroup}_st3vt
+st3vt long_name st3vt
 st3vt softlowerlim 0
 st3vt softupperlim 253
 st3vt home 0
@@ -331,8 +331,8 @@ Motor st4vt $motor_driver_type [params \
   absEnc 1\
   absEncHome $st4vt_home\
   cntsPerX -8192]
-st4vt part aperture
+st4vt part slits.$slit4VGroup
-st4vt long_name ${slit4VGroup}_st4vt
+st4vt long_name st4vt
 st4vt softlowerlim 0
 st4vt softupperlim 249
 st4vt home 0
@@ -530,8 +530,8 @@ Motor ss1l $motor_driver_type [params \
   maxDecel 5\
   stepsPerX $slitStepRate\
   motorHome $ss1l_Home]
-ss1l part aperture
+ss1l part slits.$slit1HGroup
-ss1l long_name ${slit1HGroup}_left
+ss1l long_name left
 ss1l softlowerlim $ss1l_LoRange
 ss1l softupperlim $ss1l_HiRange
 ss1l home 0
@@ -550,8 +550,8 @@ Motor ss1r $motor_driver_type [params \
   maxDecel 5\
   stepsPerX -$slitStepRate\
   motorHome $ss1r_Home]
-ss1r part aperture
+ss1r part slits.$slit1HGroup
-ss1r long_name ${slit1HGroup}_right
+ss1r long_name right
 ss1r softlowerlim $ss1r_LoRange
 ss1r softupperlim $ss1r_HiRange
 ss1r home 0
@@ -570,8 +570,8 @@ Motor ss1u $motor_driver_type [params \
   maxDecel 5\
   stepsPerX -$slitStepRate\
   motorHome $ss1u_Home]
-ss1u part aperture
+ss1u part slits.$slit1VGroup
-ss1u long_name ${slit1VGroup}_upper
+ss1u long_name upper
 ss1u softlowerlim $ss1u_LoRange
 ss1u softupperlim $ss1u_HiRange
 ss1u home 0
@@ -590,8 +590,8 @@ Motor ss1d $motor_driver_type [params \
   maxDecel 5\
   stepsPerX $slitStepRate\
   motorHome $ss1d_Home]
-ss1d part aperture
+ss1d part slits.$slit1VGroup
-ss1d long_name ${slit1VGroup}_lower
+ss1d long_name lower
 ss1d softlowerlim $ss1d_LoRange
 ss1d softupperlim $ss1d_HiRange
 ss1d home 0
@@ -610,8 +610,8 @@ Motor ss2l $motor_driver_type [params \
   maxDecel 5\
   stepsPerX $slitStepRate\
   motorHome $ss2l_Home]
-ss2l part aperture
+ss2l part slits.$slit2HGroup
-ss2l long_name ${slit2HGroup}_left
+ss2l long_name left
 ss2l softlowerlim $ss2l_LoRange
 ss2l softupperlim $ss2l_HiRange
 ss2l home 0
@@ -630,8 +630,8 @@ Motor ss2r $motor_driver_type [params \
   maxDecel 5\
   stepsPerX -$slitStepRate\
   motorHome $ss2r_Home]
-ss2r part aperture
+ss2r part slits.$slit2HGroup
-ss2r long_name ${slit2HGroup}_right
+ss2r long_name right
 ss2r softlowerlim $ss2r_LoRange
 ss2r softupperlim $ss2r_HiRange
 ss2r home 0
@@ -650,8 +650,8 @@ Motor ss2u $motor_driver_type [params \
   maxDecel 5\
   stepsPerX -$slitStepRate\
   motorHome $ss2u_Home]
-ss2u part aperture
+ss2u part slits.$slit2VGroup
-ss2u long_name ${slit2VGroup}_upper
+ss2u long_name upper
 ss2u softlowerlim $ss2u_LoRange
 ss2u softupperlim $ss2u_HiRange
 ss2u home 0
@@ -670,8 +670,8 @@ Motor ss2d $motor_driver_type [params \
   maxDecel 5\
   stepsPerX $slitStepRate\
   motorHome $ss2d_Home]
-ss2d part aperture
+ss2d part slits.$slit2VGroup
-ss2d long_name ${slit2VGroup}_lower
+ss2d long_name lower
 ss2d softlowerlim $ss2d_LoRange
 ss2d softupperlim $ss2d_HiRange
 ss2d home 0
@@ -697,8 +697,8 @@ Motor ss3d $motor_driver_type [params \
   maxDecel 5\
   stepsPerX $slitStepRate\
   motorHome $ss3d_Home]
-ss3d part aperture
+ss3d part slits.$slit3VGroup
-ss3d long_name ${slit3VGroup}_lower
+ss3d long_name lower
 ss3d softlowerlim $ss3d_LoRange
 ss3d softupperlim $ss3d_HiRange
 ss3d home 0
@@ -717,8 +717,8 @@ Motor ss3u $motor_driver_type [params \
   maxDecel 5\
   stepsPerX -$slitStepRate\
   motorHome $ss3u_Home]
-ss3u part aperture
+ss3u part slits.$slit3VGroup
-ss3u long_name ${slit3VGroup}_upper
+ss3u long_name upper
 ss3u softlowerlim $ss3u_LoRange
 ss3u softupperlim $ss3u_HiRange
 ss3u home 0
@@ -737,8 +737,8 @@ Motor ss3l $motor_driver_type [params \
   maxDecel 5\
   stepsPerX $slitStepRate\
   motorHome $ss3l_Home]
-ss3l part aperture
+ss3l part slits.$slit3HGroup
-ss3l long_name ${slit3HGroup}_left
+ss3l long_name left
 ss3l softlowerlim $ss3l_LoRange
 ss3l softupperlim $ss3l_HiRange
 ss3l home 0
@@ -757,8 +757,8 @@ Motor ss3r $motor_driver_type [params \
   maxDecel 5\
   stepsPerX -$slitStepRate\
   motorHome $ss3r_Home]
-ss3r part aperture
+ss3r part slits.$slit3HGroup
-ss3r long_name ${slit3HGroup}_right
+ss3r long_name right
 ss3r softlowerlim $ss3r_LoRange
 ss3r softupperlim $ss3r_HiRange
 ss3r home 0
@@ -777,8 +777,8 @@ Motor ss4d $motor_driver_type [params \
   maxDecel 5\
   stepsPerX $slitStepRate\
   motorHome $ss4d_Home]
-ss4d part aperture
+ss4d part slits.$slit4VGroup
-ss4d long_name ${slit4VGroup}_lower
+ss4d long_name lower
 ss4d softlowerlim $ss4d_LoRange
 ss4d softupperlim $ss4d_HiRange
 ss4d home 0
@@ -797,8 +797,8 @@ Motor ss4u $motor_driver_type [params \
   maxDecel 5\
   stepsPerX -$slitStepRate\
   motorHome $ss4u_Home]
-ss4u part aperture
+ss4u part slits.$slit4VGroup
-ss4u long_name ${slit4VGroup}_upper
+ss4u long_name upper
 ss4u softlowerlim $ss4u_LoRange
 ss4u softupperlim $ss4u_HiRange
 ss4u home 0
@@ -817,8 +817,8 @@ Motor ss4l $motor_driver_type [params \
   maxDecel 5\
   stepsPerX $slitStepRate\
   motorHome $ss4l_Home]
-ss4l part aperture
+ss4l part slits.$slit4HGroup
-ss4l long_name ${slit4HGroup}_left
+ss4l long_name left
 ss4l softlowerlim $ss4l_LoRange
 ss4l softupperlim $ss4l_HiRange
 ss4l home 0
@@ -837,8 +837,8 @@ Motor ss4r $motor_driver_type [params \
   maxDecel 5\
   stepsPerX -$slitStepRate\
   motorHome $ss4r_Home]
-ss4r part aperture
+ss4r part slits.$slit4HGroup
-ss4r long_name ${slit4HGroup}_right
+ss4r long_name right
 ss4r softlowerlim $ss4r_LoRange
 ss4r softupperlim $ss4r_HiRange
 ss4r home 0

site_ansto/instrument/rsd/config/motors/motor_configuration.tcl

@@ -542,8 +542,8 @@ Motor psho $motor_driver_type [params \
   absenchome $psho_home\
   cntsPerX 8192]
 psho Backlash_offset -0.3
-psho part aperture
+psho part slits.primary
-psho long_name primary_horizontal_offset
+psho long_name horizontal_offset
 setHomeandRange -motor psho  -home 0 -lowrange 0 -uprange 30 
 
 # Primary Slit, position 0-150mm (Y-axis)
@@ -561,8 +561,8 @@ Motor psp $motor_driver_type [params \
   absenchome $psp_home\
   cntsPerX -8192]
 psp Backlash_offset -0.3
-psp part aperture
+psp part slits.primary
-psp long_name primary_position
+psp long_name position
 setHomeandRange -motor psp -home 0 -lowrange 0 -uprange 150
 
 # Primary Slit, width, 0-30mm
@@ -580,8 +580,8 @@ Motor psw $motor_driver_type [params \
   absenchome $psw_home\
   cntsPerX -8192]
 psw Backlash_offset 0.3  
-psw part aperture
+psw part slits.primary
-psw long_name primary_width
+psw long_name width
 setHomeandRange -motor psw -home 0 -lowrange 0 -uprange 30 
 
 #--------------------------------------------------------
@@ -601,8 +601,8 @@ Motor ssho $motor_driver_type [params \
   absenchome $ssho_home\
   cntsPerX 8192]
 ssho Backlash_offset -0.3  
-ssho part aperture
+ssho part slits.secondary
-ssho long_name secondary_horizontal_offset
+ssho long_name horizontal_offset
 setHomeandRange -motor ssho  -home 0 -lowrange 0 -uprange 30 
 
 # Secondary Slit, position
@@ -620,8 +620,8 @@ Motor ssp $motor_driver_type [params \
   absenchome $ssp_home\
   cntsPerX -8192]
 ssp Backlash_offset -0.3  
-ssp part aperture
+ssp part slits.secondary
-ssp long_name secondary_position
+ssp long_name position
 setHomeandRange -motor ssp  -home 0 -lowrange 0 -uprange 150
 
 # Secondary Slit, width
@@ -639,8 +639,8 @@ Motor ssw $motor_driver_type [params \
   absenchome $ssw_home\
   cntsPerX -8192]
 ssw Backlash_offset 0.3  
-ssw part aperture
+ssw part slits.secondary
-ssw long_name secondary_width
+ssw long_name width
 setHomeandRange -motor ssw  -home 0 -lowrange 0 -uprange 30
 
 ## Primary Slit, height, 0-30mm
@@ -657,8 +657,8 @@ setHomeandRange -motor ssw  -home 0 -lowrange 0 -uprange 30
 #  absenc 1\
 #  absenchome 542093\
 #  cntsPerX 8192]
-#psh part aperture
+#psh part slits.primary
-#psh part long_name primary_height
+#psh part long_name height
 #setHomeandRange -motor psh  -home 0 -lowrange 0 -uprange 30 
 
 ## Secondary Slit, height
@@ -675,8 +675,8 @@ setHomeandRange -motor ssw  -home 0 -lowrange 0 -uprange 30
 #  absenc 1\
 #  absenchome 500000\
 #  cntsPerX 8192]
-#ssh part aperture
+#ssh part slits.secondary
-#ssh long_name secondary_height
+#ssh long_name height
 #setHomeandRange -motor ssh  -home 0 -lowrange 0 -uprange 30 
 
 #--------------------------------------------------------

site_ansto/instrument/util/motor_utility.tcl

@@ -1,7 +1,7 @@
 # Some useful functions for SICS motor configuration.
 
-# $Revision: 1.2 $
+# $Revision: 1.3 $
-# $Date: 2008-05-30 00:26:57 $
+# $Date: 2008-09-23 22:44:01 $
 # Author: Douglas Clowes (dcl@ansto.gov.au)
 # Last revision by $Author: ffr $
 
@@ -57,12 +57,12 @@ proc make_gap_motors {vm1 vm1_name vm2 vm2_name m1 m2 aunits agroup} {
 #publish set_$vm2 user
 
 sicslist setatt $vm1 units $aunits
-sicslist setatt $vm1 klass aperture
+sicslist setatt $vm1 klass slits
 sicslist setatt $vm1 long_name $vm1_name
 sicslist setatt $vm1 group $agroup
 sicslist setatt $vm1 hdbchain $m1,$m2
 sicslist setatt $vm2 units $aunits
-sicslist setatt $vm2 klass aperture
+sicslist setatt $vm2 klass slits
 sicslist setatt $vm2 long_name $vm2_name
 sicslist setatt $vm2 group $agroup
 sicslist setatt $vm2 hdbchain $m1,$m2