Merged in-situ modifications for Release 2.5 candidate 5

r2895 | ffr | 2010-04-29 16:02:15 +1000 (Thu, 29 Apr 2010) | 2 lines

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

@@ -3,6 +3,9 @@
 # START MOTOR CONFIGURATION
 ::utility::mkVar FastShutter text manager FastShutter false instrument true false
 
+# SET TO 1 TO USE THE TILT STAGE ie sample phi and chi
+set use_tiltstage 0
+
 set animal quokka
 set sim_mode [SplitReply [motor_simulation]]
 
@@ -174,7 +177,7 @@ dummy_motor softlowerlim -500
 dummy_motor softupperlim 500
 dummy_motor home 0
 
-
+if $use_tiltstage {
 # Sample tilt along beam [-20,+20] degrees
 Motor samchi $motor_driver_type [params \
   asyncqueue mc1\
@@ -218,7 +221,7 @@ samphi long_name sample_phi
 samphi softlowerlim -20
 samphi softupperlim 20
 samphi home 0
-
+}
 # Sample translation across beam [0,1000] mm
 Motor samx $motor_driver_type [params \
   asyncqueue mc1\
@@ -724,25 +727,25 @@ apx softupperlim 5
 apx speed 5
 
 # Sample aperture y
-Motor apz $motor_driver_type [params \
-  asyncqueue mc3\
-  host mc3-quokka\
-  port pmc3-quokka\
-  axis F\
-  units mm\
-  hardlowerlim -10\
-  hardupperlim 10\
-  maxSpeed 1\
-  maxAccel 1\
-  maxDecel 1\
-  stepsPerX 25000\
-  absEnc 1\
-  absEncHome $apz_Home\
-  cntsPerX -8192]
-apz part collimator
-apz long_name apz
-setHomeandRange -motor apz -home 0 -lowrange 0 -uprange 5
-apz speed 1
+#Motor apz $motor_driver_type [params \
+#  asyncqueue mc3\
+#  host mc3-quokka\
+#  port pmc3-quokka\
+#  axis F\
+#  units mm\
+#  hardlowerlim -10\
+#  hardupperlim 10\
+#  maxSpeed 1\
+#  maxAccel 1\
+#  maxDecel 1\
+#  stepsPerX 25000\
+#  absEnc 1\
+#  absEncHome $apz_Home\
+#  cntsPerX -8192]
+#apz part collimator
+#apz long_name apz
+#setHomeandRange -motor apz -home 0 -lowrange 0 -uprange 5
+#apz speed 1
 
 # Rotary attenuator
 set att_factor [expr ((1.0 - (1.0)/360.0)*(3000.0/61.0))/360.0]

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

@@ -7,8 +7,8 @@
 ##
 # Note EndFacePosY and RotApPosY are surveyed positions
 foreach {var lname type priv units klass} {
-  BeamCenterX      BeamCenterX        float user     mm   parameter
-  BeamCenterZ      BeamCenterZ        float user     mm   parameter
+  BeamCenterX      BeamCenterX        float user     mm   reduce
+  BeamCenterZ      BeamCenterZ        float user     mm   reduce
   BeamStop         BeamStop           int   user     none parameter
   BSdiam           BSdiam             float user     mm   parameter
   EApPosY          EApPosY            float user     mm   parameter