All

Added "STARTING" message to the histmem command status.
Can now make multiple script context positional motors
Added table and table entry IDs for posit motor lookup tables.
Fixed the runsics script so that the stop command sends an EndServer interrupt via the UDP port instead of killing SICS, this ensures that status is saved.

Platypus
Added chopper speed, phase and phase offsets for all choppers on hdb tree and in datafile

Quokka
Replace the sample/select command with the changer_position script context positional motor interface.
Fixed upper limit on apx motor
Added full sample changer and auto aperture positional motors

r2727 | ffr | 2008-10-31 15:37:32 +1100 (Fri, 31 Oct 2008) | 14 lines

site_ansto/instrument/sans/config/commands/commands.tcl

@@ -5,11 +5,11 @@ namespace eval motor {
     variable is_homing_list ""
 }
 
-namespace eval sample {
-  command select {int=0:8 sampid} {
-    SampleNum $sampid
-  }
-}
+#namespace eval sample {
+#  command select {int=0:8 sampid} {
+#    SampleNum $sampid
+#  }
+#}
 
 namespace eval optics {
 	VarMake ::optics::select::section text user

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

@@ -1,5 +1,5 @@
-# $Revision: 1.24 $
-# $Date: 2008-08-19 05:11:55 $
+# $Revision: 1.25 $
+# $Date: 2008-10-31 04:37:31 $
 # Author: Ferdi Franceschini (ffr@ansto.gov.au)
 # Last revision by: $Author: ffr $
 
@@ -753,7 +753,7 @@ Motor apx $motor_driver_type [params \
   axis E\
   units mm\
   hardlowerlim -10\
-  hardupperlim 10\
+  hardupperlim 360\
   maxSpeed 1\
   maxAccel 1\
   maxDecel 1\

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

@@ -1,12 +1,70 @@
 source $cfPath(motors)/sct_positmotor_common.tcl
 
-set port [::utility::get_portnum pmc1-quokka]
-makesctcontroller sct_mc1 std localhost:$port
+set port1 [::utility::get_portnum pmc1-quokka]
+set port2 [::utility::get_portnum pmc2-quokka]
+set port3 [::utility::get_portnum pmc3-quokka]
+set port4 [::utility::get_portnum pmc4-quokka]
+makesctcontroller sct_mc1 std mc1:$port1
+makesctcontroller sct_mc2 std mc2:$port2
+makesctcontroller sct_mc3 std mc3:$port3
+makesctcontroller sct_mc4 std mc4:$port4
 
-mk_sct_positmotor sct_mc1 samx samplenum C {
-1 0
-2 15
-3 20
+# label pos
+set 20sample_table {
+  1  453.7
+  2  411.7
+  3  369.7
+  4  327.7
+  5  285.7
+  6  203.7
+  7  161.7
+  8  119.7
+  9  77.7 
+  10 35.7 
+  11 -46.3 
+  12 -88.3 
+  13 -130.3
+  14 -172.3
+  15 -214.3
+  16 -296.3
+  17 -338.3
+  18 -380.3
+  19 -422.3
+  20 -464.3
 }
 
+mk_sct_positmotor sct_mc1 samx samplenum 20SAMPLES $20sample_table
+
+set auto_ap_table {
+  2.5    0
+  5.0   23
+  7.5   47
+  10.0  72
+  12.5  98
+  15.0 125
+  17.5 153
+  20.0 183
+  25.0 215
+  30.0 250
+}
+mk_sct_positmotor sct_mc3 apx aperture auto_ap $auto_ap_table
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 

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

@@ -41,7 +41,7 @@ foreach {var lname nxname units klass} {
   }
 }
 
-::utility::mkVar SampleNum int readonly changer_position true parameter true true
+# ::utility::mkVar SampleNum int readonly changer_position true parameter true true
 
 ##
 # @brief Parameter SicsVariables

site_ansto/instrument/sans/quokka_configuration.tcl

@@ -1,5 +1,5 @@
-# $Revision: 1.15 $
-# $Date: 2008-10-27 04:55:47 $
+# $Revision: 1.16 $
+# $Date: 2008-10-31 04:37:31 $
 # Author: Ferdi Franceschini (ffr@ansto.gov.au)
 # Last revision by: $Author: ffr $
 
@@ -55,3 +55,10 @@ server_init
     hsetprop /instrument/parameters/derived_parameters/$pname/feedback/status data false
     hsetprop /instrument/parameters/derived_parameters/$pname/feedback/status nxsave false
   }
+  hsetprop /sct_mc1 control false
+  hsetprop /sct_mc2 control false
+  hsetprop /sct_mc3 control false
+  hsetprop /sct_mc4 control false
+
+  hfactory /instrument/parameters/changer_position link samx_motor
+  hfactory /instrument/parameters/autoSampleAp link apx_motor