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
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

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