Merged 2.4 branch

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

site_ansto/instrument/reflectometer/config/parameters/parameters.tcl

@@ -2,39 +2,42 @@
 # @brief Instrument parameters
 # TODO There should be an NXgeometry entry for each distance, and linked to an NXgeometry
 # entry for the chopper [SICS-108].
-foreach vn {
-  detector_distance
-  detector_base
-  slit4_distance
-  slit4_base
-  sample_distance
-  sample_base
-  slit3_distance
-  slit3_base
-  guide1_distance 
-  guide1_base
-  guide2_distance 
-  guide2_base
-  slit2_distance
-  slit2_base
-  chopper4_distance
-  chopper4_base
-  chopper3_distance
-  chopper3_base
-  chopper2_distance
-  chopper2_base
-  chopper1_distance
-  chopper1_base
-  chopper1_phase_offset
-  chopper2_phase_offset
-  chopper3_phase_offset
-  chopper4_phase_offset
-  slit1_distance
-  slit1_base
-  omega
-  twotheta
+foreach {vn klass units} {
+  detector_distance     parameter mm
+  detector_base         parameter mm
+  slit4_distance        parameter mm
+  slit4_base            parameter mm
+  sample_distance       parameter mm
+  sample_base           parameter mm
+  slit3_distance        parameter mm
+  slit3_base            parameter mm
+  guide1_distance       parameter mm
+  guide1_base           parameter mm
+  guide2_distance       parameter mm
+  guide2_base           parameter mm
+  slit2_distance        parameter mm
+  slit2_base            parameter mm
+  chopper4_distance     parameter mm
+  chopper4_base         parameter mm
+  chopper3_distance     parameter mm
+  chopper3_base         parameter mm
+  chopper2_distance     parameter mm
+  chopper2_base         parameter mm
+  chopper1_distance     parameter mm
+  chopper1_base         parameter mm
+  chopper1_phase_offset parameter degrees
+  chopper2_phase_offset parameter degrees
+  chopper3_phase_offset parameter degrees
+  chopper4_phase_offset parameter degrees
+  slit1_distance        parameter mm
+  slit1_base            parameter mm
+  omega                 parameter degrees
+  twotheta              parameter degrees
+  anal_distance         polarizer mm
+  anal_base             polarizer mm
 } {
-  ::utility::mkVar $vn float manager $vn true parameter true true
+  ::utility::mkVar $vn float manager $vn true $klass true true
+  sicslist setatt $vn units $units
 }
 
 foreach vn {