From b1bfbb08b5482cabc91e912a4f2eeedb6b08c447 Mon Sep 17 00:00:00 2001 From: Ferdi Franceschini Date: Sun, 23 May 2010 15:12:59 +1000 Subject: [PATCH] SICS-309 nxscript_common_1.tcl The savetree function now checks to see if an hdb node has a "permlink" property set when making data links SICS-309 quokka parameters.tcl, sct_velsel.tcl r2933 | ffr | 2010-05-23 15:12:59 +1000 (Sun, 23 May 2010) | 4 lines --- site_ansto/instrument/config/nexus/nxscripts_common_1.tcl | 5 ++++- site_ansto/instrument/sans/config/parameters/parameters.tcl | 1 + site_ansto/instrument/sans/config/velsel/sct_velsel.tcl | 1 + site_ansto/instrument/sans/config/velsel/velsel.tcl | 2 ++ 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/site_ansto/instrument/config/nexus/nxscripts_common_1.tcl b/site_ansto/instrument/config/nexus/nxscripts_common_1.tcl index f2764d22..cffa3bfb 100644 --- a/site_ansto/instrument/config/nexus/nxscripts_common_1.tcl +++ b/site_ansto/instrument/config/nexus/nxscripts_common_1.tcl @@ -580,6 +580,9 @@ proc ::nexus::savetree {hpath pt filestatus} { if {[info exists p_arr(link)] && ($p_arr(link) != "@none")} { nxscript makelink $p_arr(link) $p_arr(nxalias) } + if {[info exists p_arr(permlink)] && ($p_arr(permlink) != "@none")} { + nxscript makelink $p_arr(permlink) $p_arr(nxalias) + } } } } @@ -1247,7 +1250,7 @@ set nx_content_release_tag [lindex $tmpstr [expr [llength $tmpstr] - 1]] sics_release $nx_content_release_tag sics_release lock -set tmpstr [string map {"$" ""} {$Revision: 1.51.2.12 $}] +set tmpstr [string map {"$" ""} {$Revision: 1.51.2.13 $}] set nx_content_revision_num [lindex $tmpstr [expr [llength $tmpstr] - 1]] #namespace eval data { diff --git a/site_ansto/instrument/sans/config/parameters/parameters.tcl b/site_ansto/instrument/sans/config/parameters/parameters.tcl index cb21fa9a..183ab075 100644 --- a/site_ansto/instrument/sans/config/parameters/parameters.tcl +++ b/site_ansto/instrument/sans/config/parameters/parameters.tcl @@ -26,6 +26,7 @@ foreach {var lname type priv units klass} { sicslist setatt $var units $units } } +sicslist setatt Transmission link data_set proc sicsmsgfmt {args} {return "[info level -1] = $args"} diff --git a/site_ansto/instrument/sans/config/velsel/sct_velsel.tcl b/site_ansto/instrument/sans/config/velsel/sct_velsel.tcl index d3e1af49..dd6710b0 100644 --- a/site_ansto/instrument/sans/config/velsel/sct_velsel.tcl +++ b/site_ansto/instrument/sans/config/velsel/sct_velsel.tcl @@ -502,6 +502,7 @@ proc halt {root} { hsetprop $velselPath/Lambda rdpar ${scobjNS}::readLambda $statusPath hsetprop $velselPath/Lambda oldval "UNKNOWN" hsetprop $velselPath/Lambda units "Angstrom" + hsetprop $velselPath/Lambda permlink data_set # Set Lambda hfactory $velselPath/setLambda plain spy float diff --git a/site_ansto/instrument/sans/config/velsel/velsel.tcl b/site_ansto/instrument/sans/config/velsel/velsel.tcl index ec0ce01b..209a7e25 100644 --- a/site_ansto/instrument/sans/config/velsel/velsel.tcl +++ b/site_ansto/instrument/sans/config/velsel/velsel.tcl @@ -1,3 +1,4 @@ +# Set currVelSel to select either the NVS40 or NVS43 set currVelSel 43 namespace eval ::scobj::velocity_selector { @@ -5,6 +6,7 @@ namespace eval ::scobj::velocity_selector { variable velsel_IP variable velsel_port +# Set configuration parameters for either the NVS40 or NVS43 velocity selector set ::currVelSel [string tolower $::currVelSel] switch $::currVelSel { 40 {