linse/sics
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in-situ modifications for Release 2.5 candidate 5

Browse Source 
r2895 | ffr | 2010-04-29 16:02:15 +1000 (Thu, 29 Apr 2010) | 2 lines
This commit is contained in:
Ferdi Franceschini
2010-04-29 16:02:15 +10:00
committed by Douglas Clowes
parent a2ca46ab67
commit e6e3c3be52
24 changed files with 478 additions and 363 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
site_ansto/instrument/config/hmm/hmm_configuration_common_1.tcl
View File

@@ -42,12 +42,6 @@ namespace eval histogram_memory {
set ic_count_methods [concat [list time unlimited period count frame] $::counter::isc_beam_monitor_list ]
if {$histmem_simulation == "true"} {
MakeHM hmm SIM
# MakeHM hmm_xy SIM
# MakeHM hmm_xt SIM
# MakeHM hmm_yt SIM
# MakeHM hmm_x SIM
# MakeHM hmm_y SIM
# MakeHM hmm_t SIM
hmm configure daq Stopped
hmm configure statuscheck false
hmm configure num_events_filled_to_histo 12345
@@ -230,19 +224,6 @@ namespace eval histogram_memory {
## Scan Callback Procedures ##
##############################################
##############################################
if {0} {
#XXX REMOVE
proc init {} {
}
proc graphics_hpath_setup {parent} {
}
proc commands_hpath_setup {parent} {
}
proc instrument_hpath_setup {parent} {
}
proc experiment_hpath_setup {parent} {
}
}
proc set_sobj_attributes {} {
if [ catch {
# SICS commands

24
site_ansto/instrument/config/hmm/sct_orhvps_common.tcl
View File

@@ -43,10 +43,10 @@ proc ::scobj::dethvps::rdValue {vPath} {
"ASCERR:*" {
sct geterror $data
if {$currSuperState == $RAMPBUSY || $currSuperState == $RAMPSTART} {
broadcast "ERROR: $data, dhv1 stopped ramping detector voltage"
broadcast "DHVERROR: $data, dhv1 stopped ramping detector voltage"
statemon stop dhv1
} else {
# broadcast "ERROR: $data"
# broadcast "DHVERROR: $data"
}
if {$currSuperState != $RAMPIDLE} {
sct ramping $RAMPIDLE
@@ -85,7 +85,7 @@ proc ::scobj::dethvps::rdValue {vPath} {
return idle
}
default {
broadcast "ERROR: dhv1([info level 0]) sct ramping = [sct ramping], STOPPING"
broadcast "DHVERROR: dhv1([info level 0]) sct ramping = [sct ramping], STOPPING"
sct ramping $RAMPIDLE
statemon stop dhv1
return idle
@@ -107,8 +107,8 @@ proc ::scobj::dethvps::setValue {nextSubState} {
set par [sct target]
set maxV [sct max]
if {$par < 0 || $par > $maxV} {
broadcast "ERROR: dhv1 target must be between 0 and $maxV"
sct seterror "ERROR: dhv1 target must be between 0 and $maxV"
broadcast "DHVERROR: dhv1 target must be between 0 and $maxV"
sct seterror "DHVERROR: dhv1 target must be between 0 and $maxV"
return idle
}
set currSuperState [sct ramping]
@@ -147,10 +147,10 @@ proc ::scobj::dethvps::getACK {} {
"ASCERR:*" {
sct seterror $data
if {$currSuperState == $RAMPBUSY || $currSuperState == $RAMPSTART} {
broadcast "ERROR: $data, dhv1 stopped ramping detector voltage"
broadcast "DHVERROR: $data, dhv1 stopped ramping detector voltage"
statemon stop dhv1
} else {
# broadcast "ERROR: $data"
# broadcast "DHVERROR: $data"
}
if {$currSuperState != $RAMPSTOP} {
sct ramping $RAMPSTOP
@@ -198,8 +198,8 @@ proc ::scobj::dethvps::ramping {cmd} {
}
default {
sct ramping $RAMPSTOP
broadcast "ERROR: dhv1, Invalid ramp step: $rampstep STOPPING"
sct seterror "ERROR: dhv1, Invalid ramp step: $rampstep"
broadcast "DHVERROR: dhv1, Invalid ramp step: $rampstep STOPPING"
sct seterror "DHVERROR: dhv1, Invalid ramp step: $rampstep"
return idle
}
}
@@ -235,8 +235,8 @@ proc ::scobj::dethvps::drvCmd {} {
hset $potValPath 0
}
default {
clientput "ERROR: Unknown command $cmd"
sct seterror "ERROR: Unknown command $cmd"
clientput "DHVERROR: Unknown command $cmd"
sct seterror "DHVERROR: Unknown command $cmd"
return idle
}
}
@@ -304,7 +304,7 @@ proc ::scobj::dethvps::dhv1 {{CMD getVoltage} {val ""} } {
if {[SplitReply [config myrights]] == 0} {
hsetprop $qsObjPath $CMD $val
} else {
error "ERROR: $CMD can only be initialised from a configuration file"
error "DHVERROR: $CMD can only be initialised from a configuration file"
}
} else {
return "dhv1.$CMD = [hgetpropval $qsObjPath $CMD]"