Merges from ics1-wombat

r2834 | ffr | 2009-12-09 17:07:45 +1100 (Wed, 09 Dec 2009) | 2 lines

site_ansto/instrument/hipd/config/commands/commands.tcl

@@ -13,17 +13,21 @@ command SetRadColl {
 float time
 float range
 } {
-
+catch {
    set spd [expr 2.0*$range / $time]
    oct softlowerlim [expr -abs($range/2.0) - 0.5]
    oct softupperlim [expr abs($range/2.0) + 0.5]
    oct maxretry 5
    oct accel 0.25
    oct speed 0.25
+   oct decel 0.25
    drive oct [expr abs($range/2.0)]
    oct speed $spd
-   oct accel $spd
+   oct accel [expr $spd*5]
+   oct decel [expr $spd*5]
    oct maxretry 0
+} msg
+clientput $msg
 }
 # SimpleRun
 command SimpleRun {
@@ -31,12 +35,12 @@ float=0:inf steptime
 int=1:inf numsteps
 } {
   
-   RadCollOff
+#   RadCollOff
    histmem mode time
    histmem preset $steptime
    newfile HISTOGRAM_XY
    for {set i 0} {$i < $numsteps} {incr i} {
-      histmem start block
+      hmm countblock
       save $i
    }
 }
@@ -49,13 +53,13 @@ int=1:inf numsteps
 float=0:inf steptime
 } {
 
-   RadCollOff
+#  RadCollOff
    histmem mode time
    histmem preset $steptime
    newfile HISTOGRAM_XY
    for {set i 0} {$i < $numsteps} {incr i} {
       drive $motor [expr $i*$step+$start]
-      histmem start block
+      hmm countblock
       save $i
    }
 }
@@ -65,14 +69,16 @@ int=1:inf oscno
 int=1:inf reps
 } {
    
-   RadCollOn $oscno
+#   RadCollOn $oscno
    histmem mode unlimited
    newfile HISTOGRAM_XY
    for {set i 0} {$i < $reps} {incr i} {
- 	histmem start block
+        oscmd start $oscno
+ 	hmm countblock
       	save $i
    }
-   RadCollOff
+   oscmd stop
+#  RadCollOff
 }
 # RadCollTimed
 command RadCollTimed {
@@ -105,15 +111,17 @@ int=1:inf numsteps
 int=1:inf oscno
 } {
 
-   RadCollOn $oscno
+#  RadCollOn $oscno
    histmem mode unlimited
    newfile HISTOGRAM_XY
    for {set i 0} {$i < $numsteps} {incr i} {
       drive $motor [expr $i*$step+$start]
-      histmem start block
+      oscmd start $oscno
+      hmm countblock
       save $i
    }
-   RadCollOff
+#  RadCollOff
+   oscmd stop
 }
 }
 namespace import ::ajscmds::*