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

Cleanup and add "histmem loadconf" feedback

Browse Source 
r2843 | ffr | 2009-12-10 18:29:23 +1100 (Thu, 10 Dec 2009) | 2 lines
This commit is contained in:
Ferdi Franceschini
2009-12-10 18:29:23 +11:00
committed by Douglas Clowes
parent b6ed01fc13
commit 82475e1dec
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,5 @@
# $Revision: 1.47 $ # $Revision: 1.48 $
# $Date: 2009-11-24 22:56:46 $ # $Date: 2009-12-10 07:29:23 $
# Author: Ferdi Franceschini # Author: Ferdi Franceschini
# Based on the examples in the hs_test.tcl sample configuration by Mark Lesha. # Based on the examples in the hs_test.tcl sample configuration by Mark Lesha.
# http://gumtree.ansto.gov.au:9080/nbicms/bragg-systems/histogram-server/hs_test.tcl/view # http://gumtree.ansto.gov.au:9080/nbicms/bragg-systems/histogram-server/hs_test.tcl/view
@@ -1278,9 +1278,9 @@ proc ::histogram_memory::upload_config {filler_defaults} {
# set nch [number_of_channels $axis] # set nch [number_of_channels $axis]
# OAT_TABLE $axis -setdata BOUNDARIES [calc_boundaries $bins $nch] # OAT_TABLE $axis -setdata BOUNDARIES [calc_boundaries $bins $nch]
# } # }
clientput "histmem configuration uploaded"
} message ] { } message ] {
if {$::errorCode=="NONE"} { if {$::errorCode=="NONE"} {
clientput "histmem configuration uploaded"
return $message return $message
} else { } else {
return -code error "([info level 0]) $message" return -code error "([info level 0]) $message"

3
site_ansto/instrument/config/nexus/nxscripts_common_1.tcl
View File

@@ -918,7 +918,6 @@ proc ::nexus::histmem::save {hm nxalias hpath data_type filestatus args} {
} elseif { $max_period > 0} { } elseif { $max_period > 0} {
$HMOBJ configure read_data_period_number $point $HMOBJ configure read_data_period_number $point
} }
broadcast nxscript putslab $nxalias [join [list $point $hmmslabstart ]] [join [list 1 $hmmslabend]] $HMOBJ 0 $datsize 1
nxscript putslab $nxalias [join [list $point $hmmslabstart ]] [join [list 1 $hmmslabend]] $HMOBJ 0 $datsize 1 nxscript putslab $nxalias [join [list $point $hmmslabstart ]] [join [list 1 $hmmslabend]] $HMOBJ 0 $datsize 1
##### #####
if {$filestatus == "newfile"} { if {$filestatus == "newfile"} {
@@ -1337,7 +1336,7 @@ foreach expt $::nexus::exports {
set tmpstr [string map {"$" ""} {$Name: not supported by cvs2svn $}] set tmpstr [string map {"$" ""} {$Name: not supported by cvs2svn $}]
set nx_content_release_tag [lindex $tmpstr [expr [llength $tmpstr] - 1]] set nx_content_release_tag [lindex $tmpstr [expr [llength $tmpstr] - 1]]
set tmpstr [string map {"$" ""} {$Revision: 1.50 $}] set tmpstr [string map {"$" ""} {$Revision: 1.51 $}]
set nx_content_revision_num [lindex $tmpstr [expr [llength $tmpstr] - 1]] set nx_content_revision_num [lindex $tmpstr [expr [llength $tmpstr] - 1]]
#namespace eval data { #namespace eval data {