Copy changes from ics1-wombat

site_ansto/instrument/config/commands/hvcommands.tcl

@@ -45,7 +45,7 @@ proc VoltSetStep {start step fin delay} {
 	set i [expr {$start*1.0}]
 	set loopvar 1
 	SetVolt $i
-	if {($start == $fin) || ($step == 0)} {break}
+	if {($start == $fin) || ($step == 0)} {break}  
 	while {$loopvar} {
 		wait $delay
 		if {($start < $fin)} {
@@ -56,7 +56,7 @@ proc VoltSetStep {start step fin delay} {
 			}
 		}
 		if {($start > $fin)} {
-			set i [expr {$i - abs($step)}]
+			set i [expr {$i - abs($step)}] 
 			if {$i <= $fin} {
 				set i $fin
 				set loopvar 0
@@ -65,7 +65,7 @@ proc VoltSetStep {start step fin delay} {
 		SetVolt $i
 	}
 }
-
+	
 
 proc GetVolt {} {
 	sct_pulser transact VOLT:OFFS?
@@ -102,6 +102,7 @@ proc VoltRamp {start step fin oscno} {
 		SetVolt $j
 		oct oscillate_count $oscno
 		oct oscillate start
+		hmm countblock
 		save $i
 		incr i
 	}
@@ -112,14 +113,14 @@ proc SingleVTexScan {mot tstart tstep tfin oscno} {
    broadcast in singlevtexscan
    set loopvar 1
    set i_bool 0
-   histmem mode unlimited
+   histmem mode unlimited		
    if {$motdir == 1} {
 	set currentmot $tstart
 	set i 0
    } else {
 	set currentmot $tfin
 	set i [expr {int(($tfin-$tstart)/$tstep)}]
-   }
+   }		
    newfile HISTOGRAM_XY
    while {$i_bool==0} {
       drive $mot $currentmot
@@ -140,9 +141,9 @@ proc SingleVTexScan {mot tstart tstep tfin oscno} {
    }
    set motdir [expr {(-1*$motdir)}]
 }
-
+	
 proc VListTexScan {voltlist mot tstart tstep tfin oscno} {
-   global rampstep rampdelay
+   global rampstep rampdelay 
   set curvolt [lindex $voltlist 0]
   broadcast $curvolt
   SetVolt $curvolt
@@ -167,6 +168,7 @@ proc SquarePulseTexture {motor start step numsteps volt freq bins oscno} {
       drive $motor [expr $i*$step+$start]
       oct oscillate_count $oscno
       oct oscillate start
+      hmm countblock
       save $i
    }
 }
@@ -185,7 +187,8 @@ proc UniPulseTexture {motor start step numsteps volt freq bins oscno} {
       		drive $motor [expr $i*$step+$start]
       		oct oscillate_count $oscno
 		oct oscillate start
-      		save $i
+      		hmm countblock
+		save $i
    	}
 }
 
@@ -201,6 +204,7 @@ proc BehlkePulseTexture {motor start step numsteps freq bins oscno} {
 		drive $motor [expr $i*$step+$start]
 		oct oscillate_count $oscno
 		oct oscillate start
+		hmm countblock
 		save $i
 	}
 }
@@ -228,6 +232,7 @@ proc SquarePulseVolt {start step fin freq bins oscno} {
 		}
 		oct oscillate_count $oscno
 		oct oscillate start
+		hmm countblock
 		save $i
 		incr i
 	}
@@ -247,6 +252,7 @@ proc SquarePulseFreq {volt freqlist bins oscno} {
 #		sct_pulser send "APPL:SQU $freq,$pulservolt,0"
 		oct oscillate_count $oscno
 		oct oscillate start
+		hmm countblock
 		save $i
 		incr i
 	}
@@ -264,6 +270,7 @@ proc BehlkePulseFreq {freqlist bins oscno} {
 		PulserOn
 		oct oscillate_count $oscno
 		oct oscillate start
+		hmm countblock
 		save $i
 		incr i
 	}
@@ -282,6 +289,7 @@ proc SinePulseFreq {volt freqlist bins oscno} {
 		PulserOn
 		oct oscillate_count $oscno
 		oct oscillate start
+		hmm countblock
 		save $i
 		incr i
 	}
@@ -306,6 +314,7 @@ proc UniPulseFreq {volt freqlist bins oscno} {
 #		sct_pulser send "APPL:SQU $freq,$pulservolt,[expr {$pulservolt/2}]"
 		oct oscillate_count $oscno
 		oct oscillate start
+		hmm countblock
 		save $i
 		incr i
 	}
@@ -324,9 +333,9 @@ proc UniPulseFatigue {volt freq bins oscno reps runs} {
 		for {set j 0} {$j<$reps} {incr j} {
 			oct oscillate_count $oscno
 			oct oscillate start
+			hmm countblock
 			save $j
 		}
-		oscmd stop
 	}
 	PulserOff
 	set pulserstate 0
@@ -439,5 +448,5 @@ publish BehlkePulseTexture user
 publish BehlkePulseFreq user
 publish UniPulseTexture user
 publish VoltSetStep user
-
+