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

Merged release 2.0 patch-set 1 (RELEASE-2_0P1 )

Browse Source 
r2624 | ffr | 2008-06-12 09:05:36 +1000 (Thu, 12 Jun 2008) | 2 lines
This commit is contained in:
Ferdi Franceschini
2008-06-12 09:05:36 +10:00
committed by Douglas Clowes
parent 528d125efe
commit 3a40ea5693
12 changed files with 79 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
site_ansto/instrument/config/counter/counter_common_1.tcl
View File

@@ -1,2 +1,10 @@
bm SetExponent 0
sicslist setatt bm privilege internal
::utility::macro::getset float monitor_counts {} {
return "monitor_counts = [SplitReply [bm getcounts]]"
}
sicslist setatt monitor_counts klass monitor
sicslist setatt monitor_counts long_name data
sicslist setatt monitor_counts mutable true

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

@@ -41,7 +41,7 @@ namespace eval nexus {
variable filetype_spec {
BEAM_MONITOR {
link {axis 1 data_run_number}
link {data_set ::monitor::count_fb_counts}
link {data_set monitor_counts}
save_policy {include @all exclude {hmm hmm_xy hmm_xt hmm_yt hmm_x hmm_y hmm_t}}
}
HISTOGRAM_XYT {
@@ -855,7 +855,12 @@ proc ::nexus::macro::getset_save {sobj nxalias data_type args} {
if {[lindex $args 0] == "point"} {
set index [lindex $args 1]
nxscript_data clear
nxscript_data putfloat 0 [getVal [$sobj] ]
set val [getVal [$sobj] ]
switch $data_type {
int {nxscript_data putint 0 $val}
float {nxscript_data putfloat 0 $val}
default {error "ERROR: [info level -1]->::nexus::sicsvariable::save, unknown type $data_type"}
}
nxscript putslab $nxalias [list $index] [list 1] nxscript_data
} else {
nxscript putfloat $nxalias [SplitReply [$sobj]]
@@ -1030,7 +1035,7 @@ foreach expt $::nexus::exports {
set tmpstr [string map {"$" ""} {$Name: not supported by cvs2svn $}]
set nx_content_release_tag [lindex $tmpstr [expr [llength $tmpstr] - 1]]
set tmpstr [string map {"$" ""} {$Revision: 1.36 $}]
set tmpstr [string map {"$" ""} {$Revision: 1.37 $}]
set nx_content_revision_num [lindex $tmpstr [expr [llength $tmpstr] - 1]]
#namespace eval data {