Merged 2.4 branch

r2828 | ffr | 2009-11-25 09:56:49 +1100 (Wed, 25 Nov 2009) | 2 lines

site_ansto/instrument/sans/config/parameters/parameters.tcl

@@ -2,7 +2,6 @@
 # @brief We can't change the coordinate scheme at runtime because this would require 
 # restructuring the hdb tree, but we should save it.
 foreach {var lname nxname} {
-    VelSelCoordScheme    VelSelCoordScheme   coordinate_scheme
     SApCoordScheme       SApCoordScheme      coordinate_scheme
     EApCoordScheme       EApCoordScheme      coordinate_scheme
     SampleCoordScheme    SampleCoordScheme   coordinate_scheme
@@ -18,11 +17,13 @@ foreach {var lname nxname} {
 ##
 # @brief User privilege text variables
 #
-foreach {var lname type nxname priv units klass} {
-    SApShape             SApShape    text    shape       user    none  parameter
-    BSShape              BSShape     text    shape       user    none  parameter
-    SampleThickness      thickness   float   thickness   user    mm    sample
-    TransmissionFlag     transmission_flag   int transmission  user none sample
+foreach {var lname type priv units klass} {
+    SApShape             SApShape            text    user    none  parameter
+    BSShape              BSShape             text    user    none  parameter
+    SampleThickness      thickness           float   user    mm    sample
+    TransmissionFlag     transmission_flag   int     user    none  sample
+    magnetic_field       magnetic_field      float   user    T     sample
+    lambda               lambda              float   user    Ao    data
 } {
   ::utility::mkVar $var $type $priv $lname true $klass true true
   if {$units != "none"} {
@@ -34,9 +35,6 @@ foreach {var lname type nxname priv units klass} {
 # @brief The velocity selector position is used as the reference for other instrument
 # component positions. For simplicity we set it as the origin x=y=z=0.
 foreach {var lname nxname units klass} {
-    VelSelPosXmm   VelSelPosXmm   x   mm @none
-    VelSelPosYmm   VelSelPosYmm   y   mm @none
-    VelSelPosZmm   VelSelPosZmm   z   mm @none
     EndFacePosYmm  EndFacePosYmm  y   mm parameter
     RotApPosYmm    RotApPosYmm    y   mm @none
 } {
@@ -222,22 +220,11 @@ foreach {pname motor units} {
   ${pname}_status "IDLE"
 }
 ################################################################################
-##
-# @brief This is the position of the velocity selector bunker face. It is used
-# as the reference for other positions. x=y=z=0.
-#::hdb::MakeVelocity_Selector velocity_selector {
-#    wavelength          LambdaA
-#    wavelength_spread   LambdaResFWHM_percent
-#    coordinate_scheme   VelSelCoordScheme
-#    position            {VelSelPosXmm VelSelPosYmm VelSelPosZmm}
-#}
-
 ::hdb::MakeAperture sample_aperture {
     shape               SApShape
     size                {SApXmm          SApZmm}
     coordinate_scheme   SApCoordScheme
     position            {SApPosXmm       SApPosYmm       SApPosZmm}
-    refpos              {VelSelPosXmm    EndFacePosYmm   VelSelPosZmm}
 }
 
 ::hdb::MakeAperture entrance_aperture {
@@ -245,7 +232,6 @@ foreach {pname motor units} {
     size                {EApXmm           EApYmm   EApZmm}
     coordinate_scheme   EApCoordScheme
     position            EApPosYmm
-    refpos              VelSelPosYmm
 }
 
 ::hdb::MakeAperture rotary_aperture {
@@ -253,27 +239,23 @@ foreach {pname motor units} {
   size {RotApXmm RotApZmm}
   position RotApPosYmm
   orientation RotApDeg
-  refpos VelSelPosYmm
 }
 
 #::hdb::MakeGeometry sample_geometry sample {
 #    coordinate_scheme   SampleCoordScheme
 #    position            {SamplePosXmm       SamplePosYmm     SamplePosZmm}
 #    orientation         {SampleTiltXDeg     SampleTiltYDeg   SampleRotDeg}
-#    refpos              {VelSelPosXmm       EndFacePosYmm    VelSelPosZmm}
 #}
 
 ::hdb::MakeGeometry detector_geometry detector {
     coordinate_scheme   DetCoordScheme
     position            {DetPosXmm DetPosYmm}
     offset              DetPosYOffsetmm
-    refpos              {VelSelPosXmm EndFacePosYmm}
 }
 
 ::hdb::MakeGeometry collimator_geometry collimator {
     coordinate_scheme   CollCoordScheme
     position            EndFacePosYmm
-    refpos              VelSelPosYmm
 }
 
 ::hdb::MakeGeometry beamstop_geometry beam_stop {
@@ -298,9 +280,6 @@ array set collapposmm {
   ap9          19925
 }
 
-VelSelPosXmm    0.0
-VelSelPosYmm    0.0
-VelSelPosZmm    0.0
 EndFacePosYmm   20095
 RotApPosYmm     675
 
@@ -399,17 +378,3 @@ proc check {args} {
 }
 publish check user
 
-foreach {pname bsname} {
-   beamstop110 bs1
-   beamstop88 bs2
-   beamstop66 bs3
-   beamstop44 bs4
-   beamstop22 bs5
-} {
-::utility::macro::getset text $pname {} [subst -nocommands {
-  return [$bsname status]
-}]
-  sicslist setatt $pname long_name $pname
-  sicslist setatt $pname mutable false
-  sicslist setatt $pname klass derived_parameter
-}